[gnome-applets] build: don't use gnome-autogen.sh

[Alberts Muktupāvels <muktupavels src gnome org>]

commit db68544683393123258145b75c8193d78c463f8c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 27 20:18:06 2015 +0300

    build: don't use gnome-autogen.sh
    
    https://wiki.gnome.org/Projects/GnomeCommon/Migration

 Makefile.am  |   45 ++++++++++++++++++---------------------------
 autogen.sh   |   47 +++++++++++++++++++++++++++++++++--------------
 configure.ac |    7 +------
 3 files changed, 52 insertions(+), 47 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index db263a6..d0af8ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+NULL =
 
 gtop_applets = multiload netspeed
 if BUILD_GTOP_APPLETS
@@ -48,7 +49,8 @@ always_built_SUBDIRS =  \
        geyes           \
        stickynotes     \
        trashapplet \
-       windowpicker
+       windowpicker \
+       $(NULL)
 
 SUBDIRS = \
        po                      \
@@ -62,7 +64,8 @@ SUBDIRS = \
        $(invest_applet_SUBDIR) \
        $(cpufreq_SUBDIR) \
        $(minicommander_applet_SUBDIR) \
-       $(tracker_search_bar_SUBDIR)
+       $(tracker_search_bar_SUBDIR) \
+       $(NULL)
 
 DIST_SUBDIRS = \
        po              \
@@ -84,41 +87,29 @@ DIST_SUBDIRS = \
        windowpicker    \
        inhibit         \
        brightness      \
-       tracker-search-bar
+       tracker-search-bar \
+       $(NULL)
 
 EXTRA_DIST = \
        MAINTAINERS                     \
-       COPYING-DOCS
+       COPYING-DOCS \
+       $(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS =    \
-       --with-libpanel-applet-dir='$${datadir}/gnome-panel/distcheck/applets'
+       --with-libpanel-applet-dir='$${datadir}/gnome-panel/distcheck/applets' \
        --enable-mini-commander
 
-ACLOCAL_AMFLAGS = -I m4
-
 MAINTAINERCLEANFILES = \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ \
+       `find "m4" -type f -name "*.m4" -print` \
        $(srcdir)/INSTALL \
-       $(srcdir)/aclocal.m4 \
-       $(srcdir)/compile \
-       $(srcdir)/config.guess \
-       $(srcdir)/config.h.in \
+       $(srcdir)/build-aux/py-compile \
        $(srcdir)/config.h.in~ \
-       $(srcdir)/config.sub \
-       $(srcdir)/depcomp \
-       $(srcdir)/install-sh \
-       $(srcdir)/ltmain.sh \
-       $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs \
-       `find "$(srcdir)" -type f -name Makefile.in -print` \
        $(srcdir)/configure \
-       $(srcdir)/gtk-doc.make \
-       $(srcdir)/m4/gtk-doc.m4 \
-       $(srcdir)/m4/intltool.m4 \
-       $(srcdir)/m4/libtool.m4 \
-       $(srcdir)/m4/ltoptions.m4 \
-       $(srcdir)/m4/ltsugar.m4 \
-       $(srcdir)/m4/ltversion.m4 \
-       $(srcdir)/m4/lt~obsolete.m4 \
-       $(srcdir)/py-compile
+       $(NULL)
+
+GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz}
 
 -include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index f705671..6959909 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,22 +1,41 @@
 #!/bin/sh
+#
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
+srcdir=$(dirname "$0")
 test -z "$srcdir" && srcdir=.
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/gnome-applets.doap) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gnome-applets directory"
-    exit 1
-}
+if [ ! -f $srcdir/configure.ac ]; then
+  echo "**Error**: Directory "\'$srcdir\'" does not look like the top-level" \
+       "project directory."
+  exit 1
+fi
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common."
-    exit 1
-}
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac")
 
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_YELP_TOOLS_VERSION=3.1.1
+if [ "$#" = 0 ] && [ -z "$NOCONFIGURE" ]; then
+  echo "**Warning**: I am going to run 'configure' with no arguments." >&2
+  echo "If you wish to pass any to it, please specify them on the '$0'" \
+       "command line." >&2
+fi
 
-. gnome-autogen.sh
+set -x
+aclocal --install || exit 1
+glib-gettextize --force --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install -Wno-portability || exit 1
+{ set +x; } 2>/dev/null
+
+if [ -z "$NOCONFIGURE" ]; then
+  set -x
+  $srcdir/configure "$@" || exit 1
+  { set +x; } 2>/dev/null
+
+  if [ "$1" = "--help" ]; then
+    exit 0
+  else
+    echo "Now type 'make' to compile $PKG_NAME." || exit 1
+  fi
+else
+  echo "Skipping configure process."
+fi
diff --git a/configure.ac b/configure.ac
index a2346db..0c9c767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ dnl **************************************************************************
 AC_INIT([gnome-applets], [ga_version], [ga_bugzilla_url])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 
 dnl **************************************************************************
 dnl Set release policy
@@ -599,12 +600,6 @@ if test "$gtk_ok" = "yes"; then
 fi
 
 dnl ***************************************************************************
-dnl *** Honour aclocal flags                                                ***
-dnl ***************************************************************************
-ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-AC_SUBST(ACLOCAL_AMFLAGS)
-
-dnl ***************************************************************************
 dnl *** Set install directories                                             ***
 dnl ***************************************************************************
 AC_ARG_WITH([pythondir],