You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2005/02/04 13:13:17 UTC
svn commit: r151343 - in apr/apr-util/trunk: Makefile.in configure.in
Author: jorton
Date: Fri Feb 4 04:13:13 2005
New Revision: 151343
URL: http://svn.apache.org/viewcvs?view=rev&rev=151343
Log:
* configure.in: Use AC_CONFIG_*.
* Makefile.in (DISTCLEAN_TARGETS): Add build/pkg/pkginfo.
(check): Remove unnecessary subshell.
Modified:
apr/apr-util/trunk/Makefile.in
apr/apr-util/trunk/configure.in
Modified: apr/apr-util/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/Makefile.in?view=diff&r1=151342&r2=151343
==============================================================================
--- apr/apr-util/trunk/Makefile.in (original)
+++ apr/apr-util/trunk/Makefile.in Fri Feb 4 04:13:13 2005
@@ -35,7 +35,7 @@
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 @@
test: check
check: $(TARGET_LIB)
- (cd test && $(MAKE) check)
+ cd test && $(MAKE) check
Modified: apr/apr-util/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/configure.in?view=diff&r1=151342&r2=151343
==============================================================================
--- apr/apr-util/trunk/configure.in (original)
+++ apr/apr-util/trunk/configure.in Fri Feb 4 04:13:13 2005
@@ -2,7 +2,7 @@
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 @@
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
+
+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])
-if test ! -d "$top_builddir/include/private"; then
- mkdir $top_builddir/include
- mkdir $top_builddir/include/private
-fi
-
-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