Fix minor configuration & platform dependencies

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

diff --git a/configure.in b/configure.in
index 7dbd18ff89c4db936e91d8f5f567505a940cfbf5..797198f6a6cd6fffad8a3366f2a444e100d4164b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,7 @@ pwd.h \
 grp.h \
 )
 AC_HEADER_SYS_WAIT
+AC_STRUCT_TM
 
 dnl ## Check for C preprocessor symbols
 
@@ -90,6 +91,7 @@ bzero \
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(nsl, gethostname)
 AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(resolv, sethostent)
 
 AC_CHECK_FUNCS(inet_addr inet_network, break, [
   AC_MSG_ERROR(inet_addr function not found)

diff --git a/os/Makefile.in b/os/Makefile.in
index 96234c1488a1ed18775c30cf23a23fb0f5ba4d33..99649201a60aa148294b0691df120fa05747363e 100644 (file)
--- a/os/Makefile.in
+++ b/os/Makefile.in
@@ -4,6 +4,6 @@ top_srcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-SUBDIRS = $(OS)
+SUBDIRS = $(top_srcdir)/$(OS_DIR)
 
 include $(top_srcdir)/build/rules.mk

diff --git a/os/config.m4 b/os/config.m4
index 8422e10082b4b267dd07b095f641e09f1de1168c..d6e3949163e8fdd23b355f9a453dbae5d4dc6fb4 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -6,16 +6,23 @@ LIBPRE=lib
 
 case "$PLATFORM" in
 *beos*)
-  OS="beos";;
+  OS="beos"
+  OS_DIR=os/$OS
+  ;;
 *pc-os2_emx*)
-  OS="os2"
   LIBPRE=""
+  OS="os2"
+  OS_DIR=os/$OS
+  ;;
+bs2000*)
+  OS="unix"
+  OS_DIR=os/bs2000  # only the OS_DIR is platform specific.
   ;;
 *)
-  OS="unix";;
+  OS="unix"
+  OS_DIR=os/$OS;;
 esac
 
-OS_DIR=os/$OS
 
 AC_MSG_RESULT($OS)
 APACHE_FAST_OUTPUT($OS_DIR/Makefile)