diff options
author | jmz <jmz@FreeBSD.org> | 2000-10-25 01:39:01 +0000 |
---|---|---|
committer | jmz <jmz@FreeBSD.org> | 2000-10-25 01:39:01 +0000 |
commit | e4e359922a501f059c60f90d1fd6b0d15b4b4a54 (patch) | |
tree | 53e3a3c1ba96869172b298df318ac5f6190e8bf9 | |
parent | 339e524e5dccf4c2aa20fdb74e983e970d1e096e (diff) | |
download | FreeBSD-ports-e4e359922a501f059c60f90d1fd6b0d15b4b4a54.zip FreeBSD-ports-e4e359922a501f059c60f90d1fd6b0d15b4b4a54.tar.gz |
Fix bugs introduced in last commit which had to effect to always define
ForceNormalLib and HasSecureRPC
Remove more "if [ $answ = YES ] ..." unnecessary tests.
Ask for building with PAM support. It does not work for now: the #define HasPam
is strangely ignored in xdm's Imakefile.
-rw-r--r-- | x11/XFree86-4/scripts/configure | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index 30b2d84..7fa504b 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -208,27 +208,22 @@ else fi yesno YES "Build PEX?" -if [ $answ = NO ]; then - echo "#define BuildPexExt NO" >> $F -fi +echo "#define BuildPexExt $answ" >> $F + yesno YES "Build Xinerama?" echo "#define BuildXinerama $answ" >> $F yesno YES "Build XIE?" -if [ $answ = NO ]; then - echo "#define BuildXIE NO" >> $F -fi +echo "#define BuildXIE $answ" >> $F echo # XXX We may not want to default this to 'YES' if there are any app-default # files installed yesno YES "Install application defaults files?" -if [ $answ = NO ]; then - echo "#define InstallAppDefFiles NO" >> $F -fi +echo "#define InstallAppDefFiles $answ" >> $F yesno YES "Build static libraries in addition to shared libraries?" -echo "#define ForceNormalLib YES" >> $F +echo "#define ForceNormalLib $answ" >> $F if [ ${OSVERSION} -ge 300000 ]; then cat <<'END' @@ -240,7 +235,7 @@ cat <<'END' END yesno YES "Build with Secure RPC?" -echo "#define HasSecureRPC YES" >> $F +echo "#define HasSecureRPC $answ" >> $F fi cat <<'END' @@ -287,9 +282,8 @@ if [ $cpwh != NO ]; then fi echo -# no PAM support in XFree86-4 ! -#yesno YES "Do you want to compile with PAM support?" -#echo "#define HasPam $answ" >> $F +yesno YES "Do you want to compile with PAM support?" +echo "#define HasPam $answ" >> $F echo echo |