port to modern autotools (autoconf 2.71 / automake 1.16.5)

Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl doc src po
+SUBDIRS = doc src po
 
 EXTRA_DIST = config.rpath autogen.sh ABOUT-NLS
 

configure.ac

@@ -1,15 +1,16 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(ant-phone)
-AM_INIT_AUTOMAKE(ant-phone, "0.2.1", ant-phone-devel@nongnu.org)
-AC_PREREQ(2.53)
+AC_INIT([ant-phone],[0.2.1. ant-phone-devel@nongnu.org])
+AC_CONFIG_SRCDIR([ant-phone])
+AM_INIT_AUTOMAKE
+AC_PREREQ([2.71])
 AC_CONFIG_SRCDIR([config.h.in])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
-AM_PROG_LEX
+AC_PROG_LEX(noyywrap)
 if test "$LEX" != flex; then
   LEX="$SHELL $missing_dir/missing flex"
   AC_SUBST(LEX_OUTPUT_ROOT, lex.yy)
@@ -23,19 +24,52 @@ AC_CHECK_LIB([sndfile], [sf_open],, AC_MSG_ERROR(You need the libsndfile headers
 AC_CHECK_LIB([capi20], [capi20_register],, AC_MSG_ERROR(You need the libcapi20 headers to build this package))
 
 # Checks for header files.
-AC_HEADER_STDC
+m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+  Except in unusual embedded environments, you can safely include all
+  ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
 AC_CHECK_HEADERS([fcntl.h limits.h math.h pwd.h stddef.h stdlib.h string.h sys/ioctl.h sys/stat.h sys/time.h sys/types.h termios.h unistd.h sndfile.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
+m4_warn([obsolete],
+[Update your code to rely only on HAVE_SYS_TIME_H,
+then remove this warning and the obsolete code below it.
+All current systems provide time.h; it need not be checked for.
+Not all systems provide sys/time.h, but those that do, all allow
+you to include it and time.h simultaneously.])dnl
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+# Obsolete code to be removed.
+if test $ac_cv_header_sys_time_h = yes; then
+  AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
+	     and <time.h>.  This macro is obsolete.])
+fi
+# End of obsolete code.
+
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
-AC_TYPE_SIGNAL
+m4_warn([obsolete],
+[your code may safely assume C89 semantics that RETSIGTYPE is void.
+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <sys/types.h>
+#include <signal.h>
+],
+		 [return *(signal (0, 0)) (0) == 1;])],
+		   [ac_cv_type_signal=int],
+		   [ac_cv_type_signal=void])])
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
+		    (`int' or `void').])
+
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([floor select strdup strstr strtol mkdir strcasecmp])
 
@@ -62,7 +96,7 @@ else
 fi
 
 # GNU gettext
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.16.1)
 
 # directory containing configuration support files

src/Makefile.am

@@ -78,7 +78,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = @LIBINTL@ @LIBS@ -lgthread-2.0 -lasound -lcapi20
 
-INCLUDES = -I../intl -I$(top_srcdir)/intl @DEPS_CFLAGS@
+AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl @DEPS_CFLAGS@
 AM_CFLAGS = -DVERSION='"@VERSION@"' -DPACKAGE='"@PACKAGE@"' @CFLAGS@
 AM_LDFLAGS = @DEPS_LIBS@
 LDADD = @LEXLIB@