* s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define.

* Makefile.in (INSTALL_SCRIPT): Remove duplicate definition.
(LIB_STANDARD_LIBSRC): Don't define.
(LOADLIBES): Remove LIB_STANDARD_LIBSRC.

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index af379c4774cd232ea7ae907561d2497cb020028b..25fbc598ddcf2620ff0ddcf8bc64fba343933aff 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -237,7 +237,6 @@ LIB_GCC
 LIB_MATH
 LIB_MOTIF
 LIB_STANDARD
-LIB_STANDARD_LIBSRC
 LINKER
 LINK_CRTL_SHARE
 LINUX_SBRK_BUG

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 05bfc1934eb3764b4b482f9cdfc529977af58ba9..4efe4a374f5a72fbce8b3701daa3b79653159016 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-17  Andreas Schwab  <schwab@suse.de>
+
+       * Makefile.in (INSTALL_SCRIPT): Remove duplicate definition.
+       (LIB_STANDARD_LIBSRC): Don't define.
+       (LOADLIBES): Remove LIB_STANDARD_LIBSRC.
+
 2008-07-16  Adrian Robert <Adrian.B.Robert@gmail.com>
 
        * Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 482103ddeb36021fd18dfbbb7238cd93356bd5a3..03e0f4d1e27035f4ed605f8cd84ead70a829188c 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -151,27 +151,6 @@ CFLAGS := $(CFLAGS) -universal
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
 #endif
 
-/* Some platforms that the GNUstep port runs on put strip options in
-   INSTALL_PROGRAM which cause errors.  But, not being sure all other
-   platforms are setting this, we will only use the alternative
-   INSTALL_SCRIPT variable on GNUstep/Cocoa builds. */
-#ifndef HAVE_NS
-INSTALL_SCRIPT = @INSTALL_PROGRAM@
-#else
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-#endif
-
-/* Some machines don\'t find the standard C libraries in the usual place.  */
-#ifndef ORDINARY_LINK
-#ifndef LIB_STANDARD_LIBSRC
-#define LIB_STANDARD_LIBSRC -lc
-#endif
-#else
-#ifndef LIB_STANDARD_LIBSRC
-#define LIB_STANDARD_LIBSRC
-#endif
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
@@ -252,7 +231,7 @@ LIBS_MAIL=-lmail
 #endif
 #endif
 
-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
 
 /* We need to #define emacs to get the right versions of some files.
    Some other files - those shared with other GNU utilities - need

diff --git a/src/ChangeLog b/src/ChangeLog
index 205a6a108f23ef2a670fb3e844967e04283888e4..e360dc48ba830e13e286068f8d9b3e96b95eab6d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-17  Andreas Schwab  <schwab@suse.de>
+
+       * s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define.
+
 2008-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Use SDATA.  Follow coding convention of placing operators at

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index aa696b403794b42faf2011223796c732daf07fc0..b1172e622b3caed3a6c3129d67b170ed80bd40b1 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -112,7 +112,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define GETPGRP_NO_ARG 1
 #define SYSV_SYSTEM_DIR 1
-#define LIB_STANDARD_LIBSRC
 #define UNEXEC unexcw.o
 #define POSIX_SIGNALS 1
 /* force the emacs image to start high in memory, so dll relocation