[gs-cvs] rev 8305 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2007-10-19 17:55:55 -0700 (Fri, 19 Oct 2007)
New Revision: 8305

Modified:
   trunk/gs/src/Makefile.in
   trunk/gs/src/configure.ac
   trunk/gs/src/unix-aux.mak
Log:
Pass the CFLAGS obtained for fontconfig from pkg-config separately
to avoid contaminating the general build.


Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in	2007-10-20 00:37:23 UTC (rev 8304)
+++ trunk/gs/src/Makefile.in	2007-10-20 00:55:55 UTC (rev 8305)
@@ -266,6 +266,10 @@
 #   gcc to accept ANSI-style function prototypes and function definitions.
 XCFLAGS=@DYNAMIC_FLAGS@
 
+# fontconfig flags, used by unix-aux.mak
+FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
+
 # defines from autoconf; note that we don't use these at present.
 ACDEFS=@DEFS@
 

Modified: trunk/gs/src/configure.ac
===================================================================
--- trunk/gs/src/configure.ac	2007-10-20 00:37:23 UTC (rev 8304)
+++ trunk/gs/src/configure.ac	2007-10-20 00:55:55 UTC (rev 8305)
@@ -176,6 +176,7 @@
 
 dnl Fontconfig support
 HAVE_FONTCONFIG=""
+FONTCONFIG_CFLAGS=""
 FONTCONFIG_LIBS=""
 AC_ARG_ENABLE(fontconfig, [  --disable-fontconfig    Don't use fontconfig to list system fonts])
 if test "$enable_fontconfig" != "no"; then
@@ -186,7 +187,7 @@
 		AC_MSG_CHECKING(for fontconfig with pkg-config)
 		if $PKGCONFIG --exists fontconfig; then
 			AC_MSG_RESULT(yes)
-			CFLAGS="$CFLAGS `$PKGCONFIG --cflags fontconfig`"
+			FONTCONFIG_CFLAGS="$CFLAGS `$PKGCONFIG --cflags fontconfig`"
 			FONTCONFIG_LIBS="`$PKGCONFIG --libs fontconfig`"
 			HAVE_FONTCONFIG=-DHAVE_FONTCONFIG
 		else
@@ -203,6 +204,7 @@
 	fi
 fi
 AC_SUBST(HAVE_FONTCONFIG)
+AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)
 
 dnl --------------------------------------------------

Modified: trunk/gs/src/unix-aux.mak
===================================================================
--- trunk/gs/src/unix-aux.mak	2007-10-20 00:37:23 UTC (rev 8304)
+++ trunk/gs/src/unix-aux.mak	2007-10-20 00:55:55 UTC (rev 8305)
@@ -35,7 +35,7 @@
 $(GLOBJ)gp_unix.$(OBJ): $(GLSRC)gp_unix.c $(AK)\
  $(pipe__h) $(string__h) $(time__h)\
  $(gx_h) $(gsexit_h) $(gp_h)
-	$(GLCC) $(GLO_)gp_unix.$(OBJ) $(C_) $(GLSRC)gp_unix.c
+	$(GLCC) $(FONTCONFIG_CFLAGS) $(GLO_)gp_unix.$(OBJ) $(C_) $(GLSRC)gp_unix.c
 
 $(GLOBJ)gp_unix_cache.$(OBJ): $(GLSRC)gp_unix_cache.c $(AK)\
  $(stdio__h) $(string__h) $(time__h) $(gconfigd_h) $(gp_h) $(md5_h)