Commit 6e546d18 authored by Glenn Morris's avatar Glenn Morris

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.
parent 52766425
2010-05-15 Glenn Morris <rgm@gnu.org>
* configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* configure.in: Look for version string in its new location.
......
......@@ -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=
......
2010-05-15 Glenn Morris <rgm@gnu.org>
* 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 <eliz@gnu.org>
* sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after
......
......@@ -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@//
......
......@@ -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!
......
2010-05-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an
......
......@@ -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 =
......
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