diff options
| -rwxr-xr-x | autogen.sh | 44 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 32 insertions, 16 deletions
@@ -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="zenity" +cd $srcdir -(test -f $srcdir/configure.ac \ - && test -f $srcdir/ChangeLog \ - && test -d $srcdir/src) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level zenity directory" - exit 1 +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" + exit 1 } +# shellcheck disable=SC2016 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) -which gnome-autogen.sh || { - echo "You need to install gnome-common" - exit 1 -} -. gnome-autogen.sh +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 diff --git a/configure.ac b/configure.ac index 63ca67a3..edbb21c3 100644 --- a/configure.ac +++ b/configure.ac @@ -102,8 +102,8 @@ fi # Debug # ******************************* -GNOME_DEBUG_CHECK -GNOME_COMPILE_WARNINGS([maximum]) +AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG]) + # ******************************* # Internationalization |