[Emacs-diffs] /srv/bzr/emacs/trunk r100121: Replace some X-related cpp with autoconf.

[Glenn Morris]

------------------------------------------------------------
revno: 100121
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-02 19:10:43 -0700
message:
  Replace some X-related cpp with autoconf.
  
  * configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.
  
  * src/Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
  (LIBXT_OTHER, LIBX_OTHER): New, set by configure.
  (LIBXT): Set with configure, not cpp.
  (LIBX): Remove.
  (LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-03 01:53:58 +0000
+++ b/ChangeLog 2010-05-03 02:10:43 +0000
@@ -1,5 +1,7 @@
 2010-05-03  Glenn Morris  <address@hidden>
 
+       * configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.
+
        * make-dist: There are no more src/m/*.inp files.
 
 2010-05-01  Dan Nicolaescu  <address@hidden>

=== modified file 'configure.in'
--- a/configure.in      2010-05-01 21:38:59 +0000
+++ b/configure.in      2010-05-03 02:10:43 +0000
@@ -2903,6 +2903,13 @@
 esac
 AC_SUBST(TOOLKIT_LIBW)
 
+if test "$USE_X_TOOLKIT" = "none"; then
+  LIBXT_OTHER="\$(LIBXSM)"
+else
+  LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext"
+fi
+AC_SUBST(LIBXT_OTHER)
+
 ## The X Menu stuff is present in the X10 distribution, but missing
 ## from X11.  If we have X10, just use the installed library;
 ## otherwise, use our own copy.
@@ -2917,9 +2924,11 @@
     OLDXMENU="\${lwlibdir}liblw.a"
   fi
   LIBXMENU="\$(OLDXMENU)"
+  LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
 else
   OLDXMENU=
   LIBXMENU="-lXMenu"
+  LIBX_OTHER=
 fi
 
 if test "$HAVE_GTK" = "yes"; then
@@ -2929,6 +2938,7 @@
 
 AC_SUBST(OLDXMENU)
 AC_SUBST(LIBXMENU)
+AC_SUBST(LIBX_OTHER)
 
 if test "${HAVE_MENUS}" = "yes" ; then
   AC_DEFINE(HAVE_MENUS, 1,

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-02 19:32:18 +0000
+++ b/src/ChangeLog     2010-05-03 02:10:43 +0000
@@ -1,3 +1,11 @@
+2010-05-03  Glenn Morris  <address@hidden>
+
+       * Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.
+       (LIBXT_OTHER, LIBX_OTHER): New, set by configure.
+       (LIBXT): Set with configure, not cpp.
+       (LIBX): Remove.
+       (LIBES): Replace $LIBX with $LIBX_BASE and $LIBX_OTHER.
+
 2010-05-02  Dan Nicolaescu  <address@hidden>
 
        * m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-01 21:38:59 +0000
+++ b/src/Makefile.in   2010-05-03 02:10:43 +0000
@@ -76,6 +76,7 @@
 address@hidden@
 address@hidden@
 address@hidden@
+LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 
$(XFT_LIBS)
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
@@ -92,6 +93,10 @@
 
 address@hidden@
 
+## $(LIBXMU) -lXt $(LIBXTR6) -lXext if USE_X_TOOLKIT, else $(LIBXSM).
+## Only used if HAVE_X_WINDOWS.
address@hidden@
+
 address@hidden@
 address@hidden@
 
@@ -249,7 +254,6 @@
        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-
 /* This test needs to say in cpp for the time being, since s/ms-w32.h and
    s/msdos.h define HAVE_MENUS, possibly overriding configure.  */
 #ifdef HAVE_MENUS
@@ -260,18 +264,9 @@
 LIBXMENU=
 #endif /* not HAVE_MENUS */
 
-#ifdef USE_X_TOOLKIT
-LIBXT=$(TOOLKIT_LIBW) $(LIBXMU) -lXt $(LIBXTR6) -lXext
-#else /* not USE_X_TOOLKIT */
-LIBXT=$(TOOLKIT_LIBW) $(LIBXSM)
-#endif /* not USE_X_TOOLKIT */
-
-#ifdef HAVE_X11
-X11_LDFLAGS = LD_SWITCH_X_SITE
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) 
$(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS)
-#else /* not HAVE_X11 */
-LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
-#endif /* not HAVE_X11 */
+LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
+LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE
address@hidden@
 #endif /* not HAVE_X_WINDOWS */
 
 #ifndef ORDINARY_LINK
@@ -689,8 +684,8 @@
    duplicated symbols.  If the standard libraries were compiled
    with GCC, we might need gnulib again after them.  */
 
-LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
-   @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \
+LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
+   $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \
    $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) @LIB_MATH@ LIB_STANDARD $(GNULIB_VAR)