[gtksourceview] Modernize autotools configuration

[Javier Jardón <jjardon src gnome org>]

commit 57b3de501d74725f756d077e810910ca98e30492
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Feb 22 22:56:44 2010 +0100

    Modernize autotools configuration
    
    New requirements:
    autoconf >= 2.64
    automake >= 1.11.1
    libtool >= 2.2.6
    intltool >= 0.41.0
    gtk-doc >= 1.11
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=609209

 Makefile.am                                        |    2 +
 autogen.sh                                         |   11 +---
 configure.ac                                       |   59 ++++++++------------
 gtksourceview/Makefile.am                          |    2 +-
 .../completion-providers/words/Makefile.am         |    2 +-
 tests/Makefile.am                                  |   10 ++--
 6 files changed, 35 insertions(+), 51 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 048aa81..60a2544 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = gtksourceview po docs tests
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/autogen.sh b/autogen.sh
index d3ee9a9..1c1474f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,6 @@
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
-srcdir=`cd $srcdir && pwd`
 
 PKG_NAME="gtksourceview"
 
@@ -16,13 +15,9 @@ PKG_NAME="gtksourceview"
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from GNOME Git (or from"
+    echo "your OS vendor's package manager)."
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.8
-USE_GNOME2_MACROS=1 NOCONFIGURE=1 . gnome-autogen.sh
-# conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-conf_flags="--enable-maintainer-mode"
-echo $srcdir/configure $conf_flags "$@"
-$srcdir/configure $conf_flags "$@"
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 0e37a98..7aeb93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,38 +1,33 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.64)
 
 m4_define(gtksourceview_major_version, 2)
 m4_define(gtksourceview_minor_version, 9)
 m4_define(gtksourceview_micro_version, 7)
 m4_define(gtksourceview_version, gtksourceview_major_version.gtksourceview_minor_version.gtksourceview_micro_version)
 
-AC_INIT(gtksourceview, gtksourceview_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview)
+AC_INIT([gtksourceview],[gtksourceview_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview],[gtksourceview],[http://projects.gnome.org/gtksourceview/])
 
 AC_CONFIG_SRCDIR([gtksourceview/gtksourcebuffer.h])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
+AM_SILENT_RULES([yes])
 
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_ISC_POSIX
+# Check for programs
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.35.0])
 
-GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
+#Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
-# Check for headers and functions
-AC_HEADER_STDC
+# Check for header files
 AC_CHECK_HEADERS([unistd.h])
-AC_CHECK_FUNCS([memset memmove strerror])
 
 # Dependencies
 GTK_REQUIRED_VERSION=2.12.0
@@ -45,21 +40,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION)
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
-GNOME_COMPILE_WARNINGS(yes)
-
-AC_ARG_ENABLE(deprecations,
-              [AC_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
-
-if test "x$enable_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="\
--DG_DISABLE_DEPRECATED \
--DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
+# Compile warnings
+GNOME_COMPILE_WARNINGS([maximum])
+#GNOME_MAINTAINER_MODE_DEFINES
 
 PKG_CHECK_MODULES(DEP, [
 	gio-2.0
@@ -70,7 +53,7 @@ PKG_CHECK_MODULES(DEP, [
 
 dnl Check to enable completion providers
 AC_ARG_ENABLE(providers,
-	    AC_HELP_STRING([--enable-completion-providers],
+	    AS_HELP_STRING([--enable-completion-providers],
 	    		   [Enable building completion providers (words)]),,
 	    enable_providers=yes)
 
@@ -96,11 +79,15 @@ if test "$os_osx" = "yes"; then
 fi
 
 # i18N stuff
-GETTEXT_PACKAGE=gtksourceview-2.0
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+IT_PROG_INTLTOOL([0.41.0])
 
+AC_SUBST([GETTEXT_PACKAGE], [gtksourceview-2.0])
+AM_GNU_GETTEXT_VERSION([0.17])
 AM_GLIB_GNU_GETTEXT
+AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
+
+# Documentation
+GTK_DOC_CHECK([1.11],[--flavour=no-tmpl])
 
 # test-widget uses this to find lang files and gtksourcebuffer.c 	 
 ABS_TOP_SRCDIR=`cd $srcdir && pwd` 	 
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 563a8cf..f3781d5 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = 				\
 	-DDATADIR=\""$(datadir)"\" 	\
 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
 	-I$(top_srcdir) -I$(srcdir) 	\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(DISABLE_DEPRECATED)		\
 	$(WARN_CFLAGS) 			\
 	$(IGE_MAC_CFLAGS)		\
 	$(DEP_CFLAGS)
diff --git a/gtksourceview/completion-providers/words/Makefile.am b/gtksourceview/completion-providers/words/Makefile.am
index 3c9e07f..231e558 100644
--- a/gtksourceview/completion-providers/words/Makefile.am
+++ b/gtksourceview/completion-providers/words/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = 				\
 	-DDATADIR=\""$(datadir)"\" 	\
 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
 	-I$(top_srcdir) -I$(srcdir) 	\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(DISABLE_DEPRECATED)		\
 	$(WARN_CFLAGS) 			\
 	$(DEP_CFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f48eccd..440eff1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
 	-I$(top_srcdir) -I$(srcdir) 	\
 	-DTOP_SRCDIR=\""$(ABS_TOP_SRCDIR)"\"\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(DISABLE_DEPRECATED)		\
 	$(WARN_CFLAGS) 			\
 	$(DEP_CFLAGS)			\
 	$(TESTS_CFLAGS)
@@ -44,10 +44,10 @@ test_printcompositor_LDADD = 		\
 # testregion need gtk_text_region_ api which is normally private
 # modify gtksourceview/Makefile.am to export gtk_text_* symbols
 # TEST_PROGS += testregion
-testregion_SOURCES = testregion.c
-testregion_LDADD = 			\
-	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
-	$(DEP_LIBS)
+#testregion_SOURCES = testregion.c
+#testregion_LDADD = 			\
+#	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+#	$(DEP_LIBS)
 
 EXTRA_DIST =				\
 	apple-red.png			\