Mercurial > emacs
changeset 108148:1c3ecdb885b5
Move LIBXMU from cpp to configure.
* configure.in (LIBXMU): New output variable.
* src/Makefile.in (LIBXMU): Set with configure, not cpp.
* src/s/aix4-2.h (LIBXMU):
* src/s/hpux10-20.h (LIBXMU):
Remove definition, now set in configure.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 28 Apr 2010 00:01:43 -0700 |
| parents | 40b36ac1946f |
| children | 1af337cb46c4 |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in src/s/aix4-2.h src/s/hpux10-20.h |
| diffstat | 6 files changed, 23 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 27 23:54:25 2010 -0700 +++ b/ChangeLog Wed Apr 28 00:01:43 2010 -0700 @@ -1,5 +1,7 @@ 2010-04-28 Glenn Morris <rgm@gnu.org> + * configure.in (LIBXMU): New output variable. + * configure.in (NS_OBJ, NS_SUPPORT): New output variables. * configure.in (machine, canonical): On amdx86-64, check for a 32-bit
--- a/configure.in Tue Apr 27 23:54:25 2010 -0700 +++ b/configure.in Wed Apr 28 00:01:43 2010 -0700 @@ -1890,6 +1890,17 @@ fi AC_SUBST(LIBXTR6) +dnl FIXME the logic here seems weird, but this is what cpp was doing. +dnl Why not just test for libxmu in the normal way? +LIBXMU=-lXmu +case "$machine" in + ## These machines don't supply Xmu. + hpux* | aix4-2 ) + test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" = "Xno" && LIBXMU= + ;; +esac +AC_SUBST(LIBXMU) + # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none"; then
--- a/src/ChangeLog Tue Apr 27 23:54:25 2010 -0700 +++ b/src/ChangeLog Wed Apr 28 00:01:43 2010 -0700 @@ -1,5 +1,10 @@ 2010-04-28 Glenn Morris <rgm@gnu.org> + * Makefile.in (LIBXMU): Set with configure, not cpp. + * s/aix4-2.h (LIBXMU): + * s/hpux10-20.h (LIBXMU): + Remove definition, now set in configure. + * Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp. * m/amdx86-64.h [i386]: Move this test to configure.in.
--- a/src/Makefile.in Tue Apr 27 23:54:25 2010 -0700 +++ b/src/Makefile.in Wed Apr 28 00:01:43 2010 -0700 @@ -86,6 +86,8 @@ GTK_OBJ=@GTK_OBJ@ +LIBXMU=@LIBXMU@ + LIBXSM=@LIBXSM@ LIBXTR6=@LIBXTR6@ @@ -261,11 +263,7 @@ #ifdef USE_X_TOOLKIT LIBW=$(TOOLKIT_LIBW) -#ifndef LIBXMU -#define LIBXMU -lXmu -#endif - -LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext +LIBXT= $(LIBW) $(LIBXMU) -lXt $(LIBXTR6) -lXext #else /* not USE_X_TOOLKIT */
--- a/src/s/aix4-2.h Tue Apr 27 23:54:25 2010 -0700 +++ b/src/s/aix4-2.h Wed Apr 28 00:01:43 2010 -0700 @@ -136,8 +136,6 @@ #undef sigmask #ifndef HAVE_LIBXMU -#define LIBXMU - /* Unfortunately without libXmu we cannot support EditRes. */ #define NO_EDITRES #endif @@ -153,8 +151,8 @@ It is possible to completely override the malloc implementation on AIX, but that involves putting the malloc functions in a shared library and setting the MALLOCTYPE environment variable to point to - tha shared library. - + that shared library. + Emacs currently calls xrealloc on the results of get_current_dir name, to avoid a crash just use the Emacs implementation for that function. */
--- a/src/s/hpux10-20.h Tue Apr 27 23:54:25 2010 -0700 +++ b/src/s/hpux10-20.h Wed Apr 28 00:01:43 2010 -0700 @@ -105,12 +105,6 @@ /* This triggers a conditional in xfaces.c. */ #define XOS_NEEDS_TIME_H -#ifndef HAVE_LIBXMU -/* HP-UX doesn't supply Xmu. */ -#define LIBXMU - -#endif - /* Assar Westerlund <assar@sics.se> says this is necessary for HP-UX 10.20, and that it works for HP-UX 0 as well. */ #define NO_EDITRES