diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-11-04 20:23:58 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-11-04 20:23:58 +0000 |
| commit | 9b5338b67f7eedcb1ae62707960f00b3a18234b3 (patch) | |
| tree | 7a59f0d17da28a10f5312e6be5b8b9c36c0143ef | |
| parent | dd1e42cc1435aeea4fcdb3aa2aea02b1fbd0c136 (diff) | |
| download | xine-lib-9b5338b67f7eedcb1ae62707960f00b3a18234b3.tar.gz xine-lib-9b5338b67f7eedcb1ae62707960f00b3a18234b3.tar.bz2 | |
Fix wrong which checks.
CVS patchset: 3191
CVS date: 2002/11/04 20:23:58
| -rwxr-xr-x | autogen.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/autogen.sh b/autogen.sh index b20c044cd..1e6009816 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh # run this to generate all the initial makefiles, etc. -PROG=gnome-xine +PROG=xine-lib # Check how echo works in this /bin/sh case `echo -n` in @@ -70,10 +70,10 @@ run_libtoolize() { # AUTOMAKE #-------------------- detect_automake() { - if [ -f `which automake-1.6` ]; then + if [ `which automake-1.6` -a -f `which automake-1.6` ]; then automake_1_6x=yes else - if [ -f `which automake` ]; then + if [ `which automake` -a -f `which automake` ]; then AM="`automake --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`" if test $AM -lt 100 ; then AM=`expr $AM \* 10` @@ -92,14 +92,14 @@ detect_automake() { } run_automake () { - if test x"$automake_1_6x" = x"no"; then + if test x"$automake_1_6x" != x"yes"; then echo "Warning: automake < 1.6. Some warning message might occur from automake" echo fi echo $_echo_n " + Running automake: $_echo_c"; - if test x"$automake_1_6x" = "xyes"; then + if test x"$automake_1_6x" = x"yes"; then automake-1.6 --gnu --add-missing --copy; else automake --gnu --add-missing --copy; @@ -113,10 +113,10 @@ run_automake () { detect_aclocal() { # if no automake, don't bother testing for aclocal - if [ -f `which aclocal-1.6` ]; then + if [ `which aclocal-1.6` -a -f `which aclocal-1.6` ]; then aclocal_1_6x=yes else - if [ -f `which aclocal` ]; then + if [ `which aclocal` -a -f `which aclocal` ]; then AC="`aclocal --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`" if test $AC -lt 100 ; then AC=`expr $AC \* 10` |