cleaned up, nicer output.

2002-05-28  Sven Neumann  <sven@gimp.org>

	* autogen.sh: cleaned up, nicer output.
This commit is contained in:
Sven Neumann 2002-05-27 23:13:40 +00:00 committed by Sven Neumann
parent 0c87d88df9
commit 74a5a9ec05
3 changed files with 146 additions and 112 deletions

View File

@ -1,15 +1,13 @@
Makefile.in
Makefile
configure
config.log
config.h
config.cache
stamp-h
stamp-h1
gimp.spec
config.status
libtool
aclocal.m4
autom4te.cache
configure
config.h
config.h.in
config.log
config.status
gimp.spec
gimptool-1.3
gimp-1.3.pc
gimpui-1.3.pc
@ -19,8 +17,9 @@ intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
config.h.in
libtool
stamp-h
stamp-h1
stamp-h.in
ABOUT-NLS
.xvpics
autom4te.cache

View File

@ -1,3 +1,7 @@
2002-05-28 Sven Neumann <sven@gimp.org>
* autogen.sh: cleaned up, nicer output.
2002-05-27 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig.c (gimp_config_serialize): fixed error code

View File

@ -1,125 +1,157 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
# This script does all the magic calls to automake/autoconf and
# friends that are needed to configure a cvs checkout. As described in
# the file HACKING you need a couple of extra tools to run this script
# successfully.
#
# If you are compiling from a released tarball you don't need these
# tools and you shouldn't use this script. Just call ./configure
# directly.
ORIGDIR=`pwd`
cd $srcdir
PROJECT="The GIMP"
TEST_TYPE=-d
FILE=plug-ins
DIE=0
LIBTOOL_REQUIRED_VERSION=1.3.4
AUTOCONF_REQUIRED_VERSION=2.52
AUTOMAKE_REQUIRED_VERSION=1.4
GLIB_REQUIRED_VERSION=2.0.0
INTLTOOL_REQUIRED_VERSION=0.17
(libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.4p1.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have glib-gettextize installed to compile $PROJECT."
echo "glib-gettextize is part of glib-2.0, so you should already"
echo "have it. Make sure it is in your PATH."
DIE=1
}
(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have intltoolize installed to compile $PROJECT."
echo "Get the latest version from"
echo "ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/"
DIE=1
}
if test "$DIE" -eq 1; then
exit 1
fi
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
echo
echo "I am testing that you have the required versions of libtool, autoconf,"
echo "automake, glib-gettextize and intltoolize. This test is not foolproof,"
echo "so if anything goes wrong, see the file HACKING for more information..."
echo
echo -n "Testing libtool... "
VER=`libtoolize --version | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= 1.3.4 >/dev/null; then
echo "looks OK."
DIE=0
echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
if (libtool --version) < /dev/null > /dev/null 2>&1; then
VER=`libtoolize --version \
| grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= $LIBTOOL_REQUIRED_VERSION >/dev/null; then
echo "yes (version $VER)"
else
echo "Too old (found version $VER)!"
DIE=1
fi
else
echo "too old! (Need 1.3.4, have $VER)"
echo
echo " You must have libtool installed to compile $PROJECT."
echo " Install the appropriate package for your distribution,"
echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1;
fi
echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
if (autoconf --version) < /dev/null > /dev/null 2>&1; then
VER=`autoconf --version \
| grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= $AUTOCONF_REQUIRED_VERSION >/dev/null; then
echo "yes (version $VER)"
else
echo "Too old (found version $VER)!"
DIE=1
fi
else
echo
echo " You must have autoconf installed to compile $PROJECT."
echo " Download the appropriate package for your distribution,"
echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1;
fi
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
if (automake --version) < /dev/null > /dev/null 2>&1; then
VER=`automake --version \
| grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= $AUTOMAKE_REQUIRED_VERSION >/dev/null; then
echo "yes (version $VER)"
else
echo "Too old (found version $VER)!"
DIE=1
fi
else
echo
echo " You must have automake installed to compile $PROJECT."
echo " Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.4p1.tar.gz"
echo " (or a newer version if it is available)"
DIE=1
fi
echo -n "Testing autoconf... "
VER=`autoconf --version | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= 2.52 >/dev/null; then
echo "looks OK."
echo -n "checking for glib-gettextize >= $GLIB_REQUIRED_VERSION ... "
if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then
VER=`glib-gettextize --version \
| grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
if expr $VER \>= $GLIB_REQUIRED_VERSION >/dev/null; then
echo "yes (version $VER)"
else
echo "Too old (found version $VER)!"
DIE=1
fi
else
echo "too old! (Need 2.52, have $VER)"
echo
echo " You must have glib-gettextize installed to compile $PROJECT."
echo " glib-gettextize is part of glib-2.0, so you should already"
echo " have it. Make sure it is in your PATH."
DIE=1
fi
echo -n "Testing automake... "
VER=`automake --version | grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
if expr $VER \>= 1.4 >/dev/null; then
echo "looks OK."
echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
VER=`intltoolize --version \
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
if expr $VER \>= $INTLTOOL_REQUIRED_VERSION >/dev/null; then
echo "yes (version $VER)"
else
echo "Too old (found version $VER)!"
DIE=1
fi
else
echo "too old! (Need 1.4, have $VER)"
echo
echo "You must have intltool installed to compile $PROJECT."
echo "Get the latest version from"
echo "ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/"
DIE=1
fi
echo -n "Testing glib-gettextize... "
VER=`glib-gettextize --version | grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
if expr $VER \>= 1.3.14 >/dev/null; then
echo "looks OK."
else
echo "too old! (Need 1.3.14, have $VER)"
DIE=1
fi
echo -n "Testing intltoolize... "
VER=`intltoolize --version | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
if expr $VER \>= 0.17 >/dev/null; then
echo "looks OK."
else
echo "too old! (Need 0.17, have $VER)"
DIE=1
fi
echo
if test "$DIE" -eq 1; then
echo
echo "Please install/upgrade the missing tools and call me again."
echo
exit 1
fi
test $TEST_TYPE $FILE || {
echo "You must run this script in the top-level $PROJECT directory"
echo
echo "You must run this script in the top-level $PROJECT directory."
echo
exit 1
}
if test -z "$*"; then
echo
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
echo
fi
case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
*xlc | *xlc\ * | *lcc | *lcc\ *)
am_opt=--include-deps
;;
esac
if test -z "$ACLOCAL_FLAGS"; then
@ -130,13 +162,14 @@ if test -z "$ACLOCAL_FLAGS"; then
for file in $m4list
do
if [ ! -f "$acdir/$file" ]; then
echo
echo "WARNING: aclocal's directory is $acdir, but..."
echo " no file $acdir/$file"
echo " You may see fatal macro warnings below."
echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
echo " environment variable to \"-I /some/dir\", or install"
echo " $acdir/$file."
echo ""
echo
fi
done
fi
@ -149,9 +182,7 @@ aclocal $ACLOCAL_FLAGS
automake --add-missing $am_opt
autoconf
echo "Running glib-gettextize"
glib-gettextize --copy --force
echo "Running intltoolize"
intltoolize --copy --force --automake
cd $ORIGDIR