Re-structure APR's configure.in file. This should make adding functions to

APR easier.  Basically, I just moved things around a bit to make them easier
to find, and I added some output.


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

1 files changed, 286 insertions, 272 deletions

diff --git a/configure.in b/configure.in
index d5f25c95b..212c1cfa0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,28 +1,30 @@
+dnl ##
+dnl ## Autoconf configuration file for APR
+dnl ##
+
+echo "Configuring APR library"
+echo "Platform: ${OS}"
+echo "(Default will be ${DEFAULT_OSDIR})"
 
 AC_CONFIG_AUX_DIR(./helpers)
 OS=`./config.guess`
-OS=`./config.sub $OS` 
+OS=`./config.sub $OS`
+
+dnl # Some initial steps for configuration.  We setup the default directory
+dnl # and which files are to be configured.
 
 # These added to allow default directories to be used...
 DEFAULT_OSDIR="unix"
-MODULES="file_io network_io threadproc misc locks time mmap shmem" 
-
-echo "Configuring APR library"
-echo "Platform: ${OS}"
-echo "(Default will be ${DEFAULT_OSDIR})"
+MODULES="file_io network_io threadproc misc locks time mmap shmem"
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(configure.in)
-
 AC_CONFIG_HEADER(include/apr_config.h)
 
-AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
-	[OPTIM="$withval"])
-
 # Most platforms use a prefix of 'lib' on their library files.
 LIBPREFIX='lib'
 
-dnl Checks for programs.
+dnl # Checks for programs.
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
@@ -32,53 +34,21 @@ AC_CHECK_PROG(AR, ar, ar)
 # This macro needs to be here in case we are on an AIX box.
 AC_AIX
 
-REENTRANCY_FLAGS
-PTHREADS_CHECK
-
-AC_CACHE_CHECK([for threads], ac_cv_enable_threads, 
-  [ AC_ARG_ENABLE(threads,
-    [  --enable-threads  Enable threading support in APR.], 
-    [ ] , 
-    [ AC_CHECK_HEADERS(pthread.h,  
-                   [ ac_cv_enable_threads="pthread" ] , 
-                   [ ac_cv_enable_threads="no" ] ) ] ) ] ) 
-
-if test "$ac_cv_enable_threads" = "no"; then 
-    threads="0"
-    pthreadh="0"
-else
-    if test "$ac_cv_enable_threads" = "pthread"; then
-# We have specified pthreads for our threading library, just make sure
-# that we have everything we need
-      AC_CHECK_HEADERS(pthread.h, [ 
-          threads="1"
-          pthreadh="1"
-          AC_DEFINE(USE_THREADS) ], [
-          threads="0"
-          pthreadh="0" ] )
-    else
-# We basically specified that we wanted threads, but not how to implement
-# them.  In this case, just look for pthreads.  In the future, we can check
-# for other threading libraries as well.
-      AC_CHECK_HEADERS(pthread.h, [ 
-          threads="1"
-          pthreadh="1"
-          AC_DEFINE(USE_THREADS) ], [
-          threads="0"
-          pthreadh="0" ] )
-    fi
+# Use /bin/sh if it exists, otherwise go looking for sh in the path
+if test ".$SH" = . -a -f /bin/sh; then
+  SH="/bin/sh"
 fi
+AC_CHECK_PROG(SH, sh, sh)
 
-pthreadser="0"
-if test "$threads" = "1"; then
-    AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-    AC_CHECK_FUNC(pthread_mutex_init, [
-        AC_DEFINE(USE_PTHREAD_SERIALIZE)
-        pthreadser="1" ])
-fi
+dnl #----------------------------- Checks for compiler flags
+echo -e "\nCheck for compiler flags."
+AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
+        [OPTIM="$withval"])
 
