From: Greg Stein <gstein@apache.org>
Date: Fri, 22 Dec 2000 22:44:45 +0000 (+0000)
Subject: Back out the .libs thing from the aprutil linking. Add --disable-shared (for
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79c543f71288fd504800dda9724dc08112d79923;p=apache

Back out the .libs thing from the aprutil linking. Add --disable-shared (for
now) to the subdir config to ensure that we only get a static library for
aprutil (which allows for linking all of its functions into the executable).
[ APR will need something similar if/when it gets libtool-ized ]

Mark a note in STATUS indicating we should eventually toss the
--disable-shared flag.


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

diff --git a/STATUS b/STATUS
index fc4c8ceb34..313be5ede7 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:						-*-text-*-
-Last modified at [$Date: 2000/12/21 02:52:00 $]
+Last modified at [$Date: 2000/12/22 22:44:45 $]
 
 Release:
 
@@ -66,6 +66,11 @@ RELEASE SHOWSTOPPERS:
       would be surprised if it works.
 	Status: rbb volunteers
 
+    * remove the --disable-shared from the subdir config of APR(UTIL)
+      before the final release. (in fact, it might even be nice to
+      allow for Apache config/build against an already-installed APR(UTIL))
+
+
 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
     * The directives to setup output filters need to be re-visited.  These
       directives aren't consistent with what we already have, and they don't
diff --git a/configure.in b/configure.in
index 4dd5a1d96a..120c718efa 100644
--- a/configure.in
+++ b/configure.in
@@ -174,7 +174,7 @@ apache_need_expat=yes
 
 dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
 dnl AP_LIBS specifies the actual libraries. note we have some required libs.
-AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/.libs/libaprutil.a"
+AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
 
 if test "$apache_need_expat" = "yes"; then
   AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
@@ -219,7 +219,7 @@ dnl ## APRVARS before Apache generates it's Makefiles and the related files.
 dnl ## This allows APR to detect libraries like dl and tell Apache that it
 dnl ## needs to include or not include them.
 RUN_SUBDIR_CONFIG_NOW(srclib/apr, $apache_apr_flags)
-RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr")
+RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr --disable-shared")
 RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
 . ./srclib/apr/APRVARS