Commit 604a17e6 authored by Martin Kraemer's avatar Martin Kraemer
Browse files

Fix minor configuration & platform dependencies 


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

configure.in

+2 −0
Changes for configure.in: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)

os/Makefile.in

+1 −1
Changes for os/Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

os/config.m4

+11 −4
Changes for os/config.m4: 11 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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)