[dconf] build: enable running autoreconf on tarballs



commit bd257c69988a596cb0c9f061982acadbdb49dd7f
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jan 24 12:22:29 2013 -0500

    build: enable running autoreconf on tarballs
    
    A couple of things were preventing autoreconf from working properly on
    our tarball releases.  Fix those up:
    
     - the m4/ directory (with intltool and gtk-doc m4) was not being disted
    
     - our ./autogen.sh invoked automake with --foreign, suppressing
       warnings about missing ChangeLog, etc.  Move that flag into
       configure.ac so that they are still suppressed when using autoreconf.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=663961

 Makefile.am  |    2 +-
 autogen.sh   |    2 +-
 configure.ac |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 677194f..e40b6d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS += editor
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-EXTRA_DIST = trim-lcov.py
+EXTRA_DIST = trim-lcov.py m4
 
 clean-am: lcov-clean gcno-clean
 
diff --git a/autogen.sh b/autogen.sh
index 364c213..3595fa1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ intltoolize --force
 gtkdocize --docdir docs --flavour no-tmpl
 aclocal${automake_suffix} ${ACLOCAL_FLAGS}
 autoheader
-automake${automake_suffix} --add-missing --foreign
+automake${automake_suffix} --add-missing
 autoconf
 
 CFLAGS=${CFLAGS=-ggdb}
diff --git a/configure.ac b/configure.ac
index 6ac2a34..4375b89 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 -Wno-portability no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
 # Set default CFLAGS before AC_PROG_CC does


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]