diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 8 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 6 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 6 |
6 files changed, 23 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index cb0100cd488..0673c9a1089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/configure.in b/configure.in index f7e03df4cdb..57831879b71 100644 --- a/configure.in +++ b/configure.in @@ -1890,6 +1890,17 @@ dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link. 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 diff --git a/src/ChangeLog b/src/ChangeLog index 283507680de..b045fa9b4e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/Makefile.in b/src/Makefile.in index 15cb6fed79c..256662a4029 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,6 +86,8 @@ GCONF_LIBS = @GCONF_LIBS@ GTK_OBJ=@GTK_OBJ@ +LIBXMU=@LIBXMU@ + LIBXSM=@LIBXSM@ LIBXTR6=@LIBXTR6@ @@ -261,11 +263,7 @@ LIBXMENU= #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 */ diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index c14835531df..b6ef00a1fdb 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -136,8 +136,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef sigmask #ifndef HAVE_LIBXMU -#define LIBXMU - /* Unfortunately without libXmu we cannot support EditRes. */ #define NO_EDITRES #endif @@ -153,8 +151,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 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. */ diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 28030de8897..6573c6f4ad4 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -105,12 +105,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* 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 |