-AC_ARG_WITH(debug,[  --with-debug              Turn on debugging and compile time warnings],
-	[if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g"; fi])
+AC_ARG_WITH(debug,[  --with-debug              Turn on debugging and compile tim
+e warnings],
+        [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$C
+FLAGS -g"; fi])
 
 dnl # this is the place to put specific options for platform/compiler
 dnl # combinations
@@ -91,79 +61,6 @@ case "$OS:$CC" in
         ;;
 esac
 
-dnl Checks for standard typedefs
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_CHECK_TYPE(ssize_t, int)
-AC_C_INLINE
-
-dnl Checks for integer size
-AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long double, 12)
-AC_CHECK_SIZEOF(long long, 8)
-
-if test "$ac_cv_sizeof_short" = "2"; then
-    short_value=short
-fi
-if test "$ac_cv_sizeof_int" = "4"; then
-    int_value=int
-fi
-if test "$ac_cv_sizeof_long" = "8"; then
-    long_value=long
-fi
-if test "$ac_cv_sizeof_long_double" = "8"; then
-    long_value="long double"
-fi
-if test "$ac_cv_sizeof_long_long" = "8"; then
-    long_value="long long"
-fi
-if test "$ac_cv_sizeof_longlong" = "8"; then
-    long_value="__int64"
-fi
-
-if test "$ac_cv_type_off_t" = "yes"; then
-    off_t_value="off_t"
-else
-    off_t_value="ap_int32_t"
-fi
-if test "$ac_cv_type_size_t" = "yes"; then
-    size_t_value="size_t"
-else
-    size_t_value="ap_int32_t"
-fi
-if test "$ac_cv_type_ssize_t" = "yes"; then
-    ssize_t_value="ssize_t"
-else
-    ssize_t_value="ap_int32_t"
-fi
-
-AC_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
-
-if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-else
-    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
-fi
-
-# Use /bin/sh if it exists, otherwise go looking for sh in the path
-if test ".$SH" = . -a -f /bin/sh; then
-  SH="/bin/sh"
-fi
-AC_CHECK_PROG(SH, sh, sh)
-
-AC_CHECK_DEFINE(LOCK_EX, sys/file.h)
-AC_CHECK_DEFINE(F_SETLK, fcntl.h)
-
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
-AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
-
 case "$OS" in
    *-os2*)
        CFLAGS="$CFLAGS -DOS2 -Zmt"
@@ -179,27 +76,46 @@ case "$OS" in
        ;;
 esac
 
-AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(crypt,crypt)
-AC_CHECK_LIB(ufc,crypt)
-
 if test ".$SYS_SW" = ".AIX"; then
     CFLAGS="$CFLAGS -U__STR__"
     case "$SYS_KV" in
-	[12]*)
-	    AC_DEFINE(USEBCOPY)
-	    ;;
-	3*)
-	    AC_DEFINE(NEED_RLIM_T)
-	    ;;
-	41*)
-	    AC_DEFINE(NEED_RLIM_T)
-	    ;;
+        [12]*)
+            AC_DEFINE(USEBCOPY)
+            ;;
+        3*)
+            AC_DEFINE(NEED_RLIM_T)
+            ;;
+        41*)
+            AC_DEFINE(NEED_RLIM_T)
+            ;;
     esac
 fi
 
-dnl Checks for header files.
+dnl #----------------------------- Checks for Any required Libraries
+AC_CHECK_LIB(dl, dlopen)
+AC_CHECK_LIB(socket,socket)
+AC_CHECK_LIB(crypt,crypt)
+AC_CHECK_LIB(ufc,crypt)
+
+dnl #----------------------------- Checks for Any required Functions
+dnl Checks for library functions.
+AC_CHECK_FUNCS(pthread_sigmask)
+AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
+AC_CHECK_FUNCS(sigaction writev)
+AC_CHECK_FUNCS(sendfile, [ sendfile="1" ], [ sendfile="0" ])
+AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
+AC_CHECK_FUNCS(getpass)
+AC_CHECK_FUNC(inet_addr, [ inet_addr="1" ], [ inet_addr="0" ])
+AC_CHECK_FUNC(inet_network, [ inet_network="1" ], [ inet_network="0" ])
+AC_CHECK_FUNC(_getch)
+AC_CHECK_FUNCS(gmtime_r localtime_r)
+AC_SUBST(sendfile)
+AC_SUBST(fork)
+AC_SUBST(inet_addr)
+AC_SUBST(inet_network)
+
+
+dnl #----------------------------- Checks for Any required Headers
 AC_HEADER_STDC
 
 AC_CHECK_HEADERS(conio.h)
