mirror of https://github.com/aria2/aria2
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed typo * configure.acpull/1/head
parent
aafbe6f74b
commit
b60f5d7338
|
@ -1,3 +1,8 @@
|
||||||
|
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
|
Fixed typo
|
||||||
|
* configure.ac
|
||||||
|
|
||||||
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
Since upcoming libgnutls 2.8 doesn't have libgnutls-config, Check
|
Since upcoming libgnutls 2.8 doesn't have libgnutls-config, Check
|
||||||
|
|
|
@ -6469,12 +6469,12 @@ if test -n "$PKG_CONFIG"; then
|
||||||
pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
|
pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
|
||||||
else
|
else
|
||||||
if test -n "$PKG_CONFIG" && \
|
if test -n "$PKG_CONFIG" && \
|
||||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutlsx >= 1.2.9\"") >&5
|
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\"") >&5
|
||||||
($PKG_CONFIG --exists --print-errors "gnutlsx >= 1.2.9") 2>&5
|
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
(exit $ac_status); }; then
|
(exit $ac_status); }; then
|
||||||
pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutlsx >= 1.2.9" 2>/dev/null`
|
pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.9" 2>/dev/null`
|
||||||
else
|
else
|
||||||
pkg_failed=yes
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
|
@ -6487,12 +6487,12 @@ if test -n "$PKG_CONFIG"; then
|
||||||
pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
|
pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
|
||||||
else
|
else
|
||||||
if test -n "$PKG_CONFIG" && \
|
if test -n "$PKG_CONFIG" && \
|
||||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutlsx >= 1.2.9\"") >&5
|
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\"") >&5
|
||||||
($PKG_CONFIG --exists --print-errors "gnutlsx >= 1.2.9") 2>&5
|
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
(exit $ac_status); }; then
|
(exit $ac_status); }; then
|
||||||
pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutlsx >= 1.2.9" 2>/dev/null`
|
pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.9" 2>/dev/null`
|
||||||
else
|
else
|
||||||
pkg_failed=yes
|
pkg_failed=yes
|
||||||
fi
|
fi
|
||||||
|
@ -6511,9 +6511,9 @@ 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
|
||||||
LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutlsx >= 1.2.9"`
|
LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 1.2.9"`
|
||||||
else
|
else
|
||||||
LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutlsx >= 1.2.9"`
|
LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 1.2.9"`
|
||||||
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 "$LIBGNUTLS_PKG_ERRORS" >&5
|
echo "$LIBGNUTLS_PKG_ERRORS" >&5
|
||||||
|
|
|
@ -73,7 +73,7 @@ fi
|
||||||
if test "x$with_gnutls" = "xyes"; then
|
if test "x$with_gnutls" = "xyes"; then
|
||||||
# gnutls >= 2.8 doesn't have libgnutls-config anymore.
|
# gnutls >= 2.8 doesn't have libgnutls-config anymore.
|
||||||
# First check the presence of libgnutls using pkg-config.
|
# First check the presence of libgnutls using pkg-config.
|
||||||
PKG_CHECK_MODULES([LIBGNUTLS], [gnutlsx >= 1.2.9],
|
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.9],
|
||||||
[have_libgnutls=yes], [have_libgnutls=no])
|
[have_libgnutls=yes], [have_libgnutls=no])
|
||||||
# If no libgnutls found by pkg-config, fall back to old macro
|
# If no libgnutls found by pkg-config, fall back to old macro
|
||||||
if test "x$have_libgnutls" = "xno"; then
|
if test "x$have_libgnutls" = "xno"; then
|
||||||
|
|
Loading…
Reference in New Issue