diff options
Diffstat (limited to 'x11/XFree86-4/scripts/configure')
| -rw-r--r-- | x11/XFree86-4/scripts/configure | 95 |
1 files changed, 1 insertions, 94 deletions
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index 38d2b0f22bf1..2643ebd8f20b 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -31,99 +31,6 @@ rm -f $F # set ProjectRoot to be ${PREFIX} echo "#define ProjectRoot ${PREFIX}" >>$F -# XXX the build of XF86Setup us broken in 4.0.2 (undefined reference to xf86OpenConfigFile) -if false; then - -# Tk detection -tkversion= -for v in 42 80 81 82 83 42jp 80jp; do - if [ -f /usr/local/lib/libtk$v.a ]; then - tkversion=$v - case $tkversion in - 42) - tclversion=76 - tclLversion=7.6 - tkLversion=4.2 - ;; - 80) - tclversion=80 - tclLversion=8.0 - tkLversion=8.0 - ;; - 42jp) - tclversion=76jp - tclLversion=7.6jp - tkLversion=4.2jp - ;; - 80jp) - tclversion=80jp - tclLversion=8.0jp - tkLversion=8.0jp - ;; - 81) - tclversion=81 - tclLversion=8.1 - tkLversion=8.1 - ;; - 82) - tclversion=82 - tclLversion=8.2 - tkLversion=8.2 - ;; - 83) - tclversion=83 - tclLversion=8.3 - tkLversion=8.3 - ;; - esac - fi -done -if [ X$tkversion != X ]; then - case $tkversion in - *jp) - echo "Using Japanized tk-$tkLversion" - if [ X"${MACHINE}" = X"pc98" ]; then - echo "#define HasJpTk YES" >>$F - echo "#define JpTkLibDir /usr/local/lib" >>$F - echo "#define JpTkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define JpTkLibName tk$tkversion" >>$F - echo "#define HasJpTcl YES" >>$F - echo "#define JpTclLibDir /usr/local/lib" >>$F - echo "#define JpTclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define JpTclLibName tcl$tclversion" >>$F - else - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F - fi - ;; - *) - echo "Using tk-$tkLversion" - echo "#define HasTk YES" >>$F - echo "#define TkLibDir /usr/local/lib" >>$F - echo "#define TkIncDir /usr/local/include/tk$tkLversion" >>$F - echo "#define TkLibName tk$tkversion" >>$F - echo "#define HasTcl YES" >>$F - echo "#define TclLibDir /usr/local/lib" >>$F - echo "#define TclIncDir /usr/local/include/tcl$tclLversion" >>$F - echo "#define TclLibName tcl$tclversion" >>$F - ;; - esac - echo "#define BuildXF86Setup YES" >>$F -else -cat <<EOF -*** I don't see the static library for tk version $tkversion in /usr/local/lib. -*** XF86Setup will not be installed. If you want to build this program -*** install tk 4.2 or 8.x first. - -EOF -fi -fi # false cat >> $F <<END #ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ @@ -308,7 +215,7 @@ echo yesno YES "Do you want to compile with PAM support?" echo "#define HasPam $answ" >> $F -echo "#define Freetype2Dir $LOCALBASE" >> $F +echo "#define InstallXserverSetUID NO " >> $F } configure |