@@ -241,8 +157,6 @@ AC_CHECK_HEADERS(sys/uio.h, sys_uioh="1", sys_uioh="0")
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(poll.h)
 AC_CHECK_HEADERS(unix.h)
-AC_CHECK_HEADERS(winsock.h)
-
 AC_CHECK_HEADERS(arpa/inet.h)
 AC_CHECK_HEADERS(netinet/in.h, netinet_inh="1", netinet_inh="0")
 AC_CHECK_HEADERS(netinet/tcp.h)
@@ -262,22 +176,148 @@ AC_CHECK_HEADERS(sys/wait.h)
 
 AC_CHECK_HEADERS(kernel/OS.h)
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+AC_SUBST(errnoh)
+AC_SUBST(direnth)
+AC_SUBST(fcntlh)
+AC_SUBST(netinet_inh)
+AC_SUBST(stdargh)
+AC_SUBST(stdioh)
+AC_SUBST(sys_typesh)
+AC_SUBST(sys_uioh)
+AC_SUBST(signalh)
+AC_SUBST(pthreadh)
+
+dnl #----------------------------- Checks for standard typedefs
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_CHECK_TYPE(ssize_t, int)
+AC_C_INLINE
 AC_C_CONST
 AC_TYPE_SIZE_T
-AC_FUNC_MMAP
 AC_FUNC_SETPGRP
 
 APR_CHECK_SOCKLEN_T
 
-if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then 
+dnl # Checks for integer size
+AC_CHECK_SIZEOF(char, 1)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(long double, 12)
+AC_CHECK_SIZEOF(long long, 8)
+
+if test "$ac_cv_sizeof_short" = "2"; then
+    short_value=short
+fi
+if test "$ac_cv_sizeof_int" = "4"; then
+    int_value=int
+fi
+if test "$ac_cv_sizeof_long" = "8"; then
+    long_value=long
+fi
+if test "$ac_cv_sizeof_long_double" = "8"; then
+    long_value="long double"
+fi
+if test "$ac_cv_sizeof_long_long" = "8"; then
+    long_value="long long"
+fi
+if test "$ac_cv_sizeof_longlong" = "8"; then
+    long_value="__int64"
+fi
+
+if test "$ac_cv_type_off_t" = "yes"; then
+    off_t_value="off_t"
+else
+    off_t_value="ap_int32_t"
+fi
+if test "$ac_cv_type_size_t" = "yes"; then
+    size_t_value="size_t"
+else
+    size_t_value="ap_int32_t"
+fi
+if test "$ac_cv_type_ssize_t" = "yes"; then
+    ssize_t_value="ssize_t"
+else
+    ssize_t_value="ap_int32_t"
+fi
+
+AC_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
+
+if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
+    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
+elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
+    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+else
+    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
+fi
+
+AC_SUBST(short_value)
+AC_SUBST(int_value)
+AC_SUBST(long_value)
+AC_SUBST(off_t_value)
+AC_SUBST(size_t_value)
+AC_SUBST(ssize_t_value)
+AC_SUBST(ssize_t_fmt) 
+
+dnl #----------------------------- Checking for Threads
+echo -e "\nChecking for Threads"
+AC_CACHE_CHECK([for threads], ac_cv_enable_threads,
+  [ AC_ARG_ENABLE(threads,
+    [  --enable-threads  Enable threading support in APR.],
+    [ ] ,
+    [ AC_CHECK_HEADERS(pthread.h,
+                   [ ac_cv_enable_threads="pthread" ] ,
+                   [ ac_cv_enable_threads="no" ] ) ] ) ] )
+
+if test "$ac_cv_enable_threads" = "no"; then
+    threads="0"
+    pthreadh="0"
+else
+    REENTRANCY_FLAGS
+    PTHREADS_CHECK
+    if test "$ac_cv_enable_threads" = "pthread"; then
+# We have specified pthreads for our threading library, just make sure
+# that we have everything we need
+      AC_CHECK_HEADERS(pthread.h, [
+          threads="1"
+          pthreadh="1"
+          AC_DEFINE(USE_THREADS) ], [
+          threads="0"
+          pthreadh="0" ] )
+    else
+# We basically specified that we wanted threads, but not how to implement
+# them.  In this case, just look for pthreads.  In the future, we can check
+# for other threading libraries as well.
+      AC_CHECK_HEADERS(pthread.h, [
+          threads="1"
+          pthreadh="1"
+          AC_DEFINE(USE_THREADS) ], [
+          threads="0"
+          pthreadh="0" ] )
+    fi
+fi
+
+ac_cv_define_READDIR_IS_THREAD_SAFE=no
+AC_CHECK_LIB(c_r, readdir, AC_DEFINE(READDIR_IS_THREAD_SAFE))
+
+AC_SUBST(threads)
+
+dnl #----------------------------- Checking for MMAP 
+echo -e "\nChecking for MMAP"
+AC_FUNC_MMAP
+if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
     mmap="1"
