diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-09 19:16:09 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-09 19:16:09 -0700 |
| commit | 97efb62959d9ce3ad359243711ae2a7f55a38881 (patch) | |
| tree | 5f1bb2f037c080ff384c96808556075bc53e5050 /lib-src | |
| parent | 7492acc936319de0fe4008faa17541c5b54d721d (diff) | |
| download | emacs-97efb62959d9ce3ad359243711ae2a7f55a38881.tar.gz | |
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.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c2a7b6f9ce3..608d5c618b3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,11 @@ 2010-05-10 Glenn Morris <rgm@gnu.org> + * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. + (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM. + (NOT_C_CODE): Remove, no longer used. + (config.h) [!MSDOS]: No longer include. + (LOADLIBES): Use LIBS_SYSTEM as a variable. + * Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp. 2010-05-08 Christoph <cschol2112@googlemail.com> (tiny change) diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index cde26a5411f..5f0fb6e671f 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -154,6 +154,9 @@ LIBS_MAIL=@LIBS_MAIL@ ## Extra libraries to use when linking movemail. LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) +## Some systems define this to request special libraries. +LIBS_SYSTEM = @LIBS_SYSTEM@ + # Those files shared with other GNU utilities need HAVE_CONFIG_H # defined before they know they can take advantage of the information # in ../src/config.h. @@ -164,14 +167,12 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -#define NOT_C_CODE +#ifdef MSDOS #include "../src/config.h" - -/* Some s/SYSTEM.h files define this to request special libraries. */ -#ifndef LIBS_SYSTEM -#define LIBS_SYSTEM +LIBS_SYSTEM = MSDOS_LIBS_SYSTEM #endif -LOADLIBES=LIBS_SYSTEM + +LOADLIBES=$(LIBS_SYSTEM) .SUFFIXES: .m |