diff options
| author | jmz <jmz@FreeBSD.org> | 1996-11-11 04:55:14 +0800 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 1996-11-11 04:55:14 +0800 |
| commit | 77ab922d04ee91a05b485fa8bdf4b56032a08270 (patch) | |
| tree | df95ea26502b075c6bd61bf6d709154d053b78c0 /x11-servers/XFree86-4-Server | |
| parent | 284b8ecf86874ef747582a42678aad1374227053 (diff) | |
| download | freebsd-ports-gnome-77ab922d04ee91a05b485fa8bdf4b56032a08270.tar.gz freebsd-ports-gnome-77ab922d04ee91a05b485fa8bdf4b56032a08270.tar.zst freebsd-ports-gnome-77ab922d04ee91a05b485fa8bdf4b56032a08270.zip | |
Look for Wraphelp.c in $DISTDIR
Compile XF86Setup only if the static library libtk4[1234].a is available
Diffstat (limited to 'x11-servers/XFree86-4-Server')
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 4bb7c713ee7a..82b59c164e8f 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -21,8 +21,8 @@ rm -f $F # Tk detection tkversion= -for v in 0 1 2 3 4; do - if `ls /usr/local/lib/libtk4.$v.so* >/dev/null 2>&1`; then +for v in 1 2 3 4; do + if [ -f /usr/local/lib/libtk4$v.a ]; then tkversion=$v fi done @@ -31,7 +31,7 @@ if [ X$tkversion != X ]; then echo "#define HasTk YES" >>$F echo "#define TkLibDir /usr/local/lib" >>$F echo "#define TkIncDir /usr/local/include" >>$F - echo "#define TkLibName tk4.$tkversion" >>$F + echo "#define TkLibName tk4$tkversion" >>$F echo "#define HasTcl YES" >>$F echo "#define TclLibDir /usr/lib" >>$F echo "#define TclIncDir /usr/include" >>$F @@ -164,8 +164,8 @@ if [ $answ = YES ]; then if [ -f $WH ] ; then echo "==> $WH found in source distribution." - elif [ -f $X11FIXES/Wraphelp.c ] ; then - echo "==> Wraphelp.c found in fix directory, copying to source tree." + elif [ -f $DISTDIR/Wraphelp.c ] ; then + echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree." cpwh=$X11FIXES/Wraphelp.c elif [ -f $FILESDIR/Wraphelp.c ] ; then echo "==> Wraphelp.c found in files directory, copying to source tree." |