diff src/Makefile.in @ 108382:b9b3b94979ee

Move LIBS_SYSTEM from cpp to configure. * configure.in (LIBS_SYSTEM): New output variable, replacing cpp. * lib-src/Makefile.in (LIBS_SYSTEM) [!MSDOS]: Set with configure, not cpp. (LIBS_SYSTEM) [MSDOS]: Use MSDOS_LIBS_SYSTEM. (NOT_C_CODE): Remove, no longer used. (config.h) [!MSDOS]: No longer include. (LOADLIBES): Use LIBS_SYSTEM as a variable. * src/Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM. (LIBES): Use LIBS_SYSTEM as a variable. * src/s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM. Always define. * src/s/aix4-2.h (LIBS_SYSTEM): * src/s/freebsd.h (LIBS_SYSTEM): * src/s/hpux10-20.h (LIBS_SYSTEM): * src/s/sol2-6.h (LIBS_SYSTEM): * src/s/unixware.h (LIBS_SYSTEM): Move to configure. * msdos/sed1v2.inp, msdos/sed3v2.inp (LIBS_SYSTEM): Edit to empty.

--- a/src/Makefile.in	Sun May 09 22:07:58 2010 -0400
+++ b/src/Makefile.in	Sun May 09 19:16:09 2010 -0700
@@ -88,6 +88,9 @@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS)
 
+## Some systems define this to request special libraries.
+LIBS_SYSTEM=@LIBS_SYSTEM@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
@@ -195,11 +198,6 @@
    do not let it interfere with this file.  */
 #undef register
 
-/* Some s/SYSTEM.h files define this to request special libraries.  */
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-
 /* This macro is for switches specifically related to X Windows.  */
 #ifndef LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE
@@ -324,9 +322,9 @@
 #endif
 
 #ifdef MSDOS
+LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
 #ifdef HAVE_X_WINDOWS
 MSDOS_OBJ = dosfns.o msdos.o
-#define LIBS_SYSTEM -lxext -lsys
 #else
 MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o
 #endif
@@ -656,8 +654,8 @@
    with GCC, we might need gnulib again after them.  */
 
 LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-   $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM $(LIBS_TERMCAP) \
-   $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
+   $(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)