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

[giles at ghostscript.com]

Author: giles
Date: 2007-06-28 15:16:45 -0700 (Thu, 28 Jun 2007)
New Revision: 8084

Modified:
   trunk/gs/src/Makefile.in
   trunk/gs/src/configure.ac
Log:
Pass -DHAVE_FONTCONFIG through CAPOPT so the fontconfig patch is 
actually enabled by the autoconf build.

DETAILS:

Previously, it was passed through ACDEFS which we don't currently use. 
This line is getting longer; probably we should move to 
platform-specific config files, and manage the autoconf one with 
autoheader.


Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in	2007-06-28 22:08:46 UTC (rev 8083)
+++ trunk/gs/src/Makefile.in	2007-06-28 22:16:45 UTC (rev 8084)
@@ -121,7 +121,7 @@
 # -DHAVE_FILE64
 #	use marked versions of the stdio FILE calls, fopen64() et al.
 
-CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@
+CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_FONTCONFIG@
 
 # Define the name of the executable file.
 

Modified: trunk/gs/src/configure.ac
===================================================================
--- trunk/gs/src/configure.ac	2007-06-28 22:08:46 UTC (rev 8083)
+++ trunk/gs/src/configure.ac	2007-06-28 22:16:45 UTC (rev 8084)
@@ -174,6 +174,7 @@
 AC_PATH_PROG(PKGCONFIG, pkg-config)
 
 dnl Fontconfig support
+HAVE_FONTCONFIG=""
 FONTCONFIG_LIBS=""
 AC_ARG_ENABLE(fontconfig, [  --disable-fontconfig    Don't use fontconfig to list system fonts])
 if test "$enable_fontconfig" != "no"; then
@@ -188,12 +189,13 @@
 			AC_MSG_RESULT(yes)
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags fontconfig`"
 			FONTCONFIG_LIBS="`$PKGCONFIG --libs fontconfig`"
-			AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1)
+			HAVE_FONTCONFIG=-DHAVE_FONTCONFIG
 		else
 			AC_MSG_RESULT(no)
 		fi
 	fi
 fi
+AC_SUBST(HAVE_FONTCONFIG)
 AC_SUBST(FONTCONFIG_LIBS)
 
 dnl --------------------------------------------------