Try to allow old and new heimdal installs

(This used to be commit 29d25382ac394707da372d4af2b828bfcd0d6874)

diff --git a/source3/configure b/source3/configure
index 3e7cc06a20ce7a8e4b826c938d4f274d73d7fd7e..8aed2bd5a2bcdfce7f78149d7834d8d321d88d12 100755 (executable)
--- a/source3/configure
+++ b/source3/configure
@@ -20642,12 +20642,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 87f2e0d0ac2bf01a2a7c6487b7be19b6a87dfd2a..9285b42c104e4bcfcd3fa81fa1345de269b5552f 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2107,11 +2107,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