build: Some minor modernizations

diff --git a/Makefile.am b/Makefile.am
index 04dd1b0dc6ff29d5e48fe0441808d4cf113a48a8..b188bd17529dcf33fddc3fc60fc7da8c314080af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
+
 NULL =
 
 SUBDIRS = \

diff --git a/configure.ac b/configure.ac
index 970eedbbf62f747b13faf404ee773a50e36a9220..aa38ed68a3c36ac93884f6182e2cb0e29fd994dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+AC_PREREQ([2.65])
 AC_INIT([vala], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [j@bitron.ch], [vala])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -22,9 +23,12 @@ AC_SUBST(pkgdatadir, [${datadir}/vala${PACKAGE_SUFFIX}])
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
+AC_PROG_INSTALL
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+PKG_PROG_PKG_CONFIG([0.21])
 
 AC_PROG_LEX
 if test "$LEX" = :; then