github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed typo
	* configure.ac
pull/1/head
Tatsuhiro Tsujikawa 2009-05-23 05:22:05 +00:00
parent aafbe6f74b
commit b60f5d7338
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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>
Since upcoming libgnutls 2.8 doesn't have libgnutls-config, Check

16
configure vendored
View File

@ -6469,12 +6469,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutlsx >= 1.2.9\"") >&5
($PKG_CONFIG --exists --print-errors "gnutlsx >= 1.2.9") 2>&5
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\"") >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(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
pkg_failed=yes
fi
@ -6487,12 +6487,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
else
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutlsx >= 1.2.9\"") >&5
($PKG_CONFIG --exists --print-errors "gnutlsx >= 1.2.9") 2>&5
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\"") >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(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
pkg_failed=yes
fi
@ -6511,9 +6511,9 @@ else
_pkg_short_errors_supported=no
fi
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
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
# Put the nasty error message in config.log where it belongs
echo "$LIBGNUTLS_PKG_ERRORS" >&5

2
configure.ac
View File

@ -73,7 +73,7 @@ fi
if test "x$with_gnutls" = "xyes"; then
# gnutls >= 2.8 doesn't have libgnutls-config anymore.
# 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])
# If no libgnutls found by pkg-config, fall back to old macro
if test "x$have_libgnutls" = "xno"; then