[libgsf] autogen: avoid gnome-common dependency

[Morten Welinder <mortenw src gnome org>]

commit f44424723b9b2d6f6ae754281ef2211eee87326e
Author: Morten Welinder <terra gnome org>
Date:   Thu Aug 4 20:20:46 2016 -0400

    autogen: avoid gnome-common dependency

 .gitignore     |    1 +
 Makefile.am    |    4 +-
 autogen.sh     |   49 ++++++++++++++++++--------------------------
 configure.ac   |   13 +++++------
 m4/.gitignore  |    7 ------
 m4/Makefile.am |    5 ----
 m4/python.m4   |   62 --------------------------------------------------------
 7 files changed, 29 insertions(+), 112 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfee658..2d698eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ Makefile
 gtk-doc.make
 aclocal.m4
 autom4te.cache
+m4
 configure
 config.guess
 config.sub
diff --git a/Makefile.am b/Makefile.am
index 992f4bc..432f8d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgsf-1.pc
@@ -7,7 +7,7 @@ if WITH_WIN32
   pkgconfig_DATA += libgsf-win32-1.pc
 endif
 
-SUBDIRS = po gsf gsf-win32 doc tools tests m4 thumbnailer python
+SUBDIRS = po gsf gsf-win32 doc tools tests thumbnailer python
 
 EXTRA_DIST = BUGS HACKING      \
        intltool-extract.in     \
diff --git a/autogen.sh b/autogen.sh
index debaf09..283865a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,12 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-PKG_NAME="libgsf"
+PKG_NAME="Libgsf"
 
-REQUIRED_AUTOMAKE_VERSION=1.8
-# We require Automake 1.7.1, which requires Autoconf 2.54.
-REQUIRED_AUTOCONF_VERSION=2.54
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-USE_GNOME2_MACROS=1
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-abs_srcdir=`cd $srcdir && pwd`
-ACLOCAL_FLAGS="-I $abs_srcdir/m4 $ACLOCAL_FLAGS"
+olddir=$(pwd)
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/gsf \
@@ -23,22 +16,20 @@ ACLOCAL_FLAGS="-I $abs_srcdir/m4 $ACLOCAL_FLAGS"
     exit 1
 }
 
-ifs_save="$IFS"; IFS=":"
-for dir in $PATH ; do
-  IFS="$ifs_save"
-  test -z "$dir" && dir=.
-  if test -f "$dir/gnome-autogen.sh" ; then
-    gnome_autogen="$dir/gnome-autogen.sh"
-    gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
-    break
-  fi
-done
-
-if test -z "$gnome_autogen" ; then
-  echo "You need to install the gnome-common module and make"
-  echo "sure the gnome-autogen.sh script is in your \$PATH."
-  exit 1
+cd $srcdir
+aclocal --install || exit 1
+glib-gettextize --force --copy || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+cd $olddir
+
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
 fi
-
-GNOME_DATADIR="$gnome_datadir"
-. $gnome_autogen
diff --git a/configure.ac b/configure.ac
index fe925da..ff92c43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 -*- mode: m4 -*-
 dnl We require Automake 1.7.1, which requires Autoconf 2.54.
 AC_PREREQ(2.54)
+AC_CONFIG_MACRO_DIR([m4])
+AX_IS_RELEASE([git-directory])
 
 m4_define([libgsf_version_major], [1])
 m4_define([libgsf_version_minor], [14])
@@ -12,7 +14,6 @@ m4_define([libgsf_full_version],
 AC_INIT(libgsf, [libgsf_full_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf])
 AC_CONFIG_SRCDIR(gsf/gsf.h)
-AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
 
 AC_SUBST(LIBGSF_MAJOR_VERSION, libgsf_version_major)
@@ -181,9 +182,6 @@ AC_ARG_WITH([typelib-dir],
 AC_SUBST(TYPELIBDIR)
 
 ## this should come after `AC_PROG_CC'
-ifdef([GNOME_COMPILE_WARNINGS],[GNOME_COMPILE_WARNINGS],)
-CFLAGS="$CFLAGS $WARN_CFLAGS -DG_DISABLE_DEPRECATED"
-
 set_more_warnings=yes
 if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
        dnl Clang needs to option, or else it will appear to support any
@@ -199,7 +197,8 @@ if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
        AC_MSG_RESULT($has_unknown_warning_option)
        CFLAGS="$SAVE_CFLAGS"
 
-       warning_options="-Wsign-compare -Wpointer-arith \
+       warning_options="-Wall -Werror=init-self -Werror=missing-include-dirs \
+                        -Wsign-compare -Werror=pointer-arith \
                         -Wchar-subscripts -Wwrite-strings \
                         -Wdeclaration-after-statement -Wnested-externs \
                         -Wmissing-noreturn \
@@ -209,7 +208,7 @@ if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
                         -Werror=format-security -Wbitwise -Wcast-to-as \
                         -Wdefault-bitfield-sign -Wdo-while -Wparen-string \
                         -Wptr-subtraction-blows -Wreturn-void -Wtypesign \
-                        -Wstrict-prototypes"
+                        -Wstrict-prototypes -Wno-error=format-nonliteral "
        for option in $warning_options ; do
                SAVE_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $uwoption $option"
@@ -359,6 +358,7 @@ gtk_doc_installed=true
 #ifdef([GTK_DOC_CHECK],[GTK_DOC_CHECK([1.12])],[gtk_doc_installed=false])
 # I would have liked to conditionalize this, but 
 # that appears to break other things http://bugzilla.gnome.org/show_bug.cgi?id=156399
+dnl AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
 GTK_DOC_CHECK([1.12])
 AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
 
@@ -487,7 +487,6 @@ LDFLAGS="-no-undefined $LDFLAGS"
 
 AC_CONFIG_FILES([
 Makefile
-m4/Makefile
 doc/Makefile
 gsf/Makefile
 gsf-win32/Makefile