From a3b550c602ec8387b6d2f9780e276d630e16ec76 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@apache.org>
Date: Tue, 5 Dec 2000 18:29:06 +0000
Subject: [PATCH] Generate the apr-utils exports file using APR's buildexports
 scripts. This also modified Apache's buildconf to add those symbols to the
 exports.c file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87216 13f79535-47bb-0310-9956-ffa450edef68
---
 build/build2.mk        |  8 ++++----
 build/buildexports.awk |  2 +-
 build/buildexports.sh  | 24 ++++++++++++++++--------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/build/build2.mk b/build/build2.mk
index efb8f6a9e0..f8ada3ab6f 100644
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -88,8 +88,8 @@ aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_
 	@echo rebuilding $@
 	@cat acinclude.m4 $(libtool_m4) > $@
 
-export_lists:
-	@build/buildexports.sh server/exports.c srclib/apr/apr.exports
+export_lists: $(aprutil_configure) $(apr_configure)
+	@build/buildexports.sh server/exports.c srclib/apr/apr.exports srclib/apr-util/aprutil.exports
 
 $(LT_TARGETS):
 	libtoolize $(AMFLAGS) --force
@@ -118,9 +118,9 @@ $(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h
 	@rm -f $@
 	(cd srclib/apr && autoheader)
 
-$(aprutil_configure): srclib/apr-util/configure.in
+$(aprutil_configure): srclib/apr-util/configure.in 
 	@echo rebuilding $@
-	(cd srclib/apr-util && ./buildconf.sh)
+	(cd srclib/apr-util && ./buildconf.sh ../apr)
 
 $(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4
 	@echo rebuilding $@
diff --git a/build/buildexports.awk b/build/buildexports.awk
index 3341034d9b..f6ef2a5a8e 100644
--- a/build/buildexports.awk
+++ b/build/buildexports.awk
@@ -1,7 +1,7 @@
 {
     if ($1 ~ /^APR_/)
         print "#if", $1;
-    if ($1 ~ /^apr_/)
+    if ($1 ~ /^apr?_/)
         print "const void *ap_hack_" $1 " = (const void *)" $1 ";";
     if ($1 ~ /^\/APR_/)
         print "#endif /*", substr($1,2), "*/";
diff --git a/build/buildexports.sh b/build/buildexports.sh
index 40b04355ed..000963e955 100755
--- a/build/buildexports.sh
+++ b/build/buildexports.sh
@@ -1,23 +1,31 @@
 #! /bin/sh
 
-exec >$1
-exec <$2
+outfile=$1
+exec >$outfile
+shift
 
 echo "/* This is an ugly hack that needs to be here, so that libtool will"
 echo " * link all of the APR functions into server regardless of whether"
 echo " * the base server uses them."
 echo " */"
 echo ""
- 
-cd srclib/apr/include 
-for file in *.h
+
+for dir in srclib/apr/include srclib/apr-util/include
 do
-    echo "#include \"$file\""
+    cd $dir
+    for file in *.h
+    do
+        echo "#include \"$file\""
+    done
+    cd ../../../
 done
-cd ../../../
 echo ""
 
-awk -f build/buildexports.awk
+for file
+do
+    exec <$file
+    awk -f build/buildexports.awk
+done
 
 echo ""
 echo "void *ap_ugly_hack;"
-- 
2.40.0