diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-09-25 09:37:18 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-25 09:37:18 +0000 |
| commit | 3c39539ddf5edce614559e1a84aeda53416a1850 (patch) | |
| tree | 9927e16798caff2a50c33ec840d87ba60fdab7b8 | |
| parent | bfa04e42b895e1113b7fa38024b7e7d3d2df7adb (diff) | |
| download | samba-3c39539ddf5edce614559e1a84aeda53416a1850.tar.gz samba-3c39539ddf5edce614559e1a84aeda53416a1850.tar.bz2 samba-3c39539ddf5edce614559e1a84aeda53416a1850.zip | |
Actually pick up the kerberos libs in RedHat - the previous shell construct
didn't seem to work properly.
Andrew Bartlett
(This used to be commit c0925b6352ff6135da03edff44e0bbd72c949a20)
| -rwxr-xr-x | source3/configure | 8 | ||||
| -rw-r--r-- | source3/configure.in | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/configure b/source3/configure index 39fa8b05f0..538f44621c 100755 --- a/source3/configure +++ b/source3/configure @@ -12077,11 +12077,11 @@ fi echo "$ac_t""$with_ads_support" 1>&6 +FOUND_KRB5=no if test x"$with_ads_support" = x"yes"; then ################################################# # check for location of Kerberos 5 install -FOUND_KRB5=0 echo $ac_n "checking for kerberos 5 install path""... $ac_c" 1>&6 echo "configure:12087: checking for kerberos 5 install path" >&5 # Check whether --with-krb5 or --without-krb5 was given. @@ -12097,7 +12097,7 @@ if test "${with_krb5+set}" = set; then CFLAGS="$CFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" - FOUND_KRB5=1 + FOUND_KRB5=yes ;; esac else @@ -12107,7 +12107,7 @@ fi -if $FOUND_KRB5 = 0 ; then +if test x$FOUND_KRB5 = x"no"; then ################################################# # see if this box has the RedHat location for kerberos echo $ac_n "checking for /usr/kerberos""... $ac_c" 1>&6 @@ -12768,7 +12768,7 @@ fi ############################################### # test for where we get crypt() from, but only # if not using PAM -if test $with_pam_for_crypt = no; then +if test x"$with_pam_for_crypt" = x"no"; then for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 diff --git a/source3/configure.in b/source3/configure.in index 07cf6e88cd..5221b8ec2b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1961,11 +1961,11 @@ fi AC_MSG_RESULT($with_ads_support) +FOUND_KRB5=no if test x"$with_ads_support" = x"yes"; then ################################################# # check for location of Kerberos 5 install -FOUND_KRB5=0 AC_MSG_CHECKING(for kerberos 5 install path) AC_ARG_WITH(krb5, [ --with-krb5=base-dir Locate Kerberos 5 support (default=/usr)], @@ -1979,14 +1979,14 @@ FOUND_KRB5=0 CFLAGS="$CFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" - FOUND_KRB5=1 + FOUND_KRB5=yes ;; esac ], AC_MSG_RESULT(no) ) -if [ $FOUND_KRB5 = 0 ]; then +if test x$FOUND_KRB5 = x"no"; then ################################################# # see if this box has the RedHat location for kerberos AC_MSG_CHECKING(for /usr/kerberos) @@ -2168,7 +2168,7 @@ AC_ARG_WITH(pam_smbpass, ############################################### # test for where we get crypt() from, but only # if not using PAM -if test $with_pam_for_crypt = no; then +if test x"$with_pam_for_crypt" = x"no"; then AC_CHECK_FUNCS(crypt) if test x"$ac_cv_func_crypt" = x"no"; then AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt"; |