* s/hpux10-20.h (LIB_STANDARD): New definition.

* Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
on it, not used anymore.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a9a9ca2264f68eed72460055d2a8abe53428d08..ab5780106b789e62c3171d83af8aae11271db5a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * s/hpux10-20.h (LIB_STANDARD): New definition.
+       * Makefile.in (ORDINARY_LINK): Remove setting LIB_STANDARD based
+       on it, not used anymore.
+
 2010-05-03  Chong Yidong  <cyd@stupidchicken.com>
 
        * eval.c (internal_condition_case_n): Rename from

diff --git a/src/Makefile.in b/src/Makefile.in
index 59e0e9e47f7c712046c44a2cb629918346dbd286..a7ad10446e2219ab6560fb7c53e8a7a42d165026 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -172,15 +172,9 @@ DEPFLAGS = -MMD -MF deps/$*.d
 #undef register
 
 /* Some machines do not find the standard C libraries in the usual place.  */
-#ifndef ORDINARY_LINK
-#ifndef LIB_STANDARD
-#define LIB_STANDARD -lc
-#endif
-#else
 #ifndef LIB_STANDARD
 #define LIB_STANDARD
 #endif
-#endif
 
 /* Under GNUstep, putting libc on the link line causes problems. */
 #ifdef NS_IMPL_GNUSTEP

diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 6573c6f4ad48791964205f878fe90312d11247af..fe47b3b5645a7270d651cce2537d2405fa0d366e 100644 (file)
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -134,6 +134,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LIBS_SYSTEM -l:libdld.sl
 
+#define LIB_STANDARD -lc
+
 /* Rainer Malzbender <rainer@displaytech.com> says definining
    HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
    using GCC.  */
@@ -154,9 +156,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #undef _FILE_OFFSET_BITS
 
-/* otherwise sigunblock wont be defined */
-#define POSIX_SIGNALS
-
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
    when Emacs is dumped.  If you define this, the preloaded Lisp