diff options
| author | Till Kamppeter <till.kamppeter@gmail.com> | 2007-05-08 17:44:46 +0000 |
|---|---|---|
| committer | Till Kamppeter <till.kamppeter@gmail.com> | 2007-05-08 17:44:46 +0000 |
| commit | e68c99e22b84a83147fbf305aad5ee6b08e75a61 (patch) | |
| tree | 9b3796557413356ac6e9e6b34d47d503b433f0ed | |
| parent | d743295b287a082fd4d1cd55512371aa750bb4c9 (diff) | |
| download | ghostpdl-e68c99e22b84a83147fbf305aad5ee6b08e75a61.tar.gz | |
Makes ijs/ working with automake 1.10
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@7918 a1074d23-0009-0410-80fe-cf8c14f379e6
| -rwxr-xr-x | gs/ijs/autogen.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gs/ijs/autogen.sh b/gs/ijs/autogen.sh index c907178b6..4e346ebd1 100755 --- a/gs/ijs/autogen.sh +++ b/gs/ijs/autogen.sh @@ -34,6 +34,10 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" # do we need automake? (grep "^AM_INIT_AUTOMAKE" "$CONFIG_AC" >/dev/null) && { AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP` + AM_NMAJOR=`echo $AM_NEEDED |cut -d. -f1` + AM_NMINOR=`echo $AM_NEEDED |cut -d. -f2` + AM_NPATCHLEVEL=`echo $AM_NEEDED |cut -d. -f3` + AM_NVERSION=`expr $AM_NMAJOR '*' 10000 + $AM_NMINOR '*' 100 + 0$AM_NPATCHLEVEL` if test -z $AM_NEEDED; then echo -n "checking for automake... " AUTOMAKE=automake @@ -49,8 +53,11 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" echo -n "checking for automake $AM_NEEDED or later... " for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do ($am --version < /dev/null > /dev/null 2>&1) || continue - ver=`$am --version < /dev/null | head -1 | $VERSIONGREP` - if test $ver = $AM_NEEDED; then + AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1` + AM_MINOR=`echo $AM_NEEDED |cut -d. -f2` + AM_PATCHLEVEL=`echo $AM_NEEDED |cut -d. -f3` + AM_VERSION=`expr $AM_NMAJOR '*' 10000 + $AM_NMINOR '*' 100 + 0$AM_NPATCHLEVEL` + if test $AM_VERSION -ge $AM_NVERSION; then AUTOMAKE=$am echo $AUTOMAKE break @@ -60,8 +67,11 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" echo -n "checking for aclocal $AM_NEEDED or later... " for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do ($ac --version < /dev/null > /dev/null 2>&1) || continue - ver=`$ac --version < /dev/null | head -1 | $VERSIONGREP` - if test $ver = $AM_NEEDED; then + AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1` + AM_MINOR=`echo $AM_NEEDED |cut -d. -f2` + AM_PATCHLEVEL=`echo $AM_NEEDED |cut -d. -f3` + AM_VERSION=`expr $AM_NMAJOR '*' 10000 + $AM_NMINOR '*' 100 + 0$AM_NPATCHLEVEL` + if test $AM_VERSION -ge $AM_NVERSION; then ACLOCAL=$ac echo $ACLOCAL break |