[gnome-tweak-tool] Fix autogen and configure with latest gnome-common



commit 969a354e443ae2a0a3c4b420d086225e39769892
Author: Seán de Búrca <leftmostcat gmail com>
Date:   Fri Aug 30 14:38:08 2013 -0600

    Fix autogen and configure with latest gnome-common
    
    Side-by-side use of AM_GNU_GETTEXT and IT_PROG_INTLTOOL is not
    supported. Additionally, it is necessary to specify an explicit macro
    directory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707154

 Makefile.am  |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d7446bc..6e0f731 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,4 @@ DISTCLEANFILES = \
 
 SUBDIRS = data po
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 061354c..b98410d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@ AC_INIT([gnome-tweak-tool], [3.9.91], [john stowers gmail com])
 
 AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz no-dist-gzip])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_PATH_PYTHON([2.6])
 GLIB_GSETTINGS
 
@@ -14,8 +16,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQUIRED_VERSION])
 PKG_CHECK_MODULES([PYGOBJECT3], [pygobject-3.0 >= $PYGOBJECT_REQUIRED_VERSION])
 
 IT_PROG_INTLTOOL([0.40.0])
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
 GETTEXT_PACKAGE=gnome-tweak-tool
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])


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