diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-04-16 01:35:08 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-04-16 01:35:08 +0000 |
| commit | 31aae0f2e0d2b3f14280ac9bb4cd4214f9af1466 (patch) | |
| tree | b6e8ba5f318f17bec4f6730bfcf1f7f3f4864a98 | |
| parent | ac1cd42b9a4681cc22e1ba5bd3c249aeeb146ad1 (diff) | |
| download | xine-lib-31aae0f2e0d2b3f14280ac9bb4cd4214f9af1466.tar.gz xine-lib-31aae0f2e0d2b3f14280ac9bb4cd4214f9af1466.tar.bz2 | |
Check automake and not autoconf version form as.m4 inclusion.
CVS patchset: 1725
CVS date: 2002/04/16 01:35:08
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rwxr-xr-x | cvscompile.sh | 17 |
2 files changed, 11 insertions, 8 deletions
@@ -119,7 +119,7 @@ Contributions IRIX port Jérôme Villette <villette@chem.leidenuniv.nl> - 'xinetic', 'CelomaGold' and 'CelomaMdk' skins. + 'xinetic', 'CelomaGold', 'CelomaMdk' and 'CelomaChrome' skins. Bill Fink <billfink@mindspring.com> powerpc patches, oss output softsync diff --git a/cvscompile.sh b/cvscompile.sh index e4159a9d3..ae6df4f4c 100755 --- a/cvscompile.sh +++ b/cvscompile.sh @@ -1,11 +1,14 @@ #!/bin/sh # Run this to generate all the initial Makefiles, etc. -## extract autoconf version -autoconf_2_5x=no -AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)]//g'`" -if [ `expr $AC` -ge 250 ]; then - autoconf_2_5x=yes +## extract automake version +automake_1_5x=no +AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)]//g'`" +if test $AM -lt 100 ; then + AM=`expr $AM \* 10` +fi +if [ `expr $AM` -ge 150 ]; then + automake_1_5x=yes fi rm -f config.cache @@ -19,8 +22,8 @@ if test -d $srcdir/m4; then for m4f in $m4_files; do cat $srcdir/m4/$m4f >> acinclude.m4 done - ## autoconf 2.5x implement AM_PROG_AS, not older ones, so add it. - if test x"$autoconf_2_5x" = x"no"; then + ## automake 1.5x implement AM_PROG_AS, not older ones, so add it. + if test x"$automake_1_5x" = x"no"; then cat $srcdir/m4/as.m4 >> acinclude.m4 fi else |