last minute autoconf fix from SAMBA_2_2

2 files changed, 56 insertions, 44 deletions

diff --git a/source/configure b/source/configure
index 1619dd1542f..69dca5f44e6 100755
--- a/source/configure
+++ b/source/configure
@@ -13309,6 +13309,29 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 
         echo "$ac_t""yes" 1>&6
 
+	echo $ac_n "checking whether to enable winbind auth challenge/response code""... $ac_c" 1>&6
+echo "configure:13314: checking whether to enable winbind auth challenge/response code" >&5
+	# Check whether --with-winbind-auth-challenge or --without-winbind-auth-challenge was given.
+if test "${with_winbind_auth_challenge+set}" = set; then
+  withval="$with_winbind_auth_challenge"
+   
+	  case "$withval" in
+		yes)
+			cat >> confdefs.h <<\EOF
+#define WITH_WINBIND_AUTH_CRAP 1
+EOF
+
+			echo "$ac_t""yes" 1>&6
+			;;
+	        no)
+			echo "$ac_t""no" 1>&6
+	                ;;
+	  esac 
+fi
+
+
+# Check for FreeBSD problem with getgroups
+
 	WINBIND_TARGETS="bin/wbinfo"
 	WINBIND_STARGETS="bin/winbindd"
 	case "$host_os" in
@@ -13336,26 +13359,11 @@ else
 fi
 
 
-# Check whether --with-winbind or --without-winbind was given.
-if test "${with_winbind+set}" = set; then
-  withval="$with_winbind"
-   
-  case "$withval" in
-	yes)
-		WITH_WINBIND_AUTH_CRAP=yes
-		;;
-        no)
-		WITH_WINBIND_AUTH_CRAP=no
-                ;;
-  esac 
-fi
-
-
 # Check for FreeBSD problem with getgroups
 # It returns EGID too many times in the list of groups
 # and causes a security problem
 echo $ac_n "checking whether or not getgroups returns EGID too many times""... $ac_c" 1>&6
-echo "configure:13359: checking whether or not getgroups returns EGID too many times" >&5
+echo "configure:13367: checking whether or not getgroups returns EGID too many times" >&5
 if eval "test \"`echo '$''{'samba_cv_have_getgroups_too_many_egids'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13363,7 +13371,7 @@ else
   samba_cv_have_getgroups_too_many_egids=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 13367 "configure"
+#line 13375 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13379,7 +13387,7 @@ int main(int argc, char *argv[])
   exit((n > 1 && groups[0] == getegid() && groups[1] == getegid()) ? 1 : 0);
 }
 EOF
-if { (eval echo configure:13383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   samba_cv_have_getgroups_too_many_egids=no
 else
@@ -13420,20 +13428,20 @@ fi
 #		[#include <pwd.h>])
 
 echo $ac_n "checking whether struct passwd has pw_comment""... $ac_c" 1>&6
-echo "configure:13424: checking whether struct passwd has pw_comment" >&5
+echo "configure:13432: checking whether struct passwd has pw_comment" >&5
 if eval "test \"`echo '$''{'samba_cv_passwd_pw_comment'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 13430 "configure"
+#line 13438 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 struct passwd p; p.pw_comment;
 ; return 0; }
 EOF
-if { (eval echo configure:13437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   samba_cv_passwd_pw_comment=yes
 else
@@ -13458,20 +13466,20 @@ fi
 #		[#include <pwd.h>])
 
 echo $ac_n "checking whether struct passwd has pw_age""... $ac_c" 1>&6
-echo "configure:13462: checking whether struct passwd has pw_age" >&5
+echo "configure:13470: checking whether struct passwd has pw_age" >&5
 if eval "test \"`echo '$''{'samba_cv_passwd_pw_age'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 13468 "configure"
+#line 13476 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 struct passwd p; p.pw_age;
 ; return 0; }
 EOF
-if { (eval echo configure:13475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   samba_cv_passwd_pw_age=yes
 else
@@ -13510,7 +13518,7 @@ fi
 
 if test x"$INCLUDED_POPT" != x"yes"; then
     echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
-echo "configure:13514: checking for poptGetContext in -lpopt" >&5
+echo "configure:13522: checking for poptGetContext in -lpopt" >&5
 ac_lib_var=`echo popt'_'poptGetContext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13518,7 +13526,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpopt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13522 "configure"
+#line 13530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13529,7 +13537,7 @@ int main() {
 poptGetContext()
 ; return 0; }
 EOF
-if { (eval echo configure:13533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13553,7 +13561,7 @@ fi
 fi
 
 echo $ac_n "checking whether to use included popt""... $ac_c" 1>&6
-echo "configure:13557: checking whether to use included popt" >&5
+echo "configure:13565: checking whether to use included popt" >&5
 if test x"$INCLUDED_POPT" = x"yes"; then
     echo "$ac_t""$srcdir/popt" 1>&6
     BUILD_POPT='$(POPT_OBJS)'
@@ -13568,16 +13576,16 @@ fi
 #################################################
 # final configure stuff
 echo $ac_n "checking configure summary""... $ac_c" 1>&6
-echo "configure:13572: checking configure summary" >&5
+echo "configure:13580: checking configure summary" >&5
 if test "$cross_compiling" = yes; then
   echo "configure: warning: cannot run when cross-compiling" 1>&2
 else
   cat > conftest.$ac_ext <<EOF
-#line 13577 "configure"
+#line 13585 "configure"
 #include "confdefs.h"
 #include "${srcdir-.}/tests/summary.c"
 EOF
-if { (eval echo configure:13581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
diff --git a/source/configure.in b/source/configure.in
index bdadabcee91..48a45d7b4a9 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -2693,6 +2693,23 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 
         AC_MSG_RESULT(yes)
 
+	AC_MSG_CHECKING(whether to enable winbind auth challenge/response code)
+	AC_ARG_WITH(winbind-auth-challenge,
+	[  --with-winbind-auth-challenge   Enable winbindd_pam_auth_crap() functionality (default no)],
+	[ 
+	  case "$withval" in
+		yes)
+			AC_DEFINE(WITH_WINBIND_AUTH_CRAP)
+			AC_MSG_RESULT(yes)
+			;;
+	        no)
+			AC_MSG_RESULT(no)
+	                ;;
+	  esac ],
+	)
+
+# Check for FreeBSD problem with getgroups
+
 	WINBIND_TARGETS="bin/wbinfo"
 	WINBIND_STARGETS="bin/winbindd"
 	case "$host_os" in
@@ -2720,19 +2737,6 @@ else
 fi
 
 
-AC_ARG_WITH(winbind,
-[  --with-winbind-auth-challenge   Enable winbindd_pam_auth_crap() functionality (default no)],
-[ 
-  case "$withval" in
-	yes)
-		WITH_WINBIND_AUTH_CRAP=yes
-		;;
-        no)
-		WITH_WINBIND_AUTH_CRAP=no
-                ;;
-  esac ],
-)
-
 # Check for FreeBSD problem with getgroups
 # It returns EGID too many times in the list of groups
 # and causes a security problem