[pygobject] autogen.sh: Use gnome-autogen.sh
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] autogen.sh: Use gnome-autogen.sh
- Date: Mon, 11 Feb 2013 17:09:29 +0000 (UTC)
commit 2384769810a61d6ed08d8742b7ae976ebfaa8cb5
Author: Martin Pitt <martinpitt gnome org>
Date: Mon Feb 11 18:08:37 2013 +0100
autogen.sh: Use gnome-autogen.sh
We depend on gnome-common now anyway, so use gnome-autogen.sh. This will result
in a much better error message when gnome-common is not installed, too.
https://bugzilla.gnome.org/show_bug.cgi?id=693328
autogen.sh | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 467252d..420917c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,17 +1,17 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+set -e
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
+PKG_NAME="pygobject"
-olddir=`pwd`
-cd "$srcdir"
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
- echo "*** No autoreconf found, please install it ***"
- exit 1
-fi
+(test -f $srcdir/configure.ac \
+ && test -f $srcdir/$PKG_NAME.doap) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
if type lcov >/dev/null 2>&1; then
EXTRA_ARGS="--enable-code-coverage"
@@ -19,7 +19,11 @@ else
echo "lcov not installed, not enabling code coverage"
fi
-autoreconf --force --install --verbose || exit $?
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" $EXTRA_ARGS "$@"
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common."
+ exit 1
+}
+
+gnome-autogen.sh "$EXTRA_ARGS" "$@"
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]