Fix a bug caused by a undefined variable in some cases.

Do not ask if Kerberos support is wanted when libkrb is not installed.

6 files changed, 90 insertions, 54 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index dc88893227ac..db05ffbe54a1 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -131,8 +131,10 @@ if [ $answ = YES ]; then
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@ cat <<'END'
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo