[tali] Stop using deprecated gnome-common



commit 64bdfd3c23df0e356c6e290de211595e15282190
Author: Sahil Sareen <sahil sareen hotmail com>
Date:   Sat Dec 19 21:35:14 2015 +0530

    Stop using deprecated gnome-common
    
      - Update Makefile, autogen and configure

 Makefile.am  |    3 +++
 autogen.sh   |   40 +++++++++++++++++++++++++++++++---------
 configure.ac |    3 ++-
 3 files changed, 36 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cadee0c..17d24be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,7 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN)
 
+# We currently have no custom macros
+GITIGNOREFILES = m4
+
 -include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index 6e8332a..0f80d5d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,37 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME git (or from"
-    echo "your OS vendor's package manager)."
-    exit 1
+olddir=`pwd`
+
+cd $srcdir
+
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***"
+        exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 
-REQUIRED_YELP_TOOLS_VERSION=3.1.1
-REQUIRED_GETTEXT_VERSION=0.12
-REQUIRED_INTLTOOL_VERSION=0.40.4
+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 -Wno-portability || exit 1
+
+cd $olddir
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
 
-. gnome-autogen.sh
+        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 e0f0427..5a5ec06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 AC_PREREQ([2.63])
 AC_INIT([Tali], [3.18.0], [https://bugzilla.gnome.org/],
         [tali], [https://wiki.gnome.org/Apps/Tali])
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
-GNOME_MAINTAINER_MODE_DEFINES
 AC_CONFIG_HEADERS([config.h])
 
 AM_PROG_CC_C_O


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]