From 3dee6fdb964e334b1e65766abee639105e724a7f Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sun, 2 May 2010 19:10:43 -0700
Subject: [PATCH] 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.
---
 ChangeLog       |  2 ++
 configure.in    | 10 ++++++++++
 src/ChangeLog   |  8 ++++++++
 src/Makefile.in | 25 ++++++++++---------------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7121d67843d..3e26dc47626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-03  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (LIBXT_OTHER, LIBX_OTHER): New output variables.
+
 	* make-dist: There are no more src/m/*.inp files.
 
 2010-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
diff --git a/configure.in b/configure.in
index 508c5b8dfe4..34358a2cea1 100644
--- a/configure.in
+++ b/configure.in
@@ -2903,6 +2903,13 @@ case "$USE_X_TOOLKIT" in
 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 @@ if test "${HAVE_X11}" = "yes" ; then
     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 @@ fi
 
 AC_SUBST(OLDXMENU)
 AC_SUBST(LIBXMENU)
+AC_SUBST(LIBX_OTHER)
 
 if test "${HAVE_MENUS}" = "yes" ; then
   AC_DEFINE(HAVE_MENUS, 1,
diff --git a/src/ChangeLog b/src/ChangeLog
index 12f15b3c2fd..e14f7de13a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-03  Glenn Morris  <rgm@gnu.org>
+
+	* 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  <dann@ics.uci.edu>
 
 	* m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.
diff --git a/src/Makefile.in b/src/Makefile.in
index 3e026d52c5d..59e0e9e47f7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -76,6 +76,7 @@ LIBPNG=@LIBPNG@
 LIBGIF=@LIBGIF@
 LIBXPM=@LIBXPM@
 XFT_LIBS=@XFT_LIBS@
+LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS)
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
@@ -92,6 +93,10 @@ LIBXSM=@LIBXSM@
 
 LIBXTR6=@LIBXTR6@
 
+## $(LIBXMU) -lXt $(LIBXTR6) -lXext if USE_X_TOOLKIT, else $(LIBXSM).
+## Only used if HAVE_X_WINDOWS.
+LIBXT_OTHER=@LIBXT_OTHER@
+
 XMENU_OBJ=@XMENU_OBJ@
 XOBJ=@XOBJ@
 
@@ -249,7 +254,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 	$(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 @@ OLDXMENU=
 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
+LIBX_OTHER=@LIBX_OTHER@
 #endif /* not HAVE_X_WINDOWS */
 
 #ifndef ORDINARY_LINK
@@ -689,8 +684,8 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
    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)
-- 
2.39.2