Force all Apache functions to be linked into the executable, whether they

are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


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

2 files changed, 6 insertions, 5 deletions

diff --git a/build/buildexports.awk b/build/buildexports.awk
index 78f373065f..d0d692fe35 100644
--- a/build/buildexports.awk
+++ b/build/buildexports.awk
@@ -1,3 +1,3 @@
-/^APR_/     { print "#if", $1 }
+/^(APR?_|defined)/     { print "#if", $1 }
 /^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" }
-/^\/APR_/   { print "#endif /*", substr($1,2), "*/" }
+/^\/(APR?_|defined)/   { print "#endif /*", substr($1,2), "*/" }
diff --git a/build/buildexports.sh b/build/buildexports.sh
index b1ac43ccd5..38ffbd66b1 100755
--- a/build/buildexports.sh
+++ b/build/buildexports.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 if test -z "$1"; then
-    echo "USAGE: $0 SRCLIB-DIRECTORY"
+    echo "USAGE: $0 HTTPD-DIRECTORY"
     echo ""
-    echo "for example: $0 ../srclib"
+    echo "for example: $0 .."
     exit 1
 fi
 
@@ -12,9 +12,10 @@ echo " * link all of the APR functions into server regardless of whether"
 echo " * the base server uses them."
 echo " */"
 echo ""
+echo "#define CORE_PRIVATE"
 
 cur_dir="`pwd`"
-for dir in $1/apr/include $1/apr-util/include
+for dir in $1/srclib/apr/include $1/srclib/apr-util/include $1/include
 do
     cd $dir
     for file in *.h; do