|
|
@ -2801,8 +2801,8 @@ 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 |
|
|
|
|
|
|
|
|
|
|
|
# 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` |
|
|
|
|
|
|
|
|
|
|
|
ac_ext=c |
|
|
|
ac_ext=c |
|
|
|
ac_cpp='$CPP $CPPFLAGS' |
|
|
|
ac_cpp='$CPP $CPPFLAGS' |
|
|
@ -3266,7 +3266,7 @@ IFS=$ac_save_IFS |
|
|
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
|
|
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
am__api_version='1.14' |
|
|
|
am__api_version='1.15' |
|
|
|
|
|
|
|
|
|
|
|
# Find a good install program. We prefer a C program (faster), |
|
|
|
# Find a good install program. We prefer a C program (faster), |
|
|
|
# so one script is as good as another. But avoid the broken or |
|
|
|
# so one script is as good as another. But avoid the broken or |
|
|
@ -3455,7 +3455,7 @@ else |
|
|
|
$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'" ;; |
|
|
@ -3846,8 +3846,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
|
|
|
# <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}' |
|
|
@ -4163,6 +4163,7 @@ fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Define --wth-* and --enable-* arguments |
|
|
|
# Define --wth-* and --enable-* arguments |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -5403,12 +5404,12 @@ if test -n "$libtorrent_CFLAGS"; then |
|
|
|
pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS" |
|
|
|
pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS" |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.0\""; } >&5 |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.0") 2>&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5 |
|
|
|
ac_status=$? |
|
|
|
ac_status=$? |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
test $ac_status = 0; }; then |
|
|
|
test $ac_status = 0; }; then |
|
|
|
pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.0.0" 2>/dev/null` |
|
|
|
pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.0.6" 2>/dev/null` |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
else |
|
|
|
else |
|
|
|
pkg_failed=yes |
|
|
|
pkg_failed=yes |
|
|
@ -5420,12 +5421,12 @@ if test -n "$libtorrent_LIBS"; then |
|
|
|
pkg_cv_libtorrent_LIBS="$libtorrent_LIBS" |
|
|
|
pkg_cv_libtorrent_LIBS="$libtorrent_LIBS" |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.0\""; } >&5 |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.0.6\""; } >&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.0") 2>&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.0.6") 2>&5 |
|
|
|
ac_status=$? |
|
|
|
ac_status=$? |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
test $ac_status = 0; }; then |
|
|
|
test $ac_status = 0; }; then |
|
|
|
pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.0.0" 2>/dev/null` |
|
|
|
pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.0.6" 2>/dev/null` |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
else |
|
|
|
else |
|
|
|
pkg_failed=yes |
|
|
|
pkg_failed=yes |
|
|
@ -5446,14 +5447,14 @@ else |
|
|
|
_pkg_short_errors_supported=no |
|
|
|
_pkg_short_errors_supported=no |
|
|
|
fi |
|
|
|
fi |
|
|
|
if test $_pkg_short_errors_supported = yes; then |
|
|
|
if test $_pkg_short_errors_supported = yes; then |
|
|
|
libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.0" 2>&1` |
|
|
|
libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1` |
|
|
|
else |
|
|
|
else |
|
|
|
libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.0" 2>&1` |
|
|
|
libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.0.6" 2>&1` |
|
|
|
fi |
|
|
|
fi |
|
|
|
# Put the nasty error message in config.log where it belongs |
|
|
|
# Put the nasty error message in config.log where it belongs |
|
|
|
echo "$libtorrent_PKG_ERRORS" >&5 |
|
|
|
echo "$libtorrent_PKG_ERRORS" >&5 |
|
|
|
|
|
|
|
|
|
|
|
as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.0.0) were not met: |
|
|
|
as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.0.6) were not met: |
|
|
|
|
|
|
|
|
|
|
|
$libtorrent_PKG_ERRORS |
|
|
|
$libtorrent_PKG_ERRORS |
|
|
|
|
|
|
|
|
|
|
|