IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in: add AC_PREREQ(2.53) to require 2.53 :)

Browse Source 
* macros/autogen.sh: add more searches for a good version of
	  the autotools.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8281 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2003-05-09 00:29:11 +00:00
parent fe083155f1
commit b9546bb9cc
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2003-05-08 Derek Atkins <derek@ihtfp.com>
* configure.in: add AC_PREREQ(2.53) to require 2.53 :)
* macros/autogen.sh: add more searches for a good version of
the autotools.
2003-05-07 Derek Atkins <derek@ihtfp.com> 2003-05-07 Derek Atkins <derek@ihtfp.com>
* macros/autogen.sh: require autoconf >= 2.53 and automake >= 1.5 * macros/autogen.sh: require autoconf >= 2.53 and automake >= 1.5

1
configure.in
View File

@@ -27,6 +27,7 @@ dnl Process this file with autoconf to produce a configure script.
### commands depend on them): ### commands depend on them):
AC_INIT(src/engine/Transaction.h) AC_INIT(src/engine/Transaction.h)
AC_PREREQ(2.53)
AC_PROG_CC AC_PROG_CC

27
macros/autogen.sh
View File

@@ -21,7 +21,7 @@ test_version()
this_prog="$1" this_prog="$1"
want_vers="$2" want_vers="$2"
testv=`"$this_prog" --version | head -1 | awk '{print $NF}'` testv=`"$this_prog" --version 2>/dev/null | head -1 | awk '{print $NF}'`
if test -z "$testv" ; then return 1 ; fi if test -z "$testv" ; then return 1 ; fi
testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'` testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
@@ -47,7 +47,7 @@ test_version()
fi fi
} }
# usage: find_program preset program version # usage: find_program preset program version "<other versions>"
# sets "program" to the name of the program to use. # sets "program" to the name of the program to use.
# if preset is set, then use that regardless, # if preset is set, then use that regardless,
# otherwise check if "program" is of a good enough version and use that, # otherwise check if "program" is of a good enough version and use that,
@@ -58,6 +58,7 @@ find_program()
find="$1" find="$1"
prog="$2" prog="$2"
vers="$3" vers="$3"
extravers="$4"
if test -n "$find" ; then if test -n "$find" ; then
test_version "$find" "$vers" test_version "$find" "$vers"
@@ -76,12 +77,14 @@ find_program()
return 0 return 0
fi fi
test_version "$prog-$vers" "$vers" for test_vers in $vers $extravers ; do
status=$? test_version "$prog-$test_vers" "$vers"
if test "$status" = 0 ; then status=$?
program="$prog-$vers" if test "$status" = 0 ; then
return 0 program="$prog-$test_vers"
fi return 0
fi
done
fi fi
echo echo
@@ -92,13 +95,13 @@ find_program()
return 1 return 1
} }
find_program "$AUTOCONF" autoconf 2.53 find_program "$AUTOCONF" autoconf 2.53 "2.5 2.5x"
[ "$?" = 0 ] && AUTOCONF="$program" [ "$?" = 0 ] && AUTOCONF="$program"
find_program "$AUTOHEADER" autoheader 2.53 find_program "$AUTOHEADER" autoheader 2.53 "2.5 2.5x"
[ "$?" = 0 ] && AUTOHEADER="$program" [ "$?" = 0 ] && AUTOHEADER="$program"
find_program "$AUTOMAKE" automake 1.5 find_program "$AUTOMAKE" automake 1.5 "1.6 1.7"
[ "$?" = 0 ] && AUTOMAKE="$program" [ "$?" = 0 ] && AUTOMAKE="$program"
find_program "$ACLOCAL" aclocal 1.5 find_program "$ACLOCAL" aclocal 1.5 "1.6 1.7"
[ "$?" = 0 ] && ACLOCAL="$program" [ "$?" = 0 ] && ACLOCAL="$program"