[Emacs-diffs] /srv/bzr/emacs/trunk r100051: Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.

[Glenn Morris]

------------------------------------------------------------
revno: 100051
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-27 00:33:35 -0700
message:
  Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.
  
  * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
  (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
  
  * src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
  (TOOLKIT_LIBW): New, set by configure.
  (@X_TOOLKIT_TYPE@): No longer define it.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-27 07:02:12 +0000
+++ b/ChangeLog 2010-04-27 07:33:35 +0000
@@ -1,5 +1,9 @@
 2010-04-27  Glenn Morris  <address@hidden>
 
+       * configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute
+       in Makefiles.
+       (TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.
+
        * configure.in (HAVE_MOTIF_2_1): Remove unused variable.
        (LIBXP): No longer substitute in Makefiles.
        (MOTIF_LIBW): New output variable.  Move system-specific settings here

=== modified file 'configure.in'
--- a/configure.in      2010-04-27 07:02:12 +0000
+++ b/configure.in      2010-04-27 07:33:35 +0000
@@ -1830,7 +1830,6 @@
     fi
   fi
 fi
-AC_SUBST(LUCID_LIBW)
 
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
@@ -2767,6 +2766,7 @@
 AC_SUBST(C_SWITCH_X_SITE)
 AC_SUBST(C_SWITCH_X_SYSTEM)
 AC_SUBST(CFLAGS)
+## Used in lwlib/Makefile.in.
 AC_SUBST(X_TOOLKIT_TYPE)
 AC_SUBST(machfile)
 AC_SUBST(opsysfile)
@@ -2848,7 +2848,14 @@
   fi
 fi
 AC_SUBST(WIDGET_OBJ)
-AC_SUBST(MOTIF_LIBW)
+
+case "$USE_X_TOOLKIT" in
+  MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
+  LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
+  *) TOOLKIT_LIBW= ;;
+esac
+AC_SUBST(TOOLKIT_LIBW)
+
 if test "${HAVE_X11}" = "yes" ; then
   AC_DEFINE(HAVE_X11, 1,
            [Define to 1 if you want to use version 11 of X windows.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-27 07:02:12 +0000
+++ b/src/ChangeLog     2010-04-27 07:33:35 +0000
@@ -1,5 +1,9 @@
 2010-04-27  Glenn Morris  <address@hidden>
 
+       * Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
+       (TOOLKIT_LIBW): New, set by configure.
+       (@X_TOOLKIT_TYPE@): No longer define it.
+
        * Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
        (MOTIF_LIBW): Set with configure, not cpp.
        * s/aix4-2.h (LIB_MOTIF):

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-27 07:02:12 +0000
+++ b/src/Makefile.in   2010-04-27 07:33:35 +0000
@@ -91,8 +91,7 @@
 address@hidden@
 address@hidden@
 
address@hidden@
address@hidden@
address@hidden@
 
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -255,8 +254,7 @@
 #endif /* not HAVE_MENUS */
 
 #ifdef USE_X_TOOLKIT
-# define @X_TOOLKIT_TYPE@
-LIBW=$(@address@hidden)
+LIBW=$(TOOLKIT_LIBW)
 
 #ifdef HAVE_X11XTR6
 #ifdef NEED_LIBW