Use upstream autoreconf instead deprecated gnome-autogen

This commit is contained in:
Javier Jardón 2019-01-18 17:22:33 +00:00
parent 2535a8ab89
commit d8cb52ff21
2 changed files with 32 additions and 16 deletions

View File

@ -1,22 +1,38 @@
#!/bin/sh #!/bin/sh
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
test -n "$srcdir" || srcdir=$(dirname "$0")
test -n "$srcdir" || srcdir=.
srcdir=`dirname $0` olddir=$(pwd)
test -z "$srcdir" && srcdir=.
PKG_NAME="zenity" cd $srcdir
(test -f $srcdir/configure.ac \ (test -f configure.ac) || {
&& test -f $srcdir/ChangeLog \ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
&& test -d $srcdir/src) || { exit 1
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level zenity directory"
exit 1
} }
# shellcheck disable=SC2016
PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
which gnome-autogen.sh || { if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
echo "You need to install gnome-common" echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
exit 1 echo "*** If you wish to pass any to it, please specify them on the" >&2
} echo "*** '$0' command line." >&2
. gnome-autogen.sh 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

View File

@ -102,8 +102,8 @@ fi
# Debug # Debug
# ******************************* # *******************************
GNOME_DEBUG_CHECK AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
GNOME_COMPILE_WARNINGS([maximum])
# ******************************* # *******************************
# Internationalization # Internationalization