Mercurial > gftp.yaz
changeset 545:e850102b64be
2004-9-6 Brian Masney <masneyb@gftp.org>
* autogen.sh - updated autogen.sh so that it will work with newer
versions of automake/autoconf
| author | masneyb |
|---|---|
| date | Tue, 07 Sep 2004 23:30:40 +0000 |
| parents | 79908ac335d2 |
| children | 5d13fa48c275 |
| files | ChangeLog autogen.sh |
| diffstat | 2 files changed, 24 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 07 01:01:04 2004 +0000 +++ b/ChangeLog Tue Sep 07 23:30:40 2004 +0000 @@ -1,4 +1,7 @@ 2004-9-6 Brian Masney <masneyb@gftp.org> + * autogen.sh - updated autogen.sh so that it will work with newer + versions of automake/autoconf + * src/gtk/bookmarks.c - make sure that edit_bookmarks_dialog is initialized to NULL @@ -2791,7 +2794,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.315 2004/09/07 01:01:04 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.316 2004/09/07 23:30:40 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/autogen.sh Tue Sep 07 01:01:04 2004 +0000 +++ b/autogen.sh Tue Sep 07 23:30:40 2004 +0000 @@ -1,5 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +# This was derived from Glib's autogen.sh srcdir=`dirname $0` test -z "$srcdir" && srcdir=. @@ -13,53 +14,31 @@ DIE=0 -if [ `whereis -b automake-1.4 > /dev/null 2>&1` ] ; then - AUTOMAKE=automake-1.4 - ACLOCAL=aclocal-1.4 -else - AUTOMAKE=automake - ACLOCAL=aclocal -fi +AUTOMAKE=automake +ACLOCAL=aclocal +AUTOCONF=autoconf +AUTOHEADER=autoheader -if [ `whereis -b autoconf2.13 > /dev/null 2>&1` ] ; then - AUTOCONF=autoconf2.13 - AUTOHEADER=autoheader2.13 -else - AUTOCONF=autoconf - AUTOHEADER=autoheader +autoconf_version=`$AUTOCONF --version 2>/dev/null` +if [ "x$autoconf_version" = "x" ] ; then + echo + echo "GNU autoconf must be installed to build gFTP" + echo "GNU autoconf is available from http://www.gnu.org/software/autoconf/" + DIE=1 fi -($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "libtool the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -have_automake=false -if $AUTOMAKE --version < /dev/null > /dev/null 2>&1 ; then - automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` - case $automake_version in - 1.2*|1.3*|1.4) - ;; - *) - have_automake=true - ;; - esac -fi -if $have_automake ; then : ; else - echo - echo "You must have automake 1.4-p1 installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 +automake_version=`$AUTOMAKE --version 2>/dev/null` +if [ "x$automake_version" = "x" ] ; then + echo + echo "GNU automake must be installed to build gFTP" + echo "GNU automake is available from http://www.gnu.org/software/automake/" + DIE=1 fi gettext_version=`$GETTEXTIZE --version 2>/dev/null | grep 'GNU'` if [ "x$gettext_version" = "x" ] ; then echo - echo "GNU gettext must be installed to build GLib from CVS" + echo "GNU gettext must be installed to build gFTP" echo "GNU gettext is available from http://www.gnu.org/software/gettext/" DIE=1 fi @@ -86,9 +65,9 @@ intl=`$GETTEXTIZE --help 2>/dev/null | grep -- '--intl'` if test -z "$intl"; then - GETTEXTIZE_FLAGS="-f -c" + GETTEXTIZE_FLAGS="-c" else - GETTEXTIZE_FLAGS="-f -c --intl" + GETTEXTIZE_FLAGS="-c --intl" fi echo "$GETTEXTIZE $GETTEXTIZE_FLAGS"