Require autoconf-2.13.

Remove some variables that now come with AM_INIT_AUTOMAKE.
Remove deprecated AM_MAINTAINER_MODE.
Use AC_PROG_INSTALL, not deprecated AM_PROG_INSTALL.
Use AM_FUNC_OBSTACK, not AC_REPLACE_OBSTACK.
Use AM_GNU_GETTEXT, not ud_GNU_GETTEXT/AC_LINK_FILES...
Define LIBOBJS for ansi2knr filtering rules.
(AC_OUTPUT): Add m4/Makefile.

1 files changed, 28 insertions, 21 deletions

diff --git a/configure.in b/configure.in
index 5f2f219..0d99117 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
 dnl Note: the banner comments below are intentionally done in shell syntax.
 dnl These help me identify sections of the configure script produced
@@ -11,29 +11,24 @@ dnl they are there to delimit sections in the output configure script.
 
 AC_INIT(src/mkid.c)
 AM_CONFIG_HEADER(config.h)
-AC_PREREQ(2.10)
-AC_ARG_PROGRAM
+AC_PREREQ(2.13)
+
+AM_INIT_AUTOMAKE([id-utils], [3.2a])
+GNU_PACKAGE="GNU $PACKAGE"
+AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
+  [The concatenation of the strings \`GNU ', and PACKAGE.])
 
 ##############################################################################
 ################ Identify Package ############################################
 ##############################################################################
 
-PACKAGE=id-utils
-VERSION=3.2a
-PACKAGE_VERSION="GNU $PACKAGE $VERSION"
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(PACKAGE_VERSION)
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "GNU $PACKAGE $VERSION",
+  [The concatenation of \`GNU', and the macros PACKAGE and VERSION.])
 
 ##############################################################################
 ################ Maintainer Stuff ############################################
 ##############################################################################
 
-AM_MAINTAINER_MODE
-
 ALL_LINGUAS="de fr"
 
 changequote(,)dnl
@@ -50,7 +45,7 @@ AC_SUBST(README_ALPHA)
 
 AC_PROG_CC
 AC_PROG_LN_S
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
@@ -81,8 +76,8 @@ AC_CHECK_HEADERS(malloc.h termios.h termio.h sgtty.h regex.h memory.h)
 ################ Check for typedefs, structs, and compiler params ############
 ##############################################################################
 
-AC_C_CONST
 AM_C_PROTOTYPES
+AC_C_CONST
 AC_TYPE_SIGNAL
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
@@ -104,18 +99,16 @@ AC_SUBST(LDFLAGS)
 AC_FUNC_ALLOCA
 AM_WITH_REGEX
 AC_FUNC_VPRINTF
+AM_FUNC_OBSTACK
 AC_CHECK_FUNCS(getwd getcwd link strerror isascii bcopy bzero memcpy)
 AC_REPLACE_FUNCS(strdup strndup strspn strcspn strpbrk strstr strtok)
 AC_REPLACE_FUNCS(basename dirname fnmatch error memcpy memset)
-AC_REPLACE_GNU_GETOPT
-AC_REPLACE_OBSTACK
 
 ##############################################################################
 ################ Internationalization ########################################
 ##############################################################################
 
-ud_GNU_GETTEXT
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+AM_GNU_GETTEXT
 
 ##############################################################################
 ################ Find a home for language map ################################
@@ -140,7 +133,21 @@ AM_PATH_LISPDIR
 ################ Generate the configure script ###############################
 ##############################################################################
 
-AC_OUTPUT([Makefile doc/Makefile lib/Makefile libidu/Makefile src/Makefile lisp/Makefile intl/Makefile po/Makefile.in testsuite/Makefile],
+# This is necessary so that .o files in LIBOBJS are also built via
+# the ANSI2KNR-filtering rules.
+LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
+
+AC_OUTPUT([Makefile
+	   doc/Makefile
+	   lib/Makefile
+	   libidu/Makefile
+	   src/Makefile
+	   lisp/Makefile
+	   intl/Makefile
+	   m4/Makefile
+	   po/Makefile.in
+	   testsuite/Makefile
+	  ],
 	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \
 	 test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h])