Mercurial > emacs
changeset 108134:236318fbe135
Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.
* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 27 Apr 2010 00:33:35 -0700 |
| parents | d5c67777ae39 |
| children | 1b010f84803e |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 27 00:02:12 2010 -0700 +++ b/ChangeLog Tue Apr 27 00:33:35 2010 -0700 @@ -1,5 +1,9 @@ 2010-04-27 Glenn Morris <rgm@gnu.org> + * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute + in Makefiles. + (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW. + * configure.in (HAVE_MOTIF_2_1): Remove unused variable. (LIBXP): No longer substitute in Makefiles. (MOTIF_LIBW): New output variable. Move system-specific settings here
--- a/configure.in Tue Apr 27 00:02:12 2010 -0700 +++ b/configure.in Tue Apr 27 00:33:35 2010 -0700 @@ -1830,7 +1830,6 @@ fi fi fi -AC_SUBST(LUCID_LIBW) X_TOOLKIT_TYPE=$USE_X_TOOLKIT @@ -2767,6 +2766,7 @@ AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SYSTEM) AC_SUBST(CFLAGS) +## Used in lwlib/Makefile.in. AC_SUBST(X_TOOLKIT_TYPE) AC_SUBST(machfile) AC_SUBST(opsysfile) @@ -2848,7 +2848,14 @@ fi fi AC_SUBST(WIDGET_OBJ) -AC_SUBST(MOTIF_LIBW) + +case "$USE_X_TOOLKIT" in + MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;; + LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;; + *) TOOLKIT_LIBW= ;; +esac +AC_SUBST(TOOLKIT_LIBW) + if test "${HAVE_X11}" = "yes" ; then AC_DEFINE(HAVE_X11, 1, [Define to 1 if you want to use version 11 of X windows.
--- a/src/ChangeLog Tue Apr 27 00:02:12 2010 -0700 +++ b/src/ChangeLog Tue Apr 27 00:33:35 2010 -0700 @@ -1,5 +1,9 @@ 2010-04-27 Glenn Morris <rgm@gnu.org> + * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by... + (TOOLKIT_LIBW): New, set by configure. + (@X_TOOLKIT_TYPE@): No longer define it. + * Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW. (MOTIF_LIBW): Set with configure, not cpp. * s/aix4-2.h (LIB_MOTIF):
--- a/src/Makefile.in Tue Apr 27 00:02:12 2010 -0700 +++ b/src/Makefile.in Tue Apr 27 00:33:35 2010 -0700 @@ -91,8 +91,7 @@ XMENU_OBJ=@XMENU_OBJ@ XOBJ=@XOBJ@ -LUCID_LIBW=@LUCID_LIBW@ -MOTIF_LIBW=@MOTIF_LIBW@ +TOOLKIT_LIBW=@TOOLKIT_LIBW@ LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -255,8 +254,7 @@ #endif /* not HAVE_MENUS */ #ifdef USE_X_TOOLKIT -# define @X_TOOLKIT_TYPE@ -LIBW=$(@X_TOOLKIT_TYPE@_LIBW) +LIBW=$(TOOLKIT_LIBW) #ifdef HAVE_X11XTR6 #ifdef NEED_LIBW