Commit bc0b5f61 authored by Glenn Morris's avatar Glenn Morris

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.
parent 294c50a0
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.
......
......@@ -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)
......
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):
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment