summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2004-06-01 12:10:09 +0200
committerOndrej Filip <feela@network.cz>2004-06-01 12:10:09 +0200
commit22122d4d4c43c2c64a37aae597b4d439a6bfa268 (patch)
treedecc80028fd2ff7aeeb18d9b3af3454f83229413
parent402a9fa78a9849dbbefcbea81cd9cf7c8ab87c22 (diff)
downloadbird-22122d4d4c43c2c64a37aae597b4d439a6bfa268.tar
bird-22122d4d4c43c2c64a37aae597b4d439a6bfa268.zip
Now, only one AC_OUTPUT is used.
-rw-r--r--configure.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 1295884..69ea0f8 100644
--- a/configure.in
+++ b/configure.in
@@ -196,9 +196,14 @@ AC_SUBST(CLIENT_LIBS)
mkdir -p $objdir/sysdep
AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
-AC_OUTPUT()
-AC_OUTPUT_COMMANDS(,[CPP="$CPP" $srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs])
-AC_OUTPUT($makefiles)
+AC_CONFIG_COMMANDS([merge],[[export CPP="$CPP"
+$srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]],
+ [[srcdir=$srcdir]
+ [srcdir_rel=$srcdir_rel]
+ [objdir=$objdir]
+ [sysdep_dirs="$sysdep_dirs"]])
+AC_CONFIG_FILES($makefiles)
+AC_OUTPUT
cat >&AC_FD_MSG <<EOF