[atomix] Port from gnome-common

[Robert Roth <robertroth src gnome org>]

commit b16edeb246f1a88933b8e4a1cf52c95564261c5d
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Sat Aug 20 11:00:39 2016 +0300

    Port from gnome-common
    
    gnome-common has been deprecated for a while now, but some macros are
    still being used. This commit replaces them with ones from upstream
    autoconf-archive.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769978

 .gitignore      |    1 +
 autogen.sh      |   44 +++++++++++++++++++++++++++++++-------------
 configure.ac    |    8 ++++++--
 src/Makefile.am |   12 +++++++++---
 4 files changed, 47 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22657bc..dbd65dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ aclocal.m4
 data/atomix.desktop
 data/atomix.appdata.xml
 data/atomix.appdata.valid
+ar-lib
 autom4te.cache/
 config.guess
 config.h
diff --git a/autogen.sh b/autogen.sh
index 6d62767..fa7f5a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,20 +1,38 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/ChangeLog \
-  && test -f $srcdir/src/level.h) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level Atomix directory"
-    exit 1
-}
+cd $srcdir
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common package"
-    exit 1
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+        exit 1
 }
 
-. gnome-autogen.sh
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; 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" >&2
+        echo "*** '$0' command line." >&2
+        echo "" >&2
+fi
+
+aclocal --install || 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
diff --git a/configure.ac b/configure.ac
index 0900653..d98d0b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@ AC_PREREQ([2.63])
 
 AC_INIT([atomix],[3.21.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
 
+AX_IS_RELEASE([minor-version])
+
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -14,10 +16,12 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_PROG_CC
 AC_PROG_RANLIB
 
+AM_PROG_AR
+
+AX_REQUIRE_DEFINED([APPSTREAM_XML])
 APPSTREAM_XML
 
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+AX_COMPILER_FLAGS
 
 dnl ================= Requirements =======================
 LIBGTK_REQUIRED=3.10.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e40ef8..9389e69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,14 +2,20 @@
 scoredir = $(localstatedir)/games
 uidir = $(datadir)/gnome-2.0/ui
 
-INCLUDES = -I$(top_srcdir) \
-       $(ATOMIX_CFLAGS) \
-       $(WARN_CFLAGS) \
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
        -DPKGDATADIR="\"$(pkgdatadir)\"" \
        -DDATADIR=\""$(datadir)"\" \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
        -DSCORESDIR=\""$(scoredir)"\"
 
+AM_CFLAGS = \
+       $(ATOMIX_CFLAGS) \
+       $(WARN_CFLAGS)
+
+AM_LDFLAGS = \
+       $(WARN_LDFLAGS)
+
 bin_PROGRAMS = atomix
 
 noinst_PROGRAMS = pf-test