diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-03-13 11:29:59 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-03-13 11:30:41 -0400 |
| commit | 7a96c41aaaae23cbc6e0e335c3a1d21d63c52b1c (patch) | |
| tree | 55aa8b818e4e2296210869c67d09356d66229876 | |
| parent | c418dfff312738a883ef4907eaf2e1005a192b06 (diff) | |
| download | dconf-7a96c41aaaae23cbc6e0e335c3a1d21d63c52b1c.tar.gz | |
Stop using ACLOCAL_FLAGS
ACLOCAL_PATH has replaced this for some time now.
Bump automake dependency to 1.11.2 (this is the first automake that
knows about ACLOCAL_PATH).
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c047e01..75d3f7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ include Makefile.gtester -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - SUBDIRS = shm gvdb common engine service gdbus gsettings dbus-1 client bin docs tests po if ENABLE_EDITOR @@ -17,7 +17,7 @@ fi mkdir -p m4 aux intltoolize --force gtkdocize --docdir docs --flavour no-tmpl -aclocal${automake_suffix} ${ACLOCAL_FLAGS} +aclocal${automake_suffix} autoheader automake${automake_suffix} --add-missing autoconf diff --git a/configure.ac b/configure.ac index f30ffb4..3d02835 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([aux]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11.2 foreign -Wno-portability no-dist-gzip dist-xz]) AM_SILENT_RULES([yes]) # Set default CFLAGS before AC_PROG_CC does |