From: David Reid <dreid@apache.org>
Date: Thu, 22 Jun 2000 18:28:07 +0000 (+0000)
Subject: Add the EXTRA_LIBS to get apache building on BONE again and now that
X-Git-Tag: APACHE_2_0_ALPHA_5~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2cc66000f285748ccb69cdebbb03d255613b587;p=apache

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 39ec0a15e3..a3f75f421f 100644
--- 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 f471448ba1..f2c2df7aae 100644
--- 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 4df8a2258e..309fb3c6e9 100644
--- 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 > $@