diff options
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | build/rules.mk.in | 9 | ||||
| -rwxr-xr-x | buildconf | 4 | ||||
| -rw-r--r-- | configure.in | 23 | ||||
| -rw-r--r-- | shmem/unix/mm/configure.in | 2 |
6 files changed, 31 insertions, 21 deletions
@@ -1,5 +1,15 @@ Changes with APR b1 + *) Changed apr/helpers to apr/build to be consistent with other Apache + source trees. Added make variables to rules.mk.in that point to the + builders directory and its scripts. Updated buildconf, configure.in, + and Makefile.in files to create and use the new scripts. Moved scandoc + to scandoc.pl and its default.pl template to scandoc_template.pl. + [Roy Fielding] + + *) Updated config.guess and config.sub to GNU libtool 1.3.5 features, + with the Apache additions for OS/390 and OS/2 emx. [Roy Fielding] + *) Moved hints.m4, apr_common.m4, and helpers/apr-conf.m4 into the new build directory as apr_hints.m4, apr_common.m4, apr_network.m4, and apr_threads.m4. [Roy Fielding] diff --git a/Makefile.in b/Makefile.in index af860b2f8..cd4ed34c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,6 +33,8 @@ DISTCLEAN_TARGETS = config.cache config.log config.status \ EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \ include/arch/unix/apr_private.h.in +SCANDOC_TEMPLATE = -i$(apr_builders)/scandoc_template.pl + ### fix this up at some point (install location) libdir = /usr/local/lib @@ -65,7 +67,7 @@ $(TARGET_EXPORTS): $(MKEXPORT) include/*.h > $@ docs: - $(SCANDOC) -ihelpers/default.pl -p./docs/ ./include/*.h + $(SCANDOC) $(SCANDOC_TEMPLATE) -p./docs/ $(INCDIR)/*.h test: $(TARGET_LIB) (cd test; make clean; make; \ diff --git a/build/rules.mk.in b/build/rules.mk.in index 7bc932ffc..802e1a84f 100644 --- a/build/rules.mk.in +++ b/build/rules.mk.in @@ -62,6 +62,7 @@ # Configuration variables # top_builddir=@top_builddir@ +apr_builders=@apr_builders@ CC=@CC@ AWK=@AWK@ @@ -75,10 +76,6 @@ LDFLAGS=@LDFLAGS@ RM=@RM@ SHELL=@SHELL@ -MKEXPORT=@APR_MKEXPORT@ -MKDEP=@APR_MKDEP@ -SCANDOC=@APR_SCANDOC@ - ### make LTFLAGS somewhat variable? LTFLAGS = --silent @@ -90,6 +87,10 @@ LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@ LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@ +MKEXPORT = $(AWK) -f $(apr_builders)/make_export.awk +MKDEP = $(apr_builders)/mkdep.sh +SCANDOC = $(apr_builders)/scandoc.pl + # # Standard build rules # @@ -3,7 +3,7 @@ # # Build aclocal.m4 from libtool's libtool.m4 and our own M4 files. # -libtoolize=`helpers/PrintPath glibtoolize libtoolize` +libtoolize=`build/PrintPath glibtoolize libtoolize` ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 echo "Incorporating $ltfile into aclocal.m4 ..." @@ -27,7 +27,7 @@ cat $ltfile >> aclocal.m4 # rely on libtool's versions # echo "Copying libtool helper files ..." -$libtoolize --copy +$libtoolize --copy --automake # # Generate the autoconf header and ./configure diff --git a/configure.in b/configure.in index 84bf41b0e..d464792b4 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl ## dnl Process this file with autoconf to produce a configure script. AC_INIT(build/apr_common.m4) AC_CONFIG_HEADER(include/arch/unix/apr_private.h) -AC_CONFIG_AUX_DIR(helpers) +AC_CONFIG_AUX_DIR(build) AC_CANONICAL_SYSTEM echo "Configuring APR library" @@ -30,6 +30,12 @@ if test "$abs_builddir" != "$abs_srcdir"; then USE_VPATH=1 fi +dnl Directory containing apr build macros, helpers, and make rules +apr_builders=$abs_srcdir/build +AC_SUBST(apr_builders) + +MKDIR=$apr_builders/mkdir.sh + # These added to allow default directories to be used... DEFAULT_OSDIR="unix" echo "(Default will be ${DEFAULT_OSDIR})" @@ -42,15 +48,6 @@ AC_PROG_AWK AC_CHECK_PROG(RM, rm, rm) AC_CHECK_TOOL(AR, ar, ar) -dnl Get locations of the build helper scripts -MKDIR=$abs_srcdir/helpers/mkdir.sh -APR_MKEXPORT="$AWK -f $abs_srcdir/helpers/make_export.awk" -AC_SUBST(APR_MKEXPORT) -APR_MKDEP=$abs_srcdir/helpers/mkdep.sh -AC_SUBST(APR_MKDEP) -APR_SCANDOC=$abs_srcdir/helpers/scandoc -AC_SUBST(APR_SCANDOC) - # This macro needs to be here in case we are on an AIX box. AC_AIX @@ -923,10 +920,10 @@ dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles dnl case "$host_alias" in *bsdi*) - INCLUDE_RULES=".include \"$top_builddir/helpers/rules.mk\"" + INCLUDE_RULES=".include \"$apr_builders/rules.mk\"" ;; *) - INCLUDE_RULES="include $top_builddir/helpers/rules.mk" + INCLUDE_RULES="include $apr_builders/rules.mk" ;; esac AC_SUBST(INCLUDE_RULES) @@ -944,7 +941,7 @@ AC_OUTPUT([ $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h APRVARS - helpers/rules.mk + build/rules.mk ],[ for i in $SAVE_FILES; do if cmp -s $i $i.save 2>/dev/null; then diff --git a/shmem/unix/mm/configure.in b/shmem/unix/mm/configure.in index 432199bbc..cf378e175 100644 --- a/shmem/unix/mm/configure.in +++ b/shmem/unix/mm/configure.in @@ -11,7 +11,7 @@ AC_REVISION($1.0$)dnl dnl # autoconf initialization AC_INIT(README) -AC_CONFIG_AUX_DIR(../../../helpers) +AC_CONFIG_AUX_DIR(../../../build) AC_CONFIG_HEADER(mm_conf.h) AC_PREFIX_DEFAULT(/usr/local) |