* configure.in: Use AC_CONFIG_*.

* Makefile.in (DISTCLEAN_TARGETS): Add build/pkg/pkginfo.
(check): Remove unnecessary subshell.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@151343 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 19 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index d8327e26..e4670d05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
 	include/private/apu_config.h include/private/apu_private.h \
 	include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
 	export_vars.sh $(APU_CONFIG) build/rules.mk include/apu_want.h \
-	apr-util.pc
+	apr-util.pc build/pkg/pkginfo
 EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
 	exports.c build-outputs.mk \
 	build/apr_common.m4 build/find_apr.m4 build/install.sh \
@@ -88,4 +88,4 @@ dox:
 
 test: check
 check: $(TARGET_LIB)
-	(cd test && $(MAKE) check)
+	cd test && $(MAKE) check
diff --git a/configure.in b/configure.in
index a7d290b9..c5452453 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 
-AC_PREREQ(2.13)
+AC_PREREQ(2.50)
 AC_INIT(export_vars.sh.in)
 
 AC_CONFIG_HEADER(include/private/apu_config.h)
@@ -183,30 +183,25 @@ esac
 AC_SUBST(INCLUDE_RULES)
 AC_SUBST(INCLUDE_OUTPUTS)
 
-if test -d $srcdir/test; then
-    test_Makefile="test/Makefile"
-fi
+for d in include include/private; do
+    test -d $top_builddir/$d || mkdir $top_builddir/$d
+done
 
-if test ! -d "$top_builddir/include/private"; then
-    mkdir $top_builddir/include
-    mkdir $top_builddir/include/private
-fi
+AC_CONFIG_FILES([Makefile export_vars.sh
+                 build/pkg/pkginfo apr-util.pc
+                 apu-$APRUTIL_MAJOR_VERSION-config:apu-config.in
+                 include/private/apu_select_dbm.h
+                 include/apr_ldap.h
+                 include/apu.h include/apu_want.h])
 
-dnl
-dnl everthing is done. 
-MAKEFILES="Makefile $test_Makefile"
-AC_OUTPUT([
-    export_vars.sh
-    build/pkg/pkginfo
-    apu-$APRUTIL_MAJOR_VERSION-config:apu-config.in
-    apr-util.pc
-    include/private/apu_select_dbm.h
-    include/apr_ldap.h
-    include/apu.h
-    include/apu_want.h
-    $MAKEFILES
-	],[
+AC_CONFIG_COMMANDS([default], [
 chmod +x apu-$APRUTIL_MAJOR_VERSION-config
 ],[
 APRUTIL_MAJOR_VERSION=$APRUTIL_MAJOR_VERSION
 ])
+
+if test -d $srcdir/test; then
+    AC_CONFIG_FILES([test/Makefile])
+fi
+
+AC_OUTPUT