diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-07-19 14:41:40 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-07-19 14:41:40 +0000 |
| commit | 2b944d930de21ecb807221fb9fb9f3f288fc75ec (patch) | |
| tree | d7bf353a6886ad9892ad24d1b232af40c024b698 /x11-servers | |
| parent | Add fix-12, remove cfont312.tgz (diff) | |
Fix a bug caused by a undefined variable in some cases.
Do not ask if Kerberos support is wanted when libkrb is not installed.
Notes
Notes:
svn path=/head/; revision=3406
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 24 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 24 |
2 files changed, 30 insertions, 18 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 |