Force the compilation of the SVGA server in all cases: other servers share

files with this one (reported by ache).
Issue a warning about XFSetup if libtk is not found.

4 files changed, 44 insertions, 4 deletions

diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index d62698dbe851..2d2133259ca0 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -36,13 +36,23 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibDir		/usr/lib" >>$F
   echo "#define TclIncDir		/usr/include" >>$F
   echo "#define TclLibName		tcl75" >>$F
+else
+cat <<EOF
+*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** XF86Setup will not be installed. If you want to build this program
+*** install tk first.
+
+EOF
 fi
 cat <<END
  Which servers do you wish to build, you can save a lot of disk space
  by only compiling the server you will be using.  It will also save you
  considerable compile time.
 END
-servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+# force the compilation of the SVGA server.
+echo "#undef XF86SVGAServer"           >>$F
+echo "#define XF86SVGAServer     YES"  >>$F
+servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
 for i in $servers; do
   yesno "Do you want to build the $i server? [YES] "
   echo "#undef XF86${i}Server"           >>$F
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index d62698dbe851..2d2133259ca0 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -36,13 +36,23 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibDir		/usr/lib" >>$F
   echo "#define TclIncDir		/usr/include" >>$F
   echo "#define TclLibName		tcl75" >>$F
+else
+cat <<EOF
+*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** XF86Setup will not be installed. If you want to build this program
+*** install tk first.
+
+EOF
 fi
 cat <<END
  Which servers do you wish to build, you can save a lot of disk space
  by only compiling the server you will be using.  It will also save you
  considerable compile time.
 END
-servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+# force the compilation of the SVGA server.
+echo "#undef XF86SVGAServer"           >>$F
+echo "#define XF86SVGAServer     YES"  >>$F
+servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
 for i in $servers; do
   yesno "Do you want to build the $i server? [YES] "
   echo "#undef XF86${i}Server"           >>$F
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index d62698dbe851..2d2133259ca0 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -36,13 +36,23 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibDir		/usr/lib" >>$F
   echo "#define TclIncDir		/usr/include" >>$F
   echo "#define TclLibName		tcl75" >>$F
+else
+cat <<EOF
+*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** XF86Setup will not be installed. If you want to build this program
+*** install tk first.
+
+EOF
 fi
 cat <<END
  Which servers do you wish to build, you can save a lot of disk space
  by only compiling the server you will be using.  It will also save you
  considerable compile time.
 END
-servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+# force the compilation of the SVGA server.
+echo "#undef XF86SVGAServer"           >>$F
+echo "#define XF86SVGAServer     YES"  >>$F
+servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
 for i in $servers; do
   yesno "Do you want to build the $i server? [YES] "
   echo "#undef XF86${i}Server"           >>$F
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index d62698dbe851..2d2133259ca0 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -36,13 +36,23 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibDir		/usr/lib" >>$F
   echo "#define TclIncDir		/usr/include" >>$F
   echo "#define TclLibName		tcl75" >>$F
+else
+cat <<EOF
+*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** XF86Setup will not be installed. If you want to build this program
+*** install tk first.
+
+EOF
 fi
 cat <<END
  Which servers do you wish to build, you can save a lot of disk space
  by only compiling the server you will be using.  It will also save you
  considerable compile time.
 END
-servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+# force the compilation of the SVGA server.
+echo "#undef XF86SVGAServer"           >>$F
+echo "#define XF86SVGAServer     YES"  >>$F
+servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
 for i in $servers; do
   yesno "Do you want to build the $i server? [YES] "
   echo "#undef XF86${i}Server"           >>$F