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.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b045fa9b4e1..53eab88cc39 100644
--- 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 256662a4029..a90b0ef862d 100644
--- 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 */