summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-11-11 23:02:11 +0100
committerJan Engelhardt <jengelh@medozas.de>2010-11-11 23:21:34 +0100
commit2b36543ab1e7ed4a2c7d49dce1da043e6984cded (patch)
treea12ec0351afa12f54b418f4861ecd41a279ecbda
parentf94a64cc08b47cdbfdfea5b5756340246fc391ed (diff)
build: use AC_CONFIG_MACRO_DIR as per libtoolize warning
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--m4/.gitignore2
3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 6c97739..80a4553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = include src test
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 670700f..7669027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_INIT([libxkbcommon], [0.1.0],
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_LIBTOOL
AC_PROG_CC
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..8d0c756
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+/lt*.m4
+/libtool.m4