diff options
| author | Mark Murray <markm@FreeBSD.org> | 1998-09-23 05:50:41 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1998-09-23 05:50:41 +0000 |
| commit | b61094265ad80086f59202830d1a328c38897b32 (patch) | |
| tree | 7154d708de6b098bb6ef54de9cf56770d23e3f1c /x11-servers | |
| parent | 06e87ec344b03723c3024239d334465bb7fa352e (diff) | |
| download | ports-b61094265ad80086f59202830d1a328c38897b32.tar.gz ports-b61094265ad80086f59202830d1a328c38897b32.zip | |
Notes
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, 32 insertions, 16 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 299a38014150..80ceb997fab7 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/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 diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 299a38014150..80ceb997fab7 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/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 |