-    AC_SUBST(mmap)
 else
     mmap="0"
-    AC_SUBST(mmap)
 fi
+AC_SUBST(mmap)
+
+dnl #----------------------------- Checking for Locking Characteristics 
+echo -e "\nChecking for Locking"
 
+# It's stupid, but not all platforms have union semun, even those that need it.
 AC_MSG_CHECKING(looking for union semun in sys/sem.h)
 AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -293,35 +333,17 @@ msg=no ] )
 AC_MSG_RESULT([$msg])
 AC_SUBST(have_union_semun)
 
-AC_MSG_CHECKING(looking for in_addr in netinet/in.h)
-AC_TRY_COMPILE([
-#include <netinet/in.h>
-],[
-struct in_addr arg;
-arg.s_addr = htonl(INADDR_ANY);
-], [ have_in_addr="1" 
-msg=yes ] , [ have_in_addr="0"
-msg=no ])
-AC_MSG_RESULT([$msg])
-
-dnl Checks for library functions.
-AC_CHECK_FUNCS(pthread_sigmask)
-AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
-AC_CHECK_FUNCS(sigaction writev)
-AC_CHECK_FUNCS(sendfile, [ sendfile="1" ], [ sendfile="0" ]) 
-AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ]) 
-AC_CHECK_FUNCS(getpass)
-AC_CHECK_FUNC(inet_addr, [ inet_addr="1" ], [ inet_addr="0" ])
-AC_CHECK_FUNC(inet_network, [ inet_network="1" ], [ inet_network="0" ])
-AC_CHECK_FUNC(_getch)
-AC_SUBST(sendfile)
-AC_SUBST(fork)
-AC_SUBST(inet_addr)
-AC_SUBST(inet_network)
-
-AC_CHECK_FUNCS(gmtime_r localtime_r)
-
 dnl Checks for libraries.
