summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac8
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 04dd1b0dc..b188bd175 100644
--- 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 970eedbbf..aa38ed68a 100644
--- 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