Look for Wraphelp.c in $DISTDIR

Compile XF86Setup only if the static library libtk4[1234].a is available

6 files changed, 30 insertions, 30 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."
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 4bb7c713ee7a..82b59c164e8f 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/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/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 4bb7c713ee7a..82b59c164e8f 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/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/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 4bb7c713ee7a..82b59c164e8f 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/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/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 4bb7c713ee7a..82b59c164e8f 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/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."