Merge pull request #5 from johntconklin/master

backport configure and rpmbuild fixes.

builds/redhat/zeromq.spec.in

@@ -13,19 +13,25 @@ Requires:      libstdc++
 
 #
 # Conditional build options
-# Default values aree
+# Default values are:
+#    --without-libgssapi_krb5
 #    --without-libsodium
 #    --without-pgm
 #
 
 # If neither macro exists, use the default value.
+%{!?_with_libgssapi_krb5: %{!?_without_libgssapi_krb5: %define _without_libgssapi_krb5 --without-liblibgssapi_krb5}}
 %{!?_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_libgssapi_krb5: %{?_without_libgssapi_krb5: %{error: both _with_libgssapi_krb5 and _without_libgssapi_krb5}}}
 %{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}}
 %{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}}
 
+%{?_with_libgssapi_krb5:BuildRequires: krb5-devel}
+%{?_with_libgssapi_krb5:Requires: krb5-libs}
+
 %{?_with_libsodium:BuildRequires: libsodium-devel}
 %{?_with_libsodium:Requires: libsodium}
 
@@ -71,6 +77,8 @@ This package contains ZeroMQ related development libraries and header files.
     %{?_without_libsodium} \
     %{?_with_pgm} \
     %{?_without_pgm} \
+    %{?_with_libgssapi_krb5} \
+    %{?_without_libgssapi_krb5} \
     %{?_with_pic} \
     %{?_without_pic} \
     %{?_with_gnu_ld} \
@@ -173,6 +181,9 @@ This package contains ZeroMQ related development libraries and header files.
 %{_mandir}/man7/zmq_tipc.7.gz
 
 %changelog
+* Sat Oct 25 2014 Phillip Mienk <mienkphi@gmail.com>
+- Add --with/--without libgssapi_krb5 support following J.T.Conklin's pattern
+
 * Sat Oct 18 2014 J.T. Conklin <jtc@acorntoolworks.com>
 - Add --with/--without pgm support
 - Add --with/--without libsodium support

configure.ac

@@ -281,8 +281,6 @@ esac
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([rt], [clock_gettime])
 
-AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],,AC_MSG_WARN(libgssapi_krb5 is needed for GSSAPI security))
-
 #
 # Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec
 #
@@ -335,10 +333,10 @@ AC_CHECK_HEADERS(sys/uio.h, [AC_DEFINE(ZMQ_HAVE_UIO, 1, [Have uio.h header.])])
 # Force not to use eventfd
 AC_ARG_ENABLE([eventfd],
     [AS_HELP_STRING([--disable-eventfd], [disable eventfd [default=no]])],
-    [zmq_disable_eventfd=yes],
+    [zmq_enable_eventfd=$enableval],
-    [zmq_disable_eventfd=no])
+    [zmq_enable_eventfd=yes])
 
-if test "x$zmq_disable_eventfd" != "xyes"; then
+if test "x$zmq_enable_eventfd" = "xyes"; then
     # Check if we have eventfd.h header file.
     AC_CHECK_HEADERS(sys/eventfd.h,
         [AC_DEFINE(ZMQ_HAVE_EVENTFD, 1, [Have eventfd extension.])])
@@ -378,6 +376,18 @@ AC_HEADER_TIME
 AC_TYPE_UINT32_T
 AC_C_VOLATILE
 
+# build using libgssapi_krb5
+AC_ARG_WITH([libgssapi_krb5], [AS_HELP_STRING([--with-libgssapi_krb5],
+    [require libzmq build with libgssapi_krb5 [default=no]])],
+    [require_libgssapi_krb5_ext=$withval],
+    [require_libgssapi_krb5_ext=no])
+
+# conditionally require libgssapi_krb5
+if test "x$require_libgssapi_krb5_ext" != "xno"; then
+    AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],,
+        AC_MSG_ERROR(libgssapi_krb5 is needed for GSSAPI security))
+fi
+
 # build using libsodium
 have_sodium_library="no"
 
@@ -386,7 +396,7 @@ AC_ARG_WITH([libsodium], [AS_HELP_STRING([--with-libsodium],
     [require_libsodium_ext=$withval],
     [require_libsodium_ext=no])
 
-#conditionally require libsodium package
+# conditionally require libsodium package
 if test "x$require_libsodium_ext" != "xno"; then
     PKG_CHECK_MODULES([sodium], [libsodium], [have_sodium_library="yes"])
 fi