Merge pull request #1226 from pmienk/master

Standardize optional libgssapi_krb5 dependency

builds/redhat/zeromq.spec.in

@@ -14,18 +14,24 @@ Requires:      libstdc++
 #
 # Conditional build options
 # Default values aree
+#    --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: libgssapi_krb5_2}
+%{?_with_libgssapi_krb5:Requires: libgssapi_krb5}
+
 %{?_with_libsodium:BuildRequires: libsodium-devel}
 %{?_with_libsodium:Requires: libsodium}
 
@@ -173,6 +179,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

@@ -282,8 +282,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
 #
@@ -379,6 +377,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"
 
@@ -387,7 +397,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