configure (abiword-docs-3.0.1) | : | configure (abiword-docs-3.0.2) | ||
---|---|---|---|---|
skipping to change at line 1721 | skipping to change at line 1721 | |||
## -------------------- ## | ## -------------------- ## | |||
## Main body of script. ## | ## Main body of script. ## | |||
## -------------------- ## | ## -------------------- ## | |||
ac_ext=c | ac_ext=c | |||
ac_cpp='$CPP $CPPFLAGS' | ac_cpp='$CPP $CPPFLAGS' | |||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5' | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ LIBS >&5' | |||
ac_compiler_gnu=$ac_cv_c_compiler_gnu | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
am__api_version='1.14' | am__api_version='1.15' | |||
ac_aux_dir= | ac_aux_dir= | |||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | |||
if test -f "$ac_dir/install-sh"; then | if test -f "$ac_dir/install-sh"; then | |||
ac_aux_dir=$ac_dir | ac_aux_dir=$ac_dir | |||
ac_install_sh="$ac_aux_dir/install-sh -c" | ac_install_sh="$ac_aux_dir/install-sh -c" | |||
break | break | |||
elif test -f "$ac_dir/install.sh"; then | elif test -f "$ac_dir/install.sh"; then | |||
ac_aux_dir=$ac_dir | ac_aux_dir=$ac_dir | |||
ac_install_sh="$ac_aux_dir/install.sh -c" | ac_install_sh="$ac_aux_dir/install.sh -c" | |||
skipping to change at line 1921 | skipping to change at line 1921 | |||
test "$program_prefix" != NONE && | test "$program_prefix" != NONE && | |||
program_transform_name="s&^&$program_prefix&;$program_transform_name" | program_transform_name="s&^&$program_prefix&;$program_transform_name" | |||
# Use a double $ so make ignores it. | # Use a double $ so make ignores it. | |||
test "$program_suffix" != NONE && | test "$program_suffix" != NONE && | |||
program_transform_name="s&\$&$program_suffix&;$program_transform_name" | program_transform_name="s&\$&$program_suffix&;$program_transform_name" | |||
# Double any \ or $. | # Double any \ or $. | |||
# By default was `s,x,x', remove it if useless. | # By default was `s,x,x', remove it if useless. | |||
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' | |||
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` | |||
# expand $ac_aux_dir to an absolute path | # Expand $ac_aux_dir to an absolute path. | |||
am_aux_dir=`cd $ac_aux_dir && pwd` | am_aux_dir=`cd "$ac_aux_dir" && pwd` | |||
if test x"${MISSING+set}" != xset; then | if test x"${MISSING+set}" != xset; then | |||
case $am_aux_dir in | case $am_aux_dir in | |||
*\ * | *\ *) | *\ * | *\ *) | |||
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | |||
*) | *) | |||
MISSING="\${SHELL} $am_aux_dir/missing" ;; | MISSING="\${SHELL} $am_aux_dir/missing" ;; | |||
esac | esac | |||
fi | fi | |||
# Use eval to expand $SHELL | # Use eval to expand $SHELL | |||
if eval "$MISSING --is-lightweight"; then | if eval "$MISSING --is-lightweight"; then | |||
am_missing_run="$MISSING " | am_missing_run="$MISSING " | |||
else | else | |||
am_missing_run= | am_missing_run= | |||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | |||
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | |||
fi | fi | |||
if test x"${install_sh}" != xset; then | if test x"${install_sh+set}" != xset; then | |||
case $am_aux_dir in | case $am_aux_dir in | |||
*\ * | *\ *) | *\ * | *\ *) | |||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | |||
*) | *) | |||
install_sh="\${SHELL} $am_aux_dir/install-sh" | install_sh="\${SHELL} $am_aux_dir/install-sh" | |||
esac | esac | |||
fi | fi | |||
# Installed binaries are usually stripped using 'strip' when the user | # Installed binaries are usually stripped using 'strip' when the user | |||
# run "make install-strip". However 'strip' might not be the right | # run "make install-strip". However 'strip' might not be the right | |||
skipping to change at line 2260 | skipping to change at line 2260 | |||
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} | |||
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | |||
# For better backward compatibility. To be removed once Automake 1.9.x | # For better backward compatibility. To be removed once Automake 1.9.x | |||
# dies out for good. For more background, see: | # dies out for good. For more background, see: | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> | |||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> | |||
mkdir_p='$(MKDIR_P)' | mkdir_p='$(MKDIR_P)' | |||
# We need awk for the "check" target. The system "awk" is bad on | # We need awk for the "check" target (and possibly the TAP driver). The | |||
# some platforms. | # system "awk" is bad on some platforms. | |||
# Always define AMTAR for backward compatibility. Yes, it's still used | # Always define AMTAR for backward compatibility. Yes, it's still used | |||
# in the wild :-( We should find a proper way to deprecate it ... | # in the wild :-( We should find a proper way to deprecate it ... | |||
AMTAR='$${TAR-tar}' | AMTAR='$${TAR-tar}' | |||
# We'll loop over all known methods to create a tar archive until one works. | # We'll loop over all known methods to create a tar archive until one works. | |||
_am_tools='gnutar pax cpio none' | _am_tools='gnutar pax cpio none' | |||
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | |||
# POSIX will say in a future version that running "rm -f" with no argument | # POSIX will say in a future version that running "rm -f" with no argument | |||
End of changes. 4 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added |