diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-11-10 20:55:14 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1996-11-10 20:55:14 +0000 |
| commit | b59156cd49917cbb8d3932caf65353a6e84f7264 (patch) | |
| tree | 472f37651a64697afcf07da02a9ff0d5b41d3c86 /x11-servers | |
| parent | c10173d00b2fa240d7e0f2cb2a8cb85b46b25efe (diff) | |
| download | ports-b59156cd49917cbb8d3932caf65353a6e84f7264.tar.gz ports-b59156cd49917cbb8d3932caf65353a6e84f7264.zip | |
Look for Wraphelp.c in $DISTDIR
Compile XF86Setup only if the static library libtk4[1234].a is available
Notes
Notes:
svn path=/head/; revision=4374
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 10 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 4bb7c713ee7a..82b59c164e8f 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/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." 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." |