From 27611d63660d88de2f7ed7c84ba30be4bfb6a63a Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sun, 10 Aug 2003 23:25:22 +0000
Subject: [PATCH] * configure.in: Modernize calls to AC_INIT, AM_INIT_AUTOMAKE
 and AC_OUTPUT.  Require Autoconf >= 2.57 and Automake >= 1.6.3. Remove many
 superfluous AC_SUBSTs.

svn: r1984
---
 gramps2/configure.in | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/gramps2/configure.in b/gramps2/configure.in
index 687c4470a..dbb94e39c 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -1,7 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl May need to run automake && aclocal first
-AC_INIT(src/gramps.py)
-AM_INIT_AUTOMAKE(gramps, 0.9.3)
+
+AC_PREREQ(2.57)
+AC_INIT(gramps, 0.9.3, gramps-bugs@lists.sourceforge.net)
+AC_CONFIG_SRCDIR(src/gramps.py)
+AM_INIT_AUTOMAKE(1.6.3)
 RELEASE=0.CVS$(date +%G%m%d)
 
 VERSIONSTRING=$VERSION
@@ -10,13 +13,10 @@ then
   VERSIONSTRING="$VERSION-$RELEASE"
 fi
 
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
 AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)
 
 AC_PATH_PROG(MSGFMT, msgfmt)
-AC_SUBST(MSGFMT)
 
 LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" 
 AC_SUBST(LANGUAGES)
@@ -53,9 +53,6 @@ fi
 
 AC_PATH_PROG(ZIP, zip)
 
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
 AC_PROG_CC
 
 AC_CHECK_HEADER(libintl.h)
@@ -249,24 +246,15 @@ dnl ======================================================
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
 
-AC_SUBST(BINSH)
-AC_SUBST(SWIG)
-AC_SUBST(PYTHON)
-AC_SUBST(PYTHON_VERSION)
 AC_SUBST(GNOMEHELP)
-AC_SUBST(LIBS)
 AC_SUBST(GPREFIX)
 
-AC_SUBST(P15_INCLUDES)
-AC_SUBST(P20_INCLUDES)
-AC_SUBST(P21_INCLUDES)
 AC_SUBST(P22_INCLUDES)
 AC_SUBST(GNOMEINC)
 AC_SUBST(GNOMELIB)
-AC_SUBST(GPREF)
 AC_SUBST(INTLLIBS)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile 
 src/Makefile
 src/const.py
@@ -284,3 +272,4 @@ example/Makefile
 example/gramps/Makefile
 gramps.spec
 gramps.sh])
+AC_OUTPUT