Mercurial > emacs
changeset 108136:43dcbd8381dc
Move LIBXTR6 from cpp to autoconf.
* configure.in (LIBXTR6): New output variable. Move unixware special
case here from src/s/unixware.h.
* src/Makefile.in (LIBXTR6): Set with configure, not cpp.
* src/s/unixware.h (NEED_LIBW): Remove definition.
* admin/CPP-DEFINES: Remove NEED_LIBW.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 27 Apr 2010 01:09:01 -0700 |
| parents | 1b010f84803e |
| children | 4e52ea307c2d |
| files | ChangeLog admin/CPP-DEFINES configure.in src/ChangeLog src/Makefile.in src/s/unixware.h |
| diffstat | 6 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 27 00:38:05 2010 -0700 +++ b/ChangeLog Tue Apr 27 01:09:01 2010 -0700 @@ -1,5 +1,8 @@ 2010-04-27 Glenn Morris <rgm@gnu.org> + * configure.in (LIBXTR6): New output variable. Move unixware special + case here from src/s/unixware.h. + * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles. (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
--- a/admin/CPP-DEFINES Tue Apr 27 00:38:05 2010 -0700 +++ b/admin/CPP-DEFINES Tue Apr 27 01:09:01 2010 -0700 @@ -250,7 +250,6 @@ MUST_UNDEF__STDC__ NEED_BSDTTY NEED_ERRNO -NEED_LIBW NEED_UNISTD_H NLIST_STRUCT NOT_C_CODE
--- a/configure.in Tue Apr 27 00:38:05 2010 -0700 +++ b/configure.in Tue Apr 27 01:09:01 2010 -0700 @@ -1833,6 +1833,7 @@ X_TOOLKIT_TYPE=$USE_X_TOOLKIT +LIBXTR6= if test "${USE_X_TOOLKIT}" != "none"; then AC_MSG_CHECKING(X11 toolkit version) AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6, @@ -1846,6 +1847,11 @@ AC_MSG_RESULT(6 or newer) AC_DEFINE(HAVE_X11XTR6, 1, [Define to 1 if you have the X11R6 or newer version of Xt.]) + LIBXTR6="-lSM -lICE" + case "$opsys" in + ## Use libw.a along with X11R6 Xt. + unixware) LIBXTR6="$LIBXTR6 -lw" ;; + esac else AC_MSG_RESULT(before 6) fi @@ -1861,6 +1867,7 @@ AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS" fi +AC_SUBST(LIBXTR6) # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. if test "${HAVE_X11}" = "yes"; then
--- a/src/ChangeLog Tue Apr 27 00:38:05 2010 -0700 +++ b/src/ChangeLog Tue Apr 27 01:09:01 2010 -0700 @@ -1,5 +1,8 @@ 2010-04-27 Glenn Morris <rgm@gnu.org> + * Makefile.in (LIBXTR6): Set with configure, not cpp. + * s/unixware.h (NEED_LIBW): Remove definition. + * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by... (TOOLKIT_LIBW): New, set by configure. (@X_TOOLKIT_TYPE@): No longer define it.
--- a/src/Makefile.in Tue Apr 27 00:38:05 2010 -0700 +++ b/src/Makefile.in Tue Apr 27 01:09:01 2010 -0700 @@ -88,6 +88,8 @@ LIBXSM=@LIBXSM@ +LIBXTR6=@LIBXTR6@ + XMENU_OBJ=@XMENU_OBJ@ XOBJ=@XOBJ@ @@ -256,14 +258,6 @@ #ifdef USE_X_TOOLKIT LIBW=$(TOOLKIT_LIBW) -#ifdef HAVE_X11XTR6 -#ifdef NEED_LIBW -LIBXTR6 = -lSM -lICE -lw -#else -LIBXTR6 = -lSM -lICE -#endif -#endif - #ifndef LIBXMU #define LIBXMU -lXmu #endif
--- a/src/s/unixware.h Tue Apr 27 00:38:05 2010 -0700 +++ b/src/s/unixware.h Tue Apr 27 01:09:01 2010 -0700 @@ -56,9 +56,6 @@ pty_name[sizeof(pty_name) - 1] = 0; \ } -/* Use libw.a along with X11R6 Xt. */ -#define NEED_LIBW - /* Data type of load average, as read out of kmem. */ #define LOAD_AVE_TYPE long