From 6e546d181bf5911fafac9d64c46652e34c34d62e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 May 2010 14:31:19 -0700 Subject: [PATCH] Always define FONT_OBJ; to empty in the non-X case. * configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS. * src/Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. * msdos/sed1v2.inp (FONT_OBJ): Edit to empty for non-X case. * msdos/sed1x.inp (FONT_OBJ): Edit to xfont.o for X case. --- ChangeLog | 4 ++++ configure.in | 17 +++++++++-------- msdos/ChangeLog | 5 +++++ msdos/sed1v2.inp | 2 +- msdos/sed1x.inp | 1 + src/ChangeLog | 5 +++++ src/Makefile.in | 10 ++++++---- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68098657aeb..10c2d45be32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-15 Glenn Morris + + * configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS. + 2010-05-15 Ken Raeburn * configure.in: Look for version string in its new location. diff --git a/configure.in b/configure.in index ebd991b2ad6..27a7ad5541b 100644 --- a/configure.in +++ b/configure.in @@ -2231,14 +2231,6 @@ else 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) @@ -3075,14 +3067,23 @@ AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", XMENU_OBJ= XOBJ= +FONT_OBJ= if test "${HAVE_X_WINDOWS}" = "yes" ; then AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if you want to use the X window system.]) XMENU_OBJ=xmenu.o XOBJ="xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o xsettings.o xgselect.o" + 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) fi AC_SUBST(XMENU_OBJ) AC_SUBST(XOBJ) +AC_SUBST(FONT_OBJ) WIDGET_OBJ= MOTIF_LIBW= diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7395bfe4743..bc9718e598f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2010-05-15 Glenn Morris + + * sed1v2.inp (FONT_OBJ): Edit to empty for non-X case. + * sed1x.inp (FONT_OBJ): Edit to xfont.o for X case. + 2010-05-15 Eli Zaretskii * sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 22e9f843a16..3a10a8ada11 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -106,7 +106,7 @@ s/\.h\.in/.h-in/ /^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ -/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o/ +/^FONT_OBJ *=/s/@FONT_OBJ@// /^MOUSE_SUPPORT *=/s/@MOUSE_SUPPORT@/$(REAL_MOUSE_SUPPORT)/ /^TOOLTIP_SUPPORT *=/s/@TOOLTIP_SUPPORT@// /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index d9d7a87c992..cb86d0251cb 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -10,6 +10,7 @@ s/DOC/DOC-X/g /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! +/^FONT_OBJ *=/s!= *!= xfont.o! /^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! /^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)! /^temacs *:/s!OLDXMENU!LIBXMENU! diff --git a/src/ChangeLog b/src/ChangeLog index 877accc913b..76b4e70c7bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-05-15 Glenn Morris + + * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. + (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. + 2010-05-15 Ken Raeburn * lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an diff --git a/src/Makefile.in b/src/Makefile.in index 2674d532a2c..ede7d722543 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -208,7 +208,10 @@ NS_SUPPORT=@NS_SUPPORT@ GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ -## Only used if HAVE_X_WINDOWS. +## Empty if !HAVE_X_WINDOWS +## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT +## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE +## else xfont.o FONT_OBJ=@FONT_OBJ@ ## Used if HAVE_MOUSE. @@ -297,7 +300,6 @@ LIBXMENU=@LIBXMENU@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ -FONT_DRIVERS=$(FONT_OBJ) #endif /* HAVE_X_WINDOWS */ @@ -356,7 +358,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ process.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ - $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) + $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) /* Object files used on some machine or other. These go in the DOC file on all machines in case they are needed. */ @@ -365,7 +367,7 @@ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ fontset.o dbusbind.o \ nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ - w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) + w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ) gmallocobj = rallocobj = -- 2.39.5