Mercurial > emacs
changeset 108149:1af337cb46c4
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 28 Apr 2010 00:08:53 -0700 |
| parents | 1c3ecdb885b5 |
| children | 66c73788b432 |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 28 00:01:43 2010 -0700 +++ b/ChangeLog Wed Apr 28 00:08:53 2010 -0700 @@ -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.
--- a/configure.in Wed Apr 28 00:01:43 2010 -0700 +++ b/configure.in Wed Apr 28 00:08:53 2010 -0700 @@ -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)
--- a/src/ChangeLog Wed Apr 28 00:01:43 2010 -0700 +++ b/src/ChangeLog Wed Apr 28 00:08:53 2010 -0700 @@ -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):
--- a/src/Makefile.in Wed Apr 28 00:01:43 2010 -0700 +++ b/src/Makefile.in Wed Apr 28 00:08:53 2010 -0700 @@ -109,6 +109,9 @@ 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 @@ #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 */