From 674dabc4993872675489f70d5051338fa5e6359b Mon Sep 17 00:00:00 2001 From: Sorokin Alexei Date: Thu, 11 Feb 2016 17:41:47 +0300 Subject: [PATCH] Stop using mate-autogen in autogen.sh Was initially added to supress warnings no longer there. --- autogen.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/autogen.sh b/autogen.sh index 78f06d1..bc121b4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,24 +1,24 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +srcdir=$(dirname "$0") +[ -z "$srcdir" ] && srcdir="." +cd "$srcdir" PKG_NAME="libcompizconfig" -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" +if [ ! -f "$srcdir/configure.ac" ]; then + echo -n "**Error**: Directory "\`"$srcdir"\'" does not look like the" echo " top-level $PKG_NAME directory" exit 1 -} +fi -which mate-autogen || { - echo "You need to install mate-common from the MATE Git" - exit 1 -} - -REQUIRED_AUTOMAKE_VERSION=1.9 -USE_MATE2_MACROS=1 - -. mate-autogen +aclocal --install || exit 1 +glib-gettextize --copy --force || exit 1 +intltoolize --copy --force --automake || exit 1 +autoreconf --verbose --force --install || exit 1 +cd "$OLDPWD" || exit $? +if [ -z "$NOCONFIGURE" ]; then + "$srcdir/configure" "$@" || exit 1 +fi