+AC_CHECK_DEFINE(LOCK_EX, sys/file.h)
+AC_CHECK_DEFINE(F_SETLK, fcntl.h)
+
+pthreadser="0"
+if test "$threads" = "1"; then
+    AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
+    AC_CHECK_FUNC(pthread_mutex_init, [
+        AC_DEFINE(USE_PTHREAD_SERIALIZE)
+        pthreadser="1" ])
+fi
 AC_BEGIN_DECISION([lock implementation method])
 AC_IFALLYES(header:sys/file.h define:LOCK_EX,
             AC_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
@@ -334,104 +356,73 @@ AC_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
             AC_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread mutex]))
 dnl AC_DECISION_FORCE(USE_FCNTL_SERIALIZE)
 AC_END_DECISION
-AC_DEFINE_UNQUOTED($ac_decision) 
+AC_DEFINE_UNQUOTED($ac_decision)
+
+flockser="0"
+sysvser="0"
+procpthreadser="0"
+fcntlser="0"
+case $ac_decision in
+    USE_FLOCK_SERIALIZE )
+        flockser="1"
+        ;;
+    USE_SYSVSEM_SERIALIZE )
+        sysvser="1"
+        ;;
+    USE_FCNTL_SERIALIZE )
+        fcntlser="1"
+        ;;
+    USE_PROC_PTHREAD_SERIALIZE )
+        procpthreadser="1"
+        ;;
+esac
 
-if test ".$ac_decision" = ".USE_FLOCK_SERIALIZE"; then
-    flockser="1"
-else
-    flockser="0"
-fi 
-if test ".$ac_decision" = ".USE_SYSVSEM_SERIALIZE"; then
-    sysvser="1"
-else
-    sysvser="0"
-fi
-if test ".$ac_decision" = ".USE_FCNTL_SERIALIZE"; then
-    fcntlser="1"
-else
-    fcntlser="0"
-fi
-if test ".$ac_decision" = ".USE_PROC_PTHREAD_SERIALIZE"; then
-    procpthreadser="1"
-else
-    procpthreadser="0"
-fi
+AC_SUBST(flockser)
+AC_SUBST(sysvser)
+AC_SUBST(fcntlser)
+AC_SUBST(procpthreadser)
+AC_SUBST(pthreadser)
 
-# Shared memory support.  Until I figure out how to do this well, we are hard
-# coding this.  I am hoping to do this more generally ASAP.
-  AC_ARG_ENABLE(shmem,
-    [ --enable-shmem  Enable shared memory support in APR. ],
-    [ ],
-    ac_cv_enable_shmem="mm" ) 
-
-if test "$ac_cv_enable_shmem" = "no"; then
-  sharedmem="0"
-  anonymous_shm="0"
-  filebased_shm="0"
-  keybased_shm="0"
-else 
-  if test "$ac_cv_enable_shmem" = "mm"; then
-    sharedmem="1"
-    anonymous_shm="1"
-    filebased_shm="0"
-    keybased_shm="0"
-  else 
-    if test "$ac_cv_enable_shmem" = "file"; then
-      sharedmem="1"
-      anonymous_shm="0"
-      filebased_shm="1"
-      keybased_shm="0"
-    else 
-      if test "$ac_cv_enable_shmem" = "key"; then
-        sharedmem="1"
-        anonymous_shm="0"
-        filebased_shm="0"
-        keybased_shm="1"
-      fi  
-    fi
-  fi
-fi
+dnl #----------------------------- Checking for Shared Memory Support 
+echo -e "\nChecking for Shared Memory Support"
+
+# run the MM config script regardless of whether we are going to use
+# it or not.  When we have a much better idea of who is using MM, we can
+# run this on a more conditional basis.
+AC_CONFIG_SUBDIRS(shmem/unix/mm)
 
