[Emacs-diffs] /srv/bzr/emacs/trunk r100065: Move LIBXMU from cpp to configure.

[Glenn Morris]

------------------------------------------------------------
revno: 100065
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-28 00:01:43 -0700
message:
  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.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in
  src/s/aix4-2.h
  src/s/hpux10-20.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-28 06:54:25 +0000
+++ b/ChangeLog 2010-04-28 07:01:43 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * 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

=== modified file 'configure.in'
--- a/configure.in      2010-04-28 06:54:25 +0000
+++ b/configure.in      2010-04-28 07:01:43 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 06:54:25 +0000
+++ b/src/ChangeLog     2010-04-28 07:01:43 +0000
@@ -1,5 +1,10 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-28 06:54:25 +0000
+++ b/src/Makefile.in   2010-04-28 07:01:43 +0000
@@ -86,6 +86,8 @@
 
 address@hidden@
 
address@hidden@
+
 address@hidden@
 
 address@hidden@
@@ -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 */
 

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2010-04-27 07:02:12 +0000
+++ b/src/s/aix4-2.h    2010-04-28 07:01:43 +0000
@@ -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.
 */

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2010-04-27 03:14:14 +0000
+++ b/src/s/hpux10-20.h 2010-04-28 07:01:43 +0000
@@ -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 <address@hidden> says this is necessary for
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES