Merge pull request #1218 from johntconklin/master

Support --with and --without options for libsodium and pgm

builds/redhat/zeromq.spec.in

@@ -11,9 +11,30 @@ Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto
 Requires:      libstdc++
 
-# Build pgm only on supported archs
+#
+# Conditional build options
+# Default values aree
+#    --without-libsodium
+#    --without-pgm
+#
+
+# If neither macro exists, use the default value.
+%{!?_with_libsodium: %{!?_without_libsodium: %define _without_libsodium --without-libsodium}}
+%{!?_with_pgm: %{!?_without_pgm: %define _without_pgm --without-pgm}}
+
+# It's an error if both --with and --without options are specified
+%{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}}
+%{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}}
+
+%{?_with_libsodium:BuildRequires: libsodium-devel}
+%{?_with_libsodium:Requires: libsodium}
+
+%{?_with_pgm:BuildRequires: openpgm-devel}
+%{?_with_pgm:Requires: openpgm}
+
 %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
-BuildRequires: python, perl
+%{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}}
+%{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}}
 %endif
 
 %description
@@ -45,11 +66,15 @@ This package contains ZeroMQ related development libraries and header files.
 %setup -q
 
 %build
-%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
-  %configure --with-pgm --with-pic --with-gnu-ld
-%else
-  %configure
-%endif
+%configure \
+    %{?_with_libsodium} \
+    %{?_without_libsodium} \
+    %{?_with_pgm} \
+    %{?_without_pgm} \
+    %{?_with_pic} \
+    %{?_without_pic} \
+    %{?_with_gnu_ld} \
+    %{?_without_gnu_ld}
 
 %{__make} %{?_smp_mflags}
 
@@ -148,6 +173,10 @@ This package contains ZeroMQ related development libraries and header files.
 %{_mandir}/man7/zmq_tipc.7.gz
 
 %changelog
+* Sat Oct 18 2014 J.T. Conklin <jtc@acorntoolworks.com>
+- Add --with/--without pgm support
+- Add --with/--without libsodium support
+
 * Tue Jun 10 2014 Tristian Celestin <tristian.celestin@outlook.com> 4.0.4
 - Updated packaged files
 

configure.ac

@@ -383,18 +383,16 @@ have_sodium_library="no"
 
 AC_ARG_WITH([libsodium], [AS_HELP_STRING([--with-libsodium],
     [require libzmq build with libsodium. Requires pkg-config [default=no]])],
-    [require_libsodium_ext=yes], [require_libsodium_ext=no])
+    [require_libsodium_ext=$withval],
+    [require_libsodium_ext=no])
 
 #conditionally require libsodium package
 if test "x$require_libsodium_ext" != "xno"; then
     PKG_CHECK_MODULES([sodium], [libsodium], [have_sodium_library="yes"])
-else
-    PKG_CHECK_MODULES([sodium], [libsodium], [have_sodium_library="yes"],
-        [AC_MSG_WARN(libsodium is needed for CURVE security)])
 fi
 
 if test "x$have_sodium_library" != "xno"; then
-AC_DEFINE(HAVE_LIBSODIUM, 1, [The libsodium library is to be used.])
+    AC_DEFINE(HAVE_LIBSODIUM, 1, [The libsodium library is to be used.])
 fi
 
 AM_CONDITIONAL(HAVE_SODIUM, test "x$have_sodium_library" != "xno")
@@ -404,7 +402,8 @@ have_pgm_library="no"
 
 AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
     [build libzmq with PGM extension. Requires pkg-config [default=no]])],
-    [with_pgm_ext=yes], [with_pgm_ext=no])
+    [with_pgm_ext=$withval],
+    [with_pgm_ext=no])
 
 # conditionally require pgm package
 if test "x$with_pgm_ext" != "xno"; then