Add the EXTRA_LIBS to get apache building on BONE again and now that

we're using ap_sleep remove the need for sys/socket.h in mpm_common.c

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85658 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/Makefile.in b/server/Makefile.in
index 39ec0a15e3e622b662e216330c425e76238587f9..a3f75f421fb7aad2cce7c296e0783085b1e76fd1 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -14,11 +14,11 @@ include $(top_srcdir)/build/ltlib.mk
 
 gen_uri_delims_OBJECTS = gen_uri_delims.lo
 gen_uri_delims: $(gen_uri_delims_OBJECTS)
-       $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS)
+       $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
 
 gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
 gen_test_char: $(gen_test_char_OBJECTS)
-       $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS)
+       $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
 
 uri_delims.h: gen_uri_delims
        ./gen_uri_delims > uri_delims.h

diff --git a/server/mpm_common.c b/server/mpm_common.c
index f471448ba1d01a4e0f3a1d0bfd371f28f748da69..f2c2df7aae408eded7f4de7295d64dbe07d29304 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -77,9 +77,6 @@
 #if HAVE_SYS_TIME_H
 #include <sys/time.h> /* for timeval definitions */
 #endif
-#ifdef BEOS_BONE
-#include <sys/socket.h>
-#endif
 
 #if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
 #define CHILD_TABLE 1

diff --git a/srclib/pcre/Makefile.in b/srclib/pcre/Makefile.in
index 4df8a2258e6b242427bcae455414946844501c49..309fb3c6e92437a77dbe85b6d2047e22c8b3f6c1 100644 (file)
--- a/srclib/pcre/Makefile.in
+++ b/srclib/pcre/Makefile.in
@@ -11,7 +11,7 @@ config.h:
 $(LTLIBRARY_OBJECTS) dftables.lo: config.h
 
 dftables: dftables.lo
-       $(LINK) $(EXTRA_LDFLAGS) dftables.lo
+       $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS)
 
 chartables.c: dftables
        ./dftables > $@