Index: .cvsignore
===================================================================
RCS file: /var/lib/cvs/guifications/.cvsignore,v
retrieving revision 1.5
diff -u -p -r1.5 .cvsignore
--- a/.cvsignore	23 Apr 2004 10:32:53 -0000	1.5
+++ b/.cvsignore	24 May 2004 18:00:51 -0000
@@ -7,8 +7,6 @@ config.log
 config.status
 config.sub
 configure
-gf_config.h
-gf_config.h.in
 guifications.spec
 install-sh
 libtool
@@ -17,3 +15,6 @@ missing
 mkinstalldirs
 stamp-h
 stamp-h.in
+gf_config.h
+pre_config.h
+pre_config.h.in
Index: Makefile.mingw
===================================================================
RCS file: /var/lib/cvs/guifications/Makefile.mingw,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.mingw
--- a/Makefile.mingw	11 Jan 2004 05:07:41 -0000	1.13
+++ b/Makefile.mingw	24 May 2004 18:00:51 -0000
@@ -19,7 +19,7 @@ GF_VERSION := $(shell cat ./VERSION)
 GAIM_VERSION := $(shell cat ../../VERSION)
 
 all:
-	cp gf_config.h.mingw gf_config.h
+	cp gf_config.h.mingw $(GF_SRC)/gf_config.h
 	$(MAKE) -C $(GF_SRC) -f Makefile.mingw
 
 install: all 
Index: configure.ac
===================================================================
RCS file: /var/lib/cvs/guifications/configure.ac,v
retrieving revision 1.17
diff -u -p -r1.17 configure.ac
--- a/configure.ac	1 Apr 2004 18:56:43 -0000	1.17
+++ b/configure.ac	24 May 2004 18:00:52 -0000
@@ -116,7 +116,7 @@ AM_PROG_LIBTOOL
 #
 # Finish up
 #
-AM_CONFIG_HEADER(gf_config.h)
+AM_CONFIG_HEADER(pre_config.h)
 AC_OUTPUT([Makefile
 		   pixmaps/Makefile
 		   src/Makefile
Index: src/Makefile.am
===================================================================
RCS file: /var/lib/cvs/guifications/src/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- a/src/Makefile.am	10 Mar 2004 00:59:17 -0000	1.6
+++ b/src/Makefile.am	24 May 2004 18:00:52 -0000
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 	gf_pngs.h \
 	gf_gtkutils.h \
 	gf_types.h
-	
+
 plugindir = $(libdir)/gaim
 
 guifications_la_LDFLAGS = -module -avoid-version
@@ -23,7 +23,7 @@ guifications_la_SOURCES = \
 	gf_utils.c \
 	gf_pngs.c \
 	gf_gtkutils.c
-	
+
 endif
 
 AM_CPPFLAGS = \
@@ -34,3 +34,10 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GLIB_CFLAGS)
+
+BUILT_SOURCES = ../gf_config.h
+
+$(OBJECTS): $(BUILT_SOURCES)
+
+../gf_config.h: ../pre_config.h
+	sed 's/#define PACKAGE/#define GF_PACKAGE/g' ../pre_config.h > $@