summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-04-02 18:45:47 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-04-02 18:45:47 +0000
commit0ae1b49b21204e05eb265f30a52e1c15d03bdcb7 (patch)
tree1f15570fbe2e4012b07468940ecda4e9cea35abc
parent63f153c808312b806ff855906123bdc3d7f2a1cd (diff)
downloadsamba-0ae1b49b21204e05eb265f30a52e1c15d03bdcb7.tar.gz
samba-0ae1b49b21204e05eb265f30a52e1c15d03bdcb7.tar.bz2
samba-0ae1b49b21204e05eb265f30a52e1c15d03bdcb7.zip
Only use cflags and libs from krb5 when they appear to be working - fixes
build on BSD machines that have a krb5-config that returns @INCLUDE_des@ for --cflags (This used to be commit e05d78699c6cf6a8340f85e4f55c871fbc100ebf)
-rw-r--r--source3/configure.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 266dffa38b..9ca12866a2 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2067,6 +2067,7 @@ fi
AC_MSG_RESULT($with_ads_support)
FOUND_KRB5=no
+KRB5_LIBS=""
if test x"$with_ads_support" = x"yes"; then
ac_save_CFLAGS="$CFLAGS"
@@ -2230,15 +2231,15 @@ fi
########################################################
# now see if we can find the krb5 libs in standard paths
# or as specified above
- AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5";
+ AC_CHECK_LIB(krb5, krb5_mk_req_extended, [KRB5_LIBS="$LIBS -lkrb5";
+ KRB5_CFLAGS="$CFLAGS";
AC_DEFINE(HAVE_KRB5,1,[Whether KRB5 is available])])
########################################################
# now see if we can find the gssapi libs in standard paths
- AC_CHECK_LIB(gssapi_krb5, gss_display_status, [LIBS="$LIBS -lgssapi_krb5";
+ AC_CHECK_LIB(gssapi_krb5, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5";
AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
-KRB5_LIBS="$LIBS"; KRB5_CFLAGS="$CFLAGS"
LIBS="$ac_save_LIBS"; CFLAGS="$ac_save_CFLAGS"
fi