From 22122d4d4c43c2c64a37aae597b4d439a6bfa268 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Tue, 1 Jun 2004 10:10:09 +0000
Subject: Now, only one AC_OUTPUT is used.

---
 configure.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'configure.in')

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
 
-- 
cgit v1.2.3