[Emacs-diffs] /srv/bzr/emacs/trunk r100066: Set FONT_DRIVERS with configure rather than cpp.

[Glenn Morris]

------------------------------------------------------------
revno: 100066
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-28 00:08:53 -0700
message:
  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.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-28 07:01:43 +0000
+++ b/ChangeLog 2010-04-28 07:08:53 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * configure.in (FONT_OBJ): New output variable.
+
        * configure.in (LIBXMU): New output variable.
 
        * configure.in (NS_OBJ, NS_SUPPORT): New output variables.

=== modified file 'configure.in'
--- a/configure.in      2010-04-28 07:01:43 +0000
+++ b/configure.in      2010-04-28 07:08:53 +0000
@@ -2121,6 +2121,15 @@
     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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 07:01:43 +0000
+++ b/src/ChangeLog     2010-04-28 07:08:53 +0000
@@ -1,5 +1,8 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-28 07:01:43 +0000
+++ b/src/Makefile.in   2010-04-28 07:08:53 +0000
@@ -109,6 +109,9 @@
 address@hidden@
 address@hidden@
 
+## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
address@hidden@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -374,13 +377,7 @@
 
 #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 */