+AC_MSG_CHECKING(Checking for Shared memory support)
+AC_ARG_ENABLE(shmem,
+  [ --enable-shmem  Enable shared memory support in APR. ],
+  [ ],
+  ac_cv_enable_shmem="mm" )
+
+sharedmem="0"
+anonymous_shm="0"
+filebased_shm="0"
+keybased_shm="0"
+if test "$ac_cv_enable_shmem" = "mm"; then
+  sharedmem="1"
+  anonymous_shm="1"
+  AC_MSG_RESULT(anonymous)
+elif test "$ac_cv_enable_shmem" = "file"; then
+  sharedmem="1"
+  filebased_shm="1"
+  AC_MSG_RESULT(file based)
+elif test "$ac_cv_enable_shmem" = "key"; then
+  sharedmem="1"
+  keybased_shm="1"
+  AC_MSG_RESULT(key based)
+else
+  AC_MSG_RESULT(no)
+fi
 AC_SUBST(sharedmem)
 AC_SUBST(anonymous_shm)
 AC_SUBST(filebased_shm)
 AC_SUBST(keybased_shm)
 
-dnl Start building stuff from our information
-AC_SUBST(LDLIBS)
-AC_SUBST(OPTIM)
-AC_SUBST(RANLIB)
-AC_SUBST(AR)
-AC_SUBST(RM)
-AC_SUBST(OSDIR)
-AC_SUBST(DEFAULT_OSDIR)
-AC_SUBST(LIBPREFIX)
-AC_SUBST(EXEEXT)
-AC_SUBST(errnoh)
-AC_SUBST(direnth)
-AC_SUBST(fcntlh)
-AC_SUBST(netinet_inh)
-AC_SUBST(stdargh)
-AC_SUBST(stdioh)
-AC_SUBST(sys_typesh)
-AC_SUBST(sys_uioh)
-AC_SUBST(signalh)
-AC_SUBST(threads)
-AC_SUBST(pthreadh)
-AC_SUBST(short_value)
-AC_SUBST(int_value)
-AC_SUBST(long_value)
-AC_SUBST(off_t_value)
-AC_SUBST(size_t_value)
-AC_SUBST(ssize_t_value)
-AC_SUBST(flockser)
-AC_SUBST(sysvser)
-AC_SUBST(fcntlser)
-AC_SUBST(procpthreadser)
-AC_SUBST(pthreadser)
-AC_SUBST(ssize_t_fmt)
-AC_SUBST(have_in_addr)
-
+dnl #----------------------------- Checking for Time Support 
+echo -e "\nChecking for Time Support"
 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 [AC_TRY_COMPILE([#include <sys/types.h>
 #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
@@ -441,11 +432,33 @@ if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
     AC_DEFINE(HAVE_GMTOFF)
 fi
 
-# run the MM config script regardless of whether we are going to use 
-# it or not.  When we have a much better idea of who is using MM, we can
-# run this on a more conditional basis.
-AC_CONFIG_SUBDIRS(shmem/unix/mm)
+dnl #----------------------------- Checking for Networking Support 
+echo -e "\nChecking for Networking support"
+AC_MSG_CHECKING(looking for in_addr in netinet/in.h)
+AC_TRY_COMPILE([
+#include <netinet/in.h>
+],[
+struct in_addr arg;
+arg.s_addr = htonl(INADDR_ANY);
+], [ have_in_addr="1" 
+msg=yes ] , [ have_in_addr="0"
+msg=no ])
+AC_MSG_RESULT([$msg])
+
+AC_SUBST(have_in_addr)
 
+dnl #----------------------------- Construct the files
+AC_SUBST(LDLIBS)
+AC_SUBST(OPTIM)
+AC_SUBST(RANLIB)
+AC_SUBST(AR)
+AC_SUBST(RM)
+AC_SUBST(OSDIR)
+AC_SUBST(DEFAULT_OSDIR)
+AC_SUBST(LIBPREFIX)
+AC_SUBST(EXEEXT)
+
+echo "Construct Makefiles and header files."
 MAKEFILE1="Makefile lib/Makefile "
 SUBDIRS="lib "
 for dir in $MODULES
@@ -463,3 +476,4 @@ MAKEFILE3="test/Makefile"
 AC_SUBST(SUBDIRS)
 AC_SUBST(MODULES)
 AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h)
+