aboutsummaryrefslogtreecommitdiffstats
path: root/x11/XFree86-4
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1998-09-23 13:50:41 +0800
committermarkm <markm@FreeBSD.org>1998-09-23 13:50:41 +0800
commitf0bef1282ffb6de5f3fe49e74270b21f3cf92ddd (patch)
treec399e0b5f7e01addf31e987a5dfb7b31139582e8 /x11/XFree86-4
parenta9d4f9ce858d961df2f72582e6e3e87aa85514b7 (diff)
downloadfreebsd-ports-gnome-f0bef1282ffb6de5f3fe49e74270b21f3cf92ddd.tar.gz
freebsd-ports-gnome-f0bef1282ffb6de5f3fe49e74270b21f3cf92ddd.tar.zst
freebsd-ports-gnome-f0bef1282ffb6de5f3fe49e74270b21f3cf92ddd.zip
Fixes for Krb4.
Reviewed by: Steve Price <sprice@hiwaay.net>
Diffstat (limited to 'x11/XFree86-4')
-rw-r--r--x11/XFree86-4/scripts/configure24
1 files changed, 16 insertions, 8 deletions
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 299a38014150..80ceb997fab7 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -230,6 +230,14 @@ if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
+# ELF detection
+if [ `sysctl -n kern.osreldate` -ge 300004 -a X`objformat` = Xelf ]; then
+ ELF=yes
+ echo "#define UseElfFormat YES" >> $F
+else
+ ELF=no
+fi
+
cat <<'END'
XDM can be built so that it will get a KerberosIV TGT for your users
@@ -246,11 +254,16 @@ cat <<'END'
will not be enabled if the kerberos libraries are unavailable.
END
-#yesno "Do you want to enable KerberosIV support? [YES] "
-answ=NO
+yesno "Do you want to enable KerberosIV support? [YES] "
cpkb=NO
if [ $answ = YES ]; then
- LIBKRB=/usr/lib/libkrb.a
+ if [ $ELF = yes ]; then
+ LIBKRB=/usr/lib/libkrb.a
+ elif [ -d /usr/lib/aout ]; then
+ LIBKRB=/usr/lib/aout/libkrb.a
+ else
+ LIBKRB=/usr/lib/libkrb.a
+ fi
K4PATCH=$FILESDIR/kerberos4.diffs
K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
XDMDIR=$WRKDIR/xc/programs/xdm/
@@ -268,11 +281,6 @@ if [ $cpkb != NO ]; then
echo "#define HasKrb4 $answ" >> $F
fi
-# ELF detection
-test `sysctl -n kern.osreldate` -ge 300004 &&
- test `objformat` = elf &&
- echo "#define UseElfFormat YES" >> $F
-
echo
echo "End of configuration questions. No more user input required"
echo