Mercurial > emacs
changeset 108217:100210917be8
Replace some X-related cpp with autoconf.
* configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.
* src/Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
(LIBXT_OTHER, LIBX_OTHER): New, set by configure.
(LIBXT): Set with configure, not cpp.
(LIBX): Remove.
(LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 02 May 2010 19:10:43 -0700 |
| parents | 2fb32340c261 |
| children | d3dcd602c617 |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 30 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 02 18:53:58 2010 -0700 +++ b/ChangeLog Sun May 02 19:10:43 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-03 Glenn Morris <rgm@gnu.org> + * configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables. + * make-dist: There are no more src/m/*.inp files. 2010-05-01 Dan Nicolaescu <dann@ics.uci.edu>
--- a/configure.in Sun May 02 18:53:58 2010 -0700 +++ b/configure.in Sun May 02 19:10:43 2010 -0700 @@ -2903,6 +2903,13 @@ esac AC_SUBST(TOOLKIT_LIBW) +if test "$USE_X_TOOLKIT" = "none"; then + LIBXT_OTHER="\$(LIBXSM)" +else + LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" +fi +AC_SUBST(LIBXT_OTHER) + ## The X Menu stuff is present in the X10 distribution, but missing ## from X11. If we have X10, just use the installed library; ## otherwise, use our own copy. @@ -2917,9 +2924,11 @@ OLDXMENU="\${lwlibdir}liblw.a" fi LIBXMENU="\$(OLDXMENU)" + LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" else OLDXMENU= LIBXMENU="-lXMenu" + LIBX_OTHER= fi if test "$HAVE_GTK" = "yes"; then @@ -2929,6 +2938,7 @@ AC_SUBST(OLDXMENU) AC_SUBST(LIBXMENU) +AC_SUBST(LIBX_OTHER) if test "${HAVE_MENUS}" = "yes" ; then AC_DEFINE(HAVE_MENUS, 1,
--- a/src/ChangeLog Sun May 02 18:53:58 2010 -0700 +++ b/src/ChangeLog Sun May 02 19:10:43 2010 -0700 @@ -1,3 +1,11 @@ +2010-05-03 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables. + (LIBXT_OTHER, LIBX_OTHER): New, set by configure. + (LIBXT): Set with configure, not cpp. + (LIBX): Remove. + (LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER. + 2010-05-02 Dan Nicolaescu <dann@ics.uci.edu> * m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.
--- a/src/Makefile.in Sun May 02 18:53:58 2010 -0700 +++ b/src/Makefile.in Sun May 02 19:10:43 2010 -0700 @@ -76,6 +76,7 @@ LIBGIF=@LIBGIF@ LIBXPM=@LIBXPM@ XFT_LIBS=@XFT_LIBS@ +LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -92,6 +93,10 @@ LIBXTR6=@LIBXTR6@ +## $(LIBXMU) -lXt $(LIBXTR6) -lXext if USE_X_TOOLKIT, else $(LIBXSM). +## Only used if HAVE_X_WINDOWS. +LIBXT_OTHER=@LIBXT_OTHER@ + XMENU_OBJ=@XMENU_OBJ@ XOBJ=@XOBJ@ @@ -249,7 +254,6 @@ $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS - /* This test needs to say in cpp for the time being, since s/ms-w32.h and s/msdos.h define HAVE_MENUS, possibly overriding configure. */ #ifdef HAVE_MENUS @@ -260,18 +264,9 @@ LIBXMENU= #endif /* not HAVE_MENUS */ -#ifdef USE_X_TOOLKIT -LIBXT=$(TOOLKIT_LIBW) $(LIBXMU) -lXt $(LIBXTR6) -lXext -#else /* not USE_X_TOOLKIT */ -LIBXT=$(TOOLKIT_LIBW) $(LIBXSM) -#endif /* not USE_X_TOOLKIT */ - -#ifdef HAVE_X11 -X11_LDFLAGS = LD_SWITCH_X_SITE -LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) -#else /* not HAVE_X11 */ -LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -#endif /* not HAVE_X11 */ +LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) +LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE +LIBX_OTHER=@LIBX_OTHER@ #endif /* not HAVE_X_WINDOWS */ #ifndef ORDINARY_LINK @@ -689,8 +684,8 @@ duplicated symbols. If the standard libraries were compiled with GCC, we might need gnulib again after them. */ -LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ - @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \ +LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ + $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \ $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ $(GNULIB_VAR) @LIB_MATH@ LIB_STANDARD $(GNULIB_VAR)