mirror of https://codeberg.org/cage/tinmop/
- prevented failing to find 'montage' command to exit the script;
- fixed check for 'file' command.
This commit is contained in:
parent
94e819d31f
commit
28eb0139c7
|
@ -7706,7 +7706,7 @@ if test "$DIRNAME" = "no" ; then
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for ac_prog in montage
|
for ac_prog in montage montage-im6.q16 montage-im6
|
||||||
do
|
do
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
set dummy $ac_prog; ac_word=$2
|
set dummy $ac_prog; ac_word=$2
|
||||||
|
@ -7761,10 +7761,9 @@ test -n "$MONTAGE" || MONTAGE="no"
|
||||||
if test "$MONTAGE" = "no" ; then
|
if test "$MONTAGE" = "no" ; then
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can not find imagemagick 'montage' executable." >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can not find imagemagick 'montage' executable." >&5
|
||||||
printf "%s\n" "$as_me: WARNING: Can not find imagemagick 'montage' executable." >&2;}
|
printf "%s\n" "$as_me: WARNING: Can not find imagemagick 'montage' executable." >&2;}
|
||||||
exit 1;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for ac_prog in montage
|
for ac_prog in file
|
||||||
do
|
do
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
set dummy $ac_prog; ac_word=$2
|
set dummy $ac_prog; ac_word=$2
|
||||||
|
@ -7817,8 +7816,7 @@ test -n "$FILE" || FILE="no"
|
||||||
|
|
||||||
|
|
||||||
if test "$FILE" = "no" ; then
|
if test "$FILE" = "no" ; then
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can not find 'file' executable." >&5
|
as_fn_error $? "Can not find 'file' executable." "$LINENO" 5
|
||||||
printf "%s\n" "$as_me: WARNING: Can not find 'file' executable." >&2;}
|
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -123,17 +123,16 @@ if test "$DIRNAME" = "no" ; then
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_PATH_PROGS([MONTAGE],[montage],[no])
|
AC_PATH_PROGS([MONTAGE],[montage montage-im6.q16 montage-im6],[no])
|
||||||
|
|
||||||
if test "$MONTAGE" = "no" ; then
|
if test "$MONTAGE" = "no" ; then
|
||||||
AC_MSG_WARN([Can not find imagemagick 'montage' executable.])
|
AC_MSG_WARN([Can not find imagemagick 'montage' executable.])
|
||||||
exit 1;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_PATH_PROGS([FILE],[montage],[no])
|
AC_PATH_PROGS([FILE],[file],[no])
|
||||||
|
|
||||||
if test "$FILE" = "no" ; then
|
if test "$FILE" = "no" ; then
|
||||||
AC_MSG_WARN([Can not find 'file' executable.])
|
AC_MSG_ERROR([Can not find 'file' executable.])
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue