fielding 01/02/18 07:52:12
Modified: . CHANGES Makefile.in buildconf configure.in
build rules.mk.in
shmem/unix/mm configure.in
Log:
Enable use of the new build directory.
Revision Changes Path
1.63 +10 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- CHANGES 2001/02/17 11:15:36 1.62
+++ CHANGES 2001/02/18 15:52:12 1.63
@@ -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]
1.43 +3 -1 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.in 2001/02/17 22:25:47 1.42
+++ Makefile.in 2001/02/18 15:52:12 1.43
@@ -33,6 +33,8 @@
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 @@
$(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; \
1.10 +2 -2 apr/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr/buildconf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- buildconf 2001/02/17 11:15:38 1.9
+++ buildconf 2001/02/18 15:52:12 1.10
@@ -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 @@
# rely on libtool's versions
#
echo "Copying libtool helper files ..."
-$libtoolize --copy
+$libtoolize --copy --automake
#
# Generate the autoconf header and ./configure
1.228 +10 -13 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- configure.in 2001/02/17 11:15:39 1.227
+++ configure.in 2001/02/18 15:52:12 1.228
@@ -5,7 +5,7 @@
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 @@
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_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
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 @@
$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
1.2 +5 -4 apr/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/build/rules.mk.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rules.mk.in 2001/02/18 13:36:15 1.1
+++ rules.mk.in 2001/02/18 15:52:12 1.2
@@ -62,6 +62,7 @@
# Configuration variables
#
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -75,10 +76,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
### make LTFLAGS somewhat variable?
LTFLAGS = --silent
@@ -89,6 +86,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
1.9 +1 -1 apr/shmem/unix/mm/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/shmem/unix/mm/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in 2000/12/31 12:26:41 1.8
+++ configure.in 2001/02/18 15:52:12 1.9
@@ -11,7 +11,7 @@
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)
