Commit 294c50a0 authored by Glenn Morris's avatar Glenn Morris

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.
parent e6ec4e99
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
......
......@@ -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
......
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.
......
......@@ -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 */
......
......@@ -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.
*/
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment