svn commit: samba r4923 - in branches/SAMBA_4_0/source/libads: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-01-22 02:39:05 +0000 (Sat, 22 Jan 2005)
New Revision: 4923

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4923

Log:
Avoid using krb5-config in the path if a krb5 prefix was already set.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libads/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/libads/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libads/config.m4	2005-01-22 02:08:30 UTC (rev 4922)
+++ branches/SAMBA_4_0/source/libads/config.m4	2005-01-22 02:39:05 UTC (rev 4923)
@@ -96,6 +96,7 @@
 krb5_withval=auto
 AC_MSG_CHECKING([for KRB5 support])
 
+KRB5_CONFIG=""
 # Do no harm to the values of CFLAGS and LIBS while testing for
 # Kerberos support.
 AC_ARG_WITH(krb5,
@@ -120,6 +121,7 @@
 			with_krb5_support=yes
 			AC_MSG_RESULT(yes)
 			krb5_withval=$withval
+			KRB5_CONFIG="$krb5_withval/bin/krb5-config"
         		;;
 	esac ],
 	AC_MSG_RESULT($with_krb5_support)
@@ -130,29 +132,29 @@
 
 	#################################################
 	# check for krb5-config from recent MIT and Heimdal kerberos 5
-	KRB5_CONFIG="$krb5_withval/bin/krb5-config"
-	AC_MSG_CHECKING(for working $krb5_withval/bin/krb5-config)
-	if test -x "$KRB5_CONFIG"; then
-		ac_save_CFLAGS=$CFLAGS
-		CFLAGS="";export CFLAGS
-		ac_save_LDFLAGS=$LDFLAGS
-		LDFLAGS="";export LDFLAGS
-		KRB5_LIBS="`$KRB5_CONFIG --libs gssapi`"
-		KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-		KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
-		CFLAGS=$ac_save_CFLAGS;export CFLAGS
-		LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
-		FOUND_KRB5=yes
-		AC_MSG_RESULT(yes)
+	AC_MSG_CHECKING(for working specified location for krb5-config)
+	if test x$KRB5_CONFIG != "x"; then
+		if test -x "$KRB5_CONFIG"; then
+			ac_save_CFLAGS=$CFLAGS
+			CFLAGS="";export CFLAGS
+			ac_save_LDFLAGS=$LDFLAGS
+			LDFLAGS="";export LDFLAGS
+			KRB5_LIBS="`$KRB5_CONFIG --libs gssapi`"
+			KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
+			KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
+			CFLAGS=$ac_save_CFLAGS;export CFLAGS
+			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
+			FOUND_KRB5=yes
+			AC_MSG_RESULT(yes. Found $KRB5_CONFIG)
+		else 
+			AC_MSG_RESULT(no. Fallback to specified directory)
+		fi
 	else
 		AC_MSG_RESULT(no. Fallback to finding krb5-config in path)
-	fi
-
-	if test x$FOUND_KRB5 != x"yes"; then
 		#################################################
 		# check for krb5-config from recent MIT and Heimdal kerberos 5
 		AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-		AC_MSG_CHECKING(for working krb5-config)
+		AC_MSG_CHECKING(for working krb5-config in path)
 		if test -x "$KRB5_CONFIG"; then
 			ac_save_CFLAGS=$CFLAGS
 			CFLAGS="";export CFLAGS
@@ -164,7 +166,7 @@
 			CFLAGS=$ac_save_CFLAGS;export CFLAGS
 			LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
 			FOUND_KRB5=yes
-			AC_MSG_RESULT(yes)
+			AC_MSG_RESULT(yes. Found $KRB5_CONFIG)
 		else
 			AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
 		fi