From: Ryan Bloom <rbb@apache.org>
Date: Tue, 27 Jun 2000 20:06:21 +0000 (+0000)
Subject: Detect libraries based on which platform configure is being run on.
X-Git-Tag: APACHE_2_0_ALPHA_5~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8da014bc12300edac492662daa869d7b8889cf07;p=apache

Detect libraries based on which platform configure is being run on.

Basically, Apache now runs APR's configure script first.  APR's configure
script has been setup to create a new file, APRVARS.  APRVARS is basically
all of the environment variables that APR wants to export to the program
that is using it.  This allows the calling program to "source" APRVARS
and get those environment variables.

Removed hack to make platforms use -ldl.


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

diff --git a/STATUS b/STATUS
index f16aea52c1..12ac0568c5 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 Apache 2.0 STATUS:
-Last modified at [$Date: 2000/06/26 13:13:05 $]
+Last modified at [$Date: 2000/06/27 20:06:14 $]
 
 Release:
 
@@ -24,11 +24,6 @@ RELEASE SHOWSTOPPERS:
             module.  This should be override-able of course.
         Status: Jim Jagielski is looking into this.
 
-      - Fix up ./configure to properly detect the various dynamic load
-          libraries/flags on the different platforms (current, we default
-          to -ldl which is wrong).
-        Status:
-
     * suEXEC doesn't work
         Status: Manoj has posted an patch to fix this.
         <19991103003605.A20612@samosa.mindspring.com>
diff --git a/acinclude.m4 b/acinclude.m4
index 439f9f892e..ce4300eccd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -407,3 +407,34 @@ AC_ARG_ENABLE(modules,
   done
 ])
 ])dnl
+
+AC_DEFUN(APACHE_RUN_SUBDIR_CONFIG_NOW, [
+  echo "configuring package in $1 now"
+  ac_popdir=`pwd`
+  ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
+  cd $1
+
+changequote(, )dnl
+      # A "../" for each directory in /$config_subdirs.
+      ac_dots=`echo $config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+changequote([, ])dnl
+
+  # Make the cache file name correct relative to the subdirectory.
+  case "$cache_file" in
+  /*) ac_sub_cache_file=$cache_file ;;
+  *) # Relative path.
+    ac_sub_cache_file="$ac_dots$cache_file" ;;
+  esac
+
+  # The eval makes quoting arguments work.
+
+  if eval $ac_abs_srcdir/configure --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir
+  then :
+    echo "$1 configured properly"
+  else
+    echo "configure failed for $1"
+  fi
+
+  cd $ac_popdir
+])
+
diff --git a/configure.in b/configure.in
index 96287af49b..778fa0662d 100644
--- a/configure.in
+++ b/configure.in
@@ -30,7 +30,9 @@ if test "$abs_builddir" != "$abs_srcdir"; then
 fi
 
 dnl ## Run configure for packages Apache uses
-AC_CONFIG_SUBDIRS(lib/apr)
+APACHE_RUN_SUBDIR_CONFIG_NOW(lib/apr)
+source lib/apr/APRVARS
+
 
 dnl
 dnl ## Preload our OS configuration
diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index aa3fcdc861..afec8e32ff 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -56,22 +56,6 @@ APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , yes)
 
 LTFLAGS="$LTFLAGS -export-dynamic"
 
-PLAT=`$ac_config_guess`
-PLAT=`$ac_config_sub $PLAT`
-case "$PLAT" in
-    *-ibm-os390)
-        ;;
-    *-freebsd*)
-        ;;
-    *-os2_emx)
-        ;;
-    *-beos*)
-        ;;
-    *)
-        LIBS="$LIBS -ldl"
-        ;;
-esac
-
 if test "$sharedobjs" = "yes"; then
     APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , yes)
 else