Commit 0199413d authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent 5ee76191

build/build2.mk

+4 −4
Original line number Diff line number Diff line
@@ -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
@@ -120,7 +120,7 @@ $(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h 


$(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 $@

build/buildexports.awk

+1 −1
Original line number Diff line number Diff line 
{

    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), "*/";

build/buildexports.sh

+16 −8
Original line number Diff line number Diff line 
#! /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"
@@ -9,15 +10,22 @@ echo " * the base server uses them." 
echo " */"

echo ""



cd srclib/apr/include 

for dir in srclib/apr/include srclib/apr-util/include

do

    cd $dir

    for file in *.h

    do

        echo "#include \"$file\""

    done

    cd ../../../

done

echo ""



for file

do

    exec <$file

    awk -f build/buildexports.awk

done



echo ""

echo "void *ap_ugly_hack;"