[gthumb] removed deprecated gnome-common macros

[Paolo Bacchilega <paobac src gnome org>]

commit 14d3e7d9f8dfd3a42e9cfc34fcfef70ce4b33555
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Aug 17 16:49:06 2016 +0200

    removed deprecated gnome-common macros
    
    [bug #768528]

 autogen.sh                    |   22 ++++++++--------------
 configure.ac                  |    6 ++----
 extensions/example/autogen.sh |   21 ++++++++-------------
 3 files changed, 18 insertions(+), 31 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6c030c1..f62c5c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,15 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
 srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-REQUIRED_AUTOMAKE_VERSION=1.8
+[ -z "$srcdir" ] && srcdir=.
 
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/gthumb) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
+if [ ! -f "$srcdir/configure.ac" ]; then
+ echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
+ exit 1
+fi
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME git"
-    exit 1
+       echo "You need to install gnome-common from GNOME Git"
+       exit 1
 }
 
-. gnome-autogen.sh
+. gnome-autogen.sh "$@"
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 177a86b..d40013b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,10 @@ AC_INIT([gthumb], [gthumb_version],
         [gthumb])
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
 
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([configure.ac])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
 
 GTHUMB_API_VERSION=gthumb_api_version
 AC_SUBST([GTHUMB_API_VERSION])
@@ -49,11 +50,8 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, glib-mkenums)
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, glib-compile-resources)
 
-GNOME_COMMON_INIT
 YELP_HELP_INIT
 GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_CXX_WARNINGS
 GLIB_GSETTINGS
 GTHUMB_EXTENSION_RULES
 
diff --git a/extensions/example/autogen.sh b/extensions/example/autogen.sh
index a6293f0..e830322 100755
--- a/extensions/example/autogen.sh
+++ b/extensions/example/autogen.sh
@@ -1,22 +1,17 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
 srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+[ -z "$srcdir" ] && srcdir=.
 
 PKG_NAME="gthumb-example"
-REQUIRED_AUTOMAKE_VERSION=1.8
 
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/src) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
+if [ ! -f "$srcdir/configure.ac" ]; then
+ echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
+ exit 1
+fi
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME git"
-    exit 1
+       echo "You need to install gnome-common from GNOME Git"
+       exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+. gnome-autogen.sh "$@"