[gnome-online-miners] Use autoreconf instead deprecated gnome-common
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-miners] Use autoreconf instead deprecated gnome-common
- Date: Sat, 16 Mar 2019 05:13:03 +0000 (UTC)
commit 8f891d93ba6e32fd771cb1184ae2ddb4341b8e8f
Author: Javier Jardón <jjardon gnome org>
Date: Fri Mar 15 22:11:40 2019 -0700
Use autoreconf instead deprecated gnome-common
autogen.sh | 45 +++++++++++++++++++++++++++++----------------
configure.ac | 4 +---
2 files changed, 30 insertions(+), 19 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6febb88..d9d12ec 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,25 +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)
-PKG_NAME="gnome-online-miners"
+cd $srcdir
-(test -f $srcdir/src/gom-miner-main.c) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
+(test -f configure.ac) || {
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+ exit 1
}
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME git"
- exit 1
-}
+# 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
+
+autoreconf --verbose --force --install || exit 1
-git submodule update --init --recursive
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
-REQUIRED_AUTOCONF_VERSION=2.63
-REQUIRED_AUTOMAKE_VERSION=1.11
-REQUIRED_PKG_CONFIG_VERSION=0.22
-. 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 807b989..1e1f896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,7 @@ GOA_MIN_VERSION=3.13.3
GRILO_MIN_VERSION=0.3.0
ZAPOJIT_MIN_VERSION=0.0.2
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_DEBUG_CHECK
-GNOME_MAINTAINER_MODE_DEFINES
+AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
LT_INIT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]