[Mesa3d-dev] setting location of conf files for ggi [patch included]

[James A. T. <tr...@de...>]

Below is a patch so that the location of the ggi conf files are set from
autoconf. It only affects the .c files. There are still 3 conf files
that have hard coded paths in them. Any recommendations on how these
should be set?

diff -u -r src/GGI.orig/Makefile.am src/GGI/Makefile.am
--- src/GGI.orig/Makefile.am	Sun Jul  9 23:09:41 2000
+++ src/GGI/Makefile.am	Mon Jul 10 16:26:30 2000
@@ -8,6 +8,8 @@
 # Build a libtool convenience library.
 noinst_LTLIBRARIES = libMesaGGI.la
 
+CFLAGS = -DGGIMESACONFFILE=\"/etc/ggi/ggimesa.conf\" @CFLAGS@
+
 libMesaGGI_la_SOURCES = ggimesa.c
 libMesaGGI_la_LIBADD = $(GGI_LIBS)
 
diff -u -r src/GGI.orig/default/Makefile.am src/GGI/default/Makefile.am
--- src/GGI.orig/default/Makefile.am	Mon Jul 10 16:33:58 2000
+++ src/GGI/default/Makefile.am	Mon Jul 10 16:34:29 2000
@@ -13,7 +13,7 @@
 sublib_LTLIBRARIES = stubs.la linear_8.la linear_15.la \
 	linear_16.la linear_24.la linear_32.la $(KGILIB)
 
-
+CFLAGS = -DGGIMESACONFFILE=\"/etc/ggi/ggimesa.conf\" @CFLAGS@
 
 genkgi_la_SOURCES = genkgi_visual.c genkgi_mode.c
 genkgi_la_LDFLAGS = -module -no-undefined -avoid-verison \
diff -u -r src/GGI.orig/default/genkgi_visual.c src/GGI/default/genkgi_visual.c
--- src/GGI.orig/default/genkgi_visual.c	Mon Jul 10 16:27:17 2000
+++ src/GGI/default/genkgi_visual.c	Mon Jul 10 14:19:16 2000
@@ -67,7 +67,9 @@
 #define NUM_ACCELS	(sizeof(accel_strings)/sizeof(accel_info))
 
 /* FIXME: These should be defined in the makefile system */
+#ifndef CONF_FILE
 #define CONF_FILE "/usr/local/etc/ggi/mesa/targets/genkgi.conf"
+#endif
 void *_configHandle;
 char confstub[512] = CONF_FILE;
 char *conffile = confstub;
diff -u -r src/GGI.orig/display/Makefile.am src/GGI/display/Makefile.am
--- src/GGI.orig/display/Makefile.am	Mon Jul 10 16:34:09 2000
+++ src/GGI/display/Makefile.am	Mon Jul 10 16:34:39 2000
@@ -10,6 +10,8 @@
 fbdev_la_LDFLAGS = -module -no-undefined -avoid-verison \
 	-export-symbols-regex "GGIdl.*"
 
+CFLAGS = -DGGIMESACONFFILE=\"/etc/ggi/ggimesa.conf\" @CFLAGS@
+	
 fbdevconfdir = $(sysconfdir)/ggi/mesa/targets
 fbdevconf_DATA = fbdev.conf
 	
diff -u -r src/GGI.orig/display/fbdev_visual.c src/GGI/display/fbdev_visual.c
--- src/GGI.orig/display/fbdev_visual.c	Mon Jul 10 16:28:22 2000
+++ src/GGI/display/fbdev_visual.c	Mon Jul 10 14:20:04 2000
@@ -67,7 +67,9 @@
 #define NUM_ACCELS	(sizeof(accel_strings)/sizeof(accel_info))
 
 /* FIXME: These should really be defined in the make system */
+#ifndef CONF_FILE
 #define CONF_FILE "/usr/local/etc/ggi/mesa/targets/fbdev.conf"
+#endif
 void *_configHandle;
 char confstub[512] = CONF_FILE;
 char *conffile = confstub;
diff -u -r src/GGI.orig/ggimesa.c src/GGI/ggimesa.c
--- src/GGI.orig/ggimesa.c	Fri Jul  7 16:35:37 2000
+++ src/GGI/ggimesa.c	Sun Jul  9 23:35:38 2000
@@ -42,7 +42,9 @@
 static void *_ggimesaConfigHandle;
 
 /* FIXME: These should really be defined in the make system using -Dxxx */
+#ifndef GGIMESACONFFILE
 #define GGIMESACONFFILE "/usr/local/etc/ggi/ggimesa.conf"
+#endif
 #define GGIMESATAGLEN 0
 static char ggimesaconfstub[512] = GGIMESACONFFILE;
 static char *ggimesaconffile = ggimesaconfstub + GGIMESATAGLEN;

-- 
James (Jay) Treacy
tr...@de...