summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-02-04 16:33:24 +0000
committerJim McDonough <jmcd@samba.org>2003-02-04 16:33:24 +0000
commitae26a74e796a29a6a1df82d69d263d49f802b551 (patch)
tree01e7d60a3b964ce73f548952591ea33326464a08
parent79309bb2dba8d4ca7b248e9c3d444a37d2aee4c8 (diff)
downloadsamba-ae26a74e796a29a6a1df82d69d263d49f802b551.tar.gz
samba-ae26a74e796a29a6a1df82d69d263d49f802b551.tar.bz2
samba-ae26a74e796a29a6a1df82d69d263d49f802b551.zip
Try to allow old and new heimdal installs
(This used to be commit 6d593ca174282e7a8098813e9423c1ca5f86f0b1)
-rwxr-xr-xsource3/configure20
-rw-r--r--source3/configure.in19
2 files changed, 29 insertions, 10 deletions
diff --git a/source3/configure b/source3/configure
index 20ec9e1961..084a654d69 100755
--- a/source3/configure
+++ b/source3/configure
@@ -20525,12 +20525,22 @@ if test x$FOUND_KRB5 = x"no"; then
# see if this box has the SuSE location for the heimdal kerberos implementation
echo "$as_me:$LINENO: checking for /usr/include/heimdal" >&5
echo $ECHO_N "checking for /usr/include/heimdal... $ECHO_C" >&6
-if test -d /usr/include/heimdal -a -f /usr/lib/heimdal/lib/libkrb5.a; then
- LIBS="$LIBS -lkrb5"
- CFLAGS="$CFLAGS -I/usr/include/heimdal"
- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
- echo "$as_me:$LINENO: result: yes" >&5
+if test -d /usr/include/heimdal; then
+ if test -f /usr/lib/heimdal/lib/libkrb5.a; then
+ LIBS="$LIBS -lkrb5"
+ CFLAGS="$CFLAGS -I/usr/include/heimdal"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
+ LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ LIBS="$LIBS -lkrb5"
+ CFLAGS="$CFLAGS -I/usr/include/heimdal"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
+ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
+
+ fi
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
diff --git a/source3/configure.in b/source3/configure.in
index 3ea21a2023..d57495a67a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2018,11 +2018,20 @@ if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the SuSE location for the heimdal kerberos implementation
AC_MSG_CHECKING(for /usr/include/heimdal)
-if test -d /usr/include/heimdal -a -f /usr/lib/heimdal/lib/libkrb5.a; then
- LIBS="$LIBS -lkrb5"
- CFLAGS="$CFLAGS -I/usr/include/heimdal"
- CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
- AC_MSG_RESULT(yes)
+if test -d /usr/include/heimdal; then
+ if test -f /usr/lib/heimdal/lib/libkrb5.a; then
+ LIBS="$LIBS -lkrb5"
+ CFLAGS="$CFLAGS -I/usr/include/heimdal"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
+ LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib"
+ AC_MSG_RESULT(yes)
+ else
+ LIBS="$LIBS -lkrb5"
+ CFLAGS="$CFLAGS -I/usr/include/heimdal"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
+ AC_MSG_RESULT(yes)
+
+ fi
else
AC_MSG_RESULT(no)
fi