Don't enable speedo & type1 modules if they're not being built

Clean up a couple of hardcoded paths & vendor names to use defines set by
    Imakefile

2 files changed, 27 insertions, 5 deletions

diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c
index d5f405f4a..509b74e76 100644
--- a/hw/xfree86/utils/xorgconfig/cards.c
+++ b/hw/xfree86/utils/xorgconfig/cards.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: $ */
 /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */
 
 
@@ -16,6 +17,19 @@
 
 #include "cards.h"
 
+/* Some vars to make path names in texts more flexible. */
+#ifndef PROJECTROOT
+# define PROJECTROOT		"/usr/X11R6"
+#endif
+#define TREEROOT		PROJECTROOT
+#define TREEROOTLX		TREEROOT "/lib/X11"
+#define TREEROOTCFG		TREEROOT "/etc/X11"
+#ifdef XDOCDIR
+# define TREEROOTDOC		XDOCDIR
+#else
+# define TREEROOTDOC		TREEROOTLX "/doc"
+#endif
+
 /*
  * Database format:
  *
@@ -92,12 +106,12 @@ static char *s3_comment =
 "# (this avoids the linear framebuffer probe). If that fails try\n"
 "# option \"nomemaccess\".\n"
 "#\n"
-"# Refer to /usr/X11R6/lib/doc/README.S3, and the XF86_S3 man page.\n";
+"# Refer to " TREEROOTDOC "/README.S3, and the XF86_S3 man page.\n";
 
 static char *cirrus_comment =
 "# Use Option \"no_bitblt\" if you have graphics problems. If that fails\n"
 "# try Option \"noaccel\".\n"
-"# Refer to /usr/X11R6/lib/doc/README.cirrus.\n"
+"# Refer to " TREEROOTDOC "/README.cirrus.\n"
 "# To allow linear addressing, uncomment the Option line and the\n"
 "# address that the card maps the framebuffer to.\n";
 
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 9b747cfd6..62ab9e94b 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -94,7 +94,7 @@
  *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
  */
 /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.4 2004/07/28 03:57:19 alanc Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.5 2004/08/11 20:25:13 krh Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -1886,7 +1886,7 @@ static char *XF86Config_firstchunk_text =
 "# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
 "# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
 "# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\n"
-"# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n"
+"# "XVENDORNAME" BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n"
 "# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF\n"
 "# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n"
 "# SOFTWARE.\n"
@@ -1919,9 +1919,17 @@ static char *XF86Config_firstchunk_text =
 "      Option    \"omit xfree86-dga\"   # don't initialise the DGA extension\n"
 "    EndSubSection\n"
 "\n"
-"# This loads the Type1 and FreeType font modules\n"
+"# This loads the font modules\n"
+#ifdef HAS_TYPE1
 "    Load        \"type1\"\n"
+#else
+"#    Load        \"type1\"\n"
+#endif
+#ifdef HAS_SPEEDO
 "    Load        \"speedo\"\n"
+#else
+"#    Load        \"speedo\"\n"
+#endif
 "    Load        \"freetype\"\n"
 "#    Load        \"xtt\"\n"
 "\n"