diff options
| author | Simo Sorce <simo@redhat.com> | 2015-03-24 19:58:23 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2015-03-24 19:58:49 -0400 |
| commit | 3ea42efe873859745e4b4199be6bf43591798edc (patch) | |
| tree | b578f57fcd3dab7da98b56a3a3bb67fdf1d9f8e5 | |
| parent | fb2bc584b06929de1547da0ce5582dcbc5c550ea (diff) | |
| download | gss-proxy-3ea42efe873859745e4b4199be6bf43591798edc.tar.gz gss-proxy-3ea42efe873859745e4b4199be6bf43591798edc.tar.xz gss-proxy-3ea42efe873859745e4b4199be6bf43591798edc.zip | |
Use pkg-config for krb5 libs too
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rw-r--r-- | proxy/configure.ac | 7 | ||||
| -rw-r--r-- | proxy/external/krb5.m4 | 53 |
2 files changed, 5 insertions, 55 deletions
diff --git a/proxy/configure.ac b/proxy/configure.ac index cf3e4fa..6a02de2 100644 --- a/proxy/configure.ac +++ b/proxy/configure.ac @@ -70,7 +70,6 @@ WITH_GPP_DEFAULT_BEHAVIOR m4_include([external/pkg.m4]) m4_include([external/libpopt.m4]) -m4_include([external/krb5.m4]) m4_include([external/docbook.m4]) m4_include([external/sizes.m4]) m4_include([external/selinux.m4]) @@ -127,8 +126,10 @@ AC_CHECK_HEADERS([gssapi/gssapi.h],,[AC_MSG_ERROR([Could not find GSSAPI headers PKG_CHECK_MODULES([KRB5_GSSAPI], [krb5-gssapi >= 1.12.0], [have_krb5_gssapi=1], [have_krb5_gssapi=]) if test x$have_krb5_gssapi = x; then - AC_MSG_ERROR([Could not find GSSAPI development libraries]) + AC_MSG_ERROR([Could not find Krb5 / GSSAPI development libraries]) else + KRB5_CFLAGS="`$PKG_CONFIG --cflags krb5`" + KRB5_LIBS="`$PKG_CONFIG --libs krb5`" GSSAPI_CFLAGS="`$PKG_CONFIG --cflags krb5-gssapi`" GSSAPI_LIBS="`$PKG_CONFIG --libs krb5-gssapi`" fi @@ -139,6 +140,8 @@ AC_CHECK_LIB(gssapi_krb5, gss_export_cred,, [AC_MSG_ERROR([GSSAPI library does not support gss_export_cred])], [$GSSAPI_LIBS]) +AC_SUBST([KRB5_CFLAGS]) +AC_SUBST([KRB5_LIBS]) AC_SUBST([GSSAPI_CFLAGS]) AC_SUBST([GSSAPI_LIBS]) diff --git a/proxy/external/krb5.m4 b/proxy/external/krb5.m4 deleted file mode 100644 index b7db80c..0000000 --- a/proxy/external/krb5.m4 +++ /dev/null @@ -1,53 +0,0 @@ -AC_SUBST(KRB5_CFLAGS) -AC_SUBST(KRB5_LIBS) - -if test x$KRB5_LIBS != x; then - KRB5_PASSED_LIBS=$KRB5_LIBS -fi - -if test x$KRB5_CFLAGS != x; then - KRB5_PASSED_CFLAGS=$KRB5_CFLAGS -fi - -AC_PATH_PROG(KRB5_CONFIG, krb5-config) -AC_MSG_CHECKING(for working krb5-config) -if test -x "$KRB5_CONFIG"; then - KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" - KRB5_LIBS="`$KRB5_CONFIG --libs`" - AC_MSG_RESULT(yes) -else - if test x$KRB5_PASSED_LIBS = x; then - AC_MSG_ERROR(no. Please install MIT kerberos devel package) - fi -fi - -if test x$KRB5_PASSED_LIBS != x; then - KRB5_LIBS=$KRB5_PASSED_LIBS -fi - -if test x$KRB5_PASSED_CFLAGS != x; then - KRB5_CFLAGS=$KRB5_PASSED_CFLAGS -fi - -AC_ARG_VAR([KRB5_CFLAGS], [C compiler flags for kerberos, overriding krb5-config])dnl -AC_ARG_VAR([KRB5_LIBS], [linker flags for kerberos, overriding krb5-config])dnl - -SAVE_CFLAGS=$CFLAGS -SAVE_LIBS=$LIBS -CFLAGS="$CFLAGS $KRB5_CFLAGS" -LIBS="$LIBS $KRB5_LIBS" -AC_CHECK_HEADERS([krb5.h krb5/krb5.h]) -AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \ - krb5_free_unparsed_name \ - krb5_get_init_creds_opt_set_expire_callback \ - krb5_get_init_creds_opt_set_fast_ccache_name \ - krb5_get_init_creds_opt_set_fast_flags \ - krb5_get_init_creds_opt_set_canonicalize \ - krb5_unparse_name_flags]) -CFLAGS=$SAVE_CFLAGS -LIBS=$SAVE_LIBS - -if test x$ac_cv_header_krb5_h != xyes -a x$ac_cv_header_krb5_krb5_h != xyes -then - AC_MSG_ERROR(you must have Kerberos 5 header files to build gssproxy) -fi |