Commit 3ac1925d authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1231 from johntconklin/master

Pass --with/--without-libgssapi_krb5 to configure.
parents d6c4750d f78cbc50
...@@ -13,7 +13,7 @@ Requires: libstdc++ ...@@ -13,7 +13,7 @@ Requires: libstdc++
# #
# Conditional build options # Conditional build options
# Default values aree # Default values are:
# --without-libgssapi_krb5 # --without-libgssapi_krb5
# --without-libsodium # --without-libsodium
# --without-pgm # --without-pgm
...@@ -29,8 +29,8 @@ Requires: libstdc++ ...@@ -29,8 +29,8 @@ Requires: libstdc++
%{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}} %{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}}
%{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}} %{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}}
%{?_with_libgssapi_krb5:BuildRequires: libgssapi_krb5_2} %{?_with_libgssapi_krb5:BuildRequires: krb5-devel}
%{?_with_libgssapi_krb5:Requires: libgssapi_krb5} %{?_with_libgssapi_krb5:Requires: krb5-libs}
%{?_with_libsodium:BuildRequires: libsodium-devel} %{?_with_libsodium:BuildRequires: libsodium-devel}
%{?_with_libsodium:Requires: libsodium} %{?_with_libsodium:Requires: libsodium}
...@@ -77,6 +77,8 @@ This package contains ZeroMQ related development libraries and header files. ...@@ -77,6 +77,8 @@ This package contains ZeroMQ related development libraries and header files.
%{?_without_libsodium} \ %{?_without_libsodium} \
%{?_with_pgm} \ %{?_with_pgm} \
%{?_without_pgm} \ %{?_without_pgm} \
%{?_with_libgssapi_krb5} \
%{?_without_libgssapi_krb5} \
%{?_with_pic} \ %{?_with_pic} \
%{?_without_pic} \ %{?_without_pic} \
%{?_with_gnu_ld} \ %{?_with_gnu_ld} \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment