More correctly, this is 1.4.0-dev-r833920 as shipped in /release/httpd/ r38
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.0-dev-r833920@886999 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/buildconf b/buildconf
index 5d6536f..cb4ae46 100755
--- a/buildconf
+++ b/buildconf
@@ -17,11 +17,6 @@
#
#
-if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
- verbose="--verbose"
- shift
-fi
-
# Default place to look for apr source. Can be overridden with
# --with-apr=[directory]
apr_src_dir=../apr
@@ -72,11 +67,11 @@
# Generate the autoconf header (include/apu_config.h) and ./configure
#
echo "Creating include/private/apu_config.h ..."
-${AUTOHEADER:-autoheader} $verbose
+${AUTOHEADER:-autoheader}
echo "Creating configure ..."
### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf} $verbose; then
+if ${AUTOCONF:-autoconf}; then
:
else
echo "autoconf failed"
@@ -87,14 +82,14 @@
# Generate build-outputs.mk for the build system
#
echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py $verbose make
+$apr_src_dir/build/gen-build.py make
#
# If Expat has been bundled, then go and configure the thing
#
if [ -f xml/expat/buildconf.sh ]; then
echo "Invoking xml/expat/buildconf.sh ..."
- (cd xml/expat; ./buildconf.sh $verbose)
+ (cd xml/expat; ./buildconf.sh)
fi
# Remove autoconf cache again
diff --git a/configure.in b/configure.in
index 726f13f..c8d3a74 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script
dnl
-AC_PREREQ(2.59)
+AC_PREREQ(2.50)
AC_INIT(export_vars.sh.in)
AC_CONFIG_HEADER(include/private/apu_config.h)
diff --git a/test/Makefile.in b/test/Makefile.in
index cf89a54..a2a3c6d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -12,7 +12,7 @@
INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
-STDTEST_PORTABLE = dbd testall
+STDTEST_PORTABLE = testall dbd
TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
@@ -59,7 +59,7 @@
check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
teststatus=0; \
progfailed=""; \
- for prog in $(STDTEST_NONPORTABLE) $(STDTEST_PORTABLE); do \
+ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
if test "$$prog" = 'dbd'; then \
for driver in none @apu_dbd_tests@; do \
if test "$$driver" != 'none'; then \
diff --git a/test/Makefile.win b/test/Makefile.win
index 9f5ca84..c1c8533 100644
--- a/test/Makefile.win
+++ b/test/Makefile.win
@@ -157,11 +157,11 @@
APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
check: $(PROGRAMS) $(OTHER_PROGRAMS)
- echo Testing dbd sqlite2 && $(OUTDIR)\dbd.exe sqlite2 || echo Failed
- echo Testing dbd sqlite3 && $(OUTDIR)\dbd.exe sqlite3 || echo Failed
@for %p in ($(PROGRAMS)) do @( \
echo Testing %p && %p -v || echo %p failed \
)
+ echo Testing dbd sqlite2 && $(OUTDIR)\dbd.exe sqlite2 || echo Failed
+ echo Testing dbd sqlite3 && $(OUTDIR)\dbd.exe sqlite3 || echo Failed
checkall: check
