diff options
author | Javier Jardón <jjardon@gnome.org> | 2018-08-13 17:38:39 +0100 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2018-08-13 17:38:39 +0100 |
commit | cec35583122d2f4ee1b0e6a773ac7319eb454f6e (patch) | |
tree | e8e5fd268a356fe9b877d7edf6f5c750f0bdd1f9 | |
parent | 2f1a32f8180319feecdff521ddba17bca0ebc0ed (diff) | |
download | adwaita-icon-theme-cec35583122d2f4ee1b0e6a773ac7319eb454f6e.tar.gz |
autogen.sh: Use upstream autorecong instead deprecated gnome-autogen.shjjardon/autoreconf
See https://wiki.gnome.org/Projects/GnomeCommon/Migration
-rwxr-xr-x | autogen.sh | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/autogen.sh b/autogen.sh index 700e784a7..d9d12ecf9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,22 +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="adwaita-icon-theme" -REQUIRED_AUTOMAKE_VERSION=1.9 +cd $srcdir -(test -f $srcdir/configure.ac \ - && test -f $srcdir/index.theme.in \ - && test -d $srcdir/src) || { - 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 GNOME git" - exit 1 -} -USE_GNOME2_MACROS=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 + +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 |