Modernize configure.in a bit.

diff --git a/configure.in b/configure.in
index 4d103dfaa8293c36965c9877a5984a8308313b2a..40934397c8a0dc2241af249f4712828012e93061 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,8 @@
 AC_INIT([doldaconnect], [1.4])
+AC_CONFIG_MACRO_DIRS(m4)
 AC_CONFIG_SRCDIR(daemon/main.c)
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AC_USE_SYSTEM_EXTENSIONS
 
 DOLDA_AC_GROUP([Checking build chain])
@@ -18,10 +19,7 @@ AM_GNU_GETTEXT([external])
 
 DOLDA_AC_GROUP([Configuring libtool])
 
-# Temporary hack to make libtool not check for g++ or g77
-m4_defun([_LT_AC_LANG_CXX_CONFIG], true)
-m4_defun([_LT_AC_LANG_F77_CONFIG], true)
-AC_PROG_LIBTOOL
+LT_INIT
 
 experimental=no
 
@@ -247,14 +245,11 @@ fi
 
 DOLDA_AC_GROUP([Checking standard headers])
 
-AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
@@ -272,7 +267,7 @@ else
 fi
 AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 autopackage/Makefile
 common/Makefile
@@ -303,6 +298,7 @@ autopackage/dcuilib.apspec
 autopackage/dcguile.apspec
 autopackage/guishell.apspec
 ])
+AC_OUTPUT
 
 echo
 echo "Dolda Connect has been configured with the following settings:"