Set FONT_DRIVERS with configure rather than cpp.

* configure.in (FONT_OBJ): New output variable.
* src/Makefile.in (FONT_OBJ): New, set by configure.
(FONT_DRIVERS): Use $FONT_OBJ.

diff --git a/ChangeLog b/ChangeLog
index 0673c9a1089ec61389ff61c7d04383a05971d3c5..639ba623e913a1871cb788ea1af78c1a1ac88ed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+       * configure.in (FONT_OBJ): New output variable.
+
        * configure.in (LIBXMU): New output variable.
 
        * configure.in (NS_OBJ, NS_SUPPORT): New output variables.

diff --git a/configure.in b/configure.in
index 57831879b71109f1360ce52a4d2330d7cdfb9ddd..89f2b47ff8fece43137349108e841bd6c3ad50d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2121,6 +2121,15 @@ else
     HAVE_LIBOTF=no
     HAVE_M17N_FLT=no
 fi
+
+FONT_OBJ=xfont.o
+if test "$HAVE_XFT" = "yes"; then
+  FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o"
+elif test "$HAVE_FREETYPE" = "yes"; then
+  FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o"
+fi
+AC_SUBST(FONT_OBJ)
+
 ### End of font-backend (under X11) section.
 
 AC_SUBST(FREETYPE_CFLAGS)

diff --git a/src/ChangeLog b/src/ChangeLog
index b045fa9b4e16c758a4bedb4d8ee509817c9538bc..53eab88cc393b84433438f7815cd04aadd185463 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (FONT_OBJ): New, set by configure.
+       (FONT_DRIVERS): Use $FONT_OBJ.
+
        * Makefile.in (LIBXMU): Set with configure, not cpp.
        * s/aix4-2.h (LIBXMU):
        * s/hpux10-20.h (LIBXMU):

diff --git a/src/Makefile.in b/src/Makefile.in
index 256662a4029b7a8a35918ab098485adc3a1dbe96..a90b0ef862d8ca5f5e510a92bb1f79908a245326 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -109,6 +109,9 @@ WIDGET_OBJ=@WIDGET_OBJ@
 NS_OBJ=@NS_OBJ@
 NS_SUPPORT=@NS_SUPPORT@
 
+## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
+FONT_OBJ=@FONT_OBJ@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -374,13 +377,7 @@ ns_appsrc=@ns_appsrc@
 
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
-#if defined (HAVE_XFT)
-FONT_DRIVERS = xfont.o ftfont.o xftfont.o ftxfont.o
-#elif defined (HAVE_FREETYPE)
-FONT_DRIVERS = xfont.o ftfont.o ftxfont.o
-#else /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
-FONT_DRIVERS = xfont.o
-#endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */
+FONT_DRIVERS=$(FONT_OBJ)
 #endif /* HAVE_X_WINDOWS */
 #endif /* HAVE_WINDOW_SYSTEM */