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

2010-06-01 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Bump up version number to 1.9.4
	* configure.ac
	* doc/aria2c.1.txt
pull/1/head
Tatsuhiro Tsujikawa 2010-06-01 12:56:21 +00:00
parent 5e053b62ab
commit fdf5c0109b
12 changed files with 111 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-01 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Bump up version number to 1.9.4
* configure.ac
* doc/aria2c.1.txt
2010-06-01 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-01 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Don't throw exception when Metalink document is empty(no file Don't throw exception when Metalink document is empty(no file

2
Makefile.in
View File

@ -247,6 +247,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@ POSUB = @POSUB@
POW_LIB = @POW_LIB@ POW_LIB = @POW_LIB@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@

113
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for aria2 1.9.3. # Generated by GNU Autoconf 2.65 for aria2 1.9.4.
# #
# Report bugs to <t-tujikawa@users.sourceforge.net>. # Report bugs to <t-tujikawa@users.sourceforge.net>.
# #
@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='aria2' PACKAGE_NAME='aria2'
PACKAGE_TARNAME='aria2' PACKAGE_TARNAME='aria2'
PACKAGE_VERSION='1.9.3' PACKAGE_VERSION='1.9.4'
PACKAGE_STRING='aria2 1.9.3' PACKAGE_STRING='aria2 1.9.4'
PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net' PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
PACKAGE_URL='http://aria2.sourceforge.net/' PACKAGE_URL='http://aria2.sourceforge.net/'
@ -731,6 +731,8 @@ LIBEXPAT_LIBS
XML_LIBS XML_LIBS
XML_CPPFLAGS XML_CPPFLAGS
XML2_CONFIG XML2_CONFIG
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG PKG_CONFIG
EGREP EGREP
GREP GREP
@ -889,6 +891,8 @@ YACC
YFLAGS YFLAGS
CXXCPP CXXCPP
PKG_CONFIG PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
SQLITE3_CFLAGS SQLITE3_CFLAGS
SQLITE3_LIBS SQLITE3_LIBS
LIBGNUTLS_CFLAGS LIBGNUTLS_CFLAGS
@ -1434,7 +1438,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures aria2 1.9.3 to adapt to many kinds of systems. \`configure' configures aria2 1.9.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1505,7 +1509,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of aria2 1.9.3:";; short | recursive ) echo "Configuration of aria2 1.9.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1575,6 +1579,10 @@ Some influential environment variables:
default value of `-d' given by some make applications. default value of `-d' given by some make applications.
CXXCPP C++ preprocessor CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
SQLITE3_CFLAGS SQLITE3_CFLAGS
C compiler flags for SQLITE3, overriding pkg-config C compiler flags for SQLITE3, overriding pkg-config
SQLITE3_LIBS SQLITE3_LIBS
@ -1651,7 +1659,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
aria2 configure 1.9.3 aria2 configure 1.9.4
generated by GNU Autoconf 2.65 generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2009 Free Software Foundation, Inc.
@ -2478,7 +2486,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by aria2 $as_me 1.9.3, which was It was created by aria2 $as_me 1.9.4, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@ $ $0 $@
@ -3402,7 +3410,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='aria2' PACKAGE='aria2'
VERSION='1.9.3' VERSION='1.9.4'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -5672,6 +5680,10 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
# Check pkg-config is available # Check pkg-config is available
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@ -5784,7 +5796,6 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; } $as_echo "no" >&6; }
PKG_CONFIG="" PKG_CONFIG=""
fi fi
fi fi
# Checks for libraries. # Checks for libraries.
@ -6170,11 +6181,10 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5
$as_echo_n "checking for SQLITE3... " >&6; } $as_echo_n "checking for SQLITE3... " >&6; }
if test -n "$PKG_CONFIG"; then if test -n "$SQLITE3_CFLAGS"; then
if test -n "$SQLITE3_CFLAGS"; then pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS" elif test -n "$PKG_CONFIG"; then
else if test -n "$PKG_CONFIG" && \
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5 ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
ac_status=$? ac_status=$?
@ -6184,15 +6194,13 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi else
else pkg_failed=untried
pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then if test -n "$SQLITE3_LIBS"; then
if test -n "$SQLITE3_LIBS"; then pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS" elif test -n "$PKG_CONFIG"; then
else if test -n "$PKG_CONFIG" && \
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5 ($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
ac_status=$? ac_status=$?
@ -6202,14 +6210,15 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi else
else pkg_failed=untried
pkg_failed=untried
fi fi
if test $pkg_failed = yes; then if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes _pkg_short_errors_supported=yes
@ -6217,17 +6226,17 @@ 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
SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3"` SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3" 2>&1`
else else
SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3"` SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3" 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 "$SQLITE3_PKG_ERRORS" >&5 echo "$SQLITE3_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 have_sqlite3=no
$as_echo "no" >&6; }
have_sqlite3=no
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_sqlite3=no have_sqlite3=no
else else
SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
@ -6334,11 +6343,10 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5
$as_echo_n "checking for LIBGNUTLS... " >&6; } $as_echo_n "checking for LIBGNUTLS... " >&6; }
if test -n "$PKG_CONFIG"; then if test -n "$LIBGNUTLS_CFLAGS"; then
if test -n "$LIBGNUTLS_CFLAGS"; then pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS" elif test -n "$PKG_CONFIG"; then
else if test -n "$PKG_CONFIG" && \
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\""; } >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
ac_status=$? ac_status=$?
@ -6348,15 +6356,13 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi else
else pkg_failed=untried
pkg_failed=untried
fi fi
if test -n "$PKG_CONFIG"; then if test -n "$LIBGNUTLS_LIBS"; then
if test -n "$LIBGNUTLS_LIBS"; then pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS" elif test -n "$PKG_CONFIG"; then
else if test -n "$PKG_CONFIG" && \
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.9\""; } >&5
($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.9") 2>&5
ac_status=$? ac_status=$?
@ -6366,14 +6372,15 @@ if test -n "$PKG_CONFIG"; then
else else
pkg_failed=yes pkg_failed=yes
fi fi
fi else
else pkg_failed=untried
pkg_failed=untried
fi fi
if test $pkg_failed = yes; then if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes _pkg_short_errors_supported=yes
@ -6381,17 +6388,17 @@ 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 "gnutls >= 1.2.9"` LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.2.9" 2>&1`
else else
LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 1.2.9"` LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.2.9" 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 "$LIBGNUTLS_PKG_ERRORS" >&5 echo "$LIBGNUTLS_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 have_libgnutls=no
$as_echo "no" >&6; }
have_libgnutls=no
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_libgnutls=no have_libgnutls=no
else else
LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS
@ -15994,7 +16001,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by aria2 $as_me 1.9.3, which was This file was extended by aria2 $as_me 1.9.4, which was
generated by GNU Autoconf 2.65. Invocation command line was generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -16061,7 +16068,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
aria2 config.status 1.9.3 aria2 config.status 1.9.4
configured by $0, generated by GNU Autoconf 2.65, configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# #
AC_PREREQ(2.65) AC_PREREQ(2.65)
AC_INIT([aria2],[1.9.3],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/]) AC_INIT([aria2],[1.9.4],[t-tujikawa@users.sourceforge.net],[aria2],[http://aria2.sourceforge.net/])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE() AM_INIT_AUTOMAKE()

2
doc/Makefile.in
View File

@ -194,6 +194,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@ POSUB = @POSUB@
POW_LIB = @POW_LIB@ POW_LIB = @POW_LIB@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@

6
doc/aria2c.1
View File

@ -2,12 +2,12 @@
.\" Title: aria2c .\" Title: aria2c
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2010 .\" Date: 06/01/2010
.\" Manual: Aria2 Manual .\" Manual: Aria2 Manual
.\" Source: Aria2 1.9.3 .\" Source: Aria2 1.9.4
.\" Language: English .\" Language: English
.\" .\"
.TH "ARIA2C" "1" "05/22/2010" "Aria2 1\&.9\&.3" "Aria2 Manual" .TH "ARIA2C" "1" "06/01/2010" "Aria2 1\&.9\&.4" "Aria2 Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------

2
doc/aria2c.1.html
View File

@ -4198,7 +4198,7 @@ files in the program, then also delete it here.</p></div>
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2010-05-22 20:58:42 JST Last updated 2010-06-01 21:50:05 JST
</div> </div>
</div> </div>
</body> </body>

2
doc/aria2c.1.txt
View File

@ -3,7 +3,7 @@ ARIA2C(1)
Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
:man source: Aria2 :man source: Aria2
:man manual: Aria2 Manual :man manual: Aria2 Manual
:man version: 1.9.3 :man version: 1.9.4
NAME NAME
---- ----

2
lib/Makefile.in
View File

@ -165,6 +165,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@ POSUB = @POSUB@
POW_LIB = @POW_LIB@ POW_LIB = @POW_LIB@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@

58
m4/pkg.m4
View File

@ -1,4 +1,5 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
# #
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
# #
@ -26,7 +27,10 @@
AC_DEFUN([PKG_PROG_PKG_CONFIG], AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi fi
@ -39,7 +43,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
PKG_CONFIG="" PKG_CONFIG=""
fi fi
fi[]dnl fi[]dnl
])# PKG_PROG_PKG_CONFIG ])# PKG_PROG_PKG_CONFIG
@ -48,34 +51,31 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar # Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors. # to PKG_CHECK_MODULES(), but does not set variables or print errors.
# #
# # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# Similar to PKG_CHECK_MODULES, make sure that the first instance of # only at the first occurence in configure.ac, so if the first place
# this or PKG_CHECK_MODULES is called, or make sure to call # it's called might be skipped (such as if it is within an "if", you
# PKG_CHECK_EXISTS manually # have to call PKG_CHECK_EXISTS manually
# -------------------------------------------------------------- # --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS], AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:]) m4_default([$2], [:])
m4_ifvaln([$3], [else m4_ifvaln([$3], [else
$3])dnl $3])dnl
fi]) fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# --------------------------------------------- # ---------------------------------------------
m4_define([_PKG_CONFIG], m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then [if test -n "$$1"; then
if test -n "$$1"; then pkg_cv_[]$1="$$1"
pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then
else PKG_CHECK_EXISTS([$3],
PKG_CHECK_EXISTS([$3], [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes])
[pkg_failed=yes]) else
fi pkg_failed=untried
else
pkg_failed=untried
fi[]dnl fi[]dnl
])# _PKG_CONFIG ])# _PKG_CONFIG
@ -117,16 +117,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.]) See the pkg-config man page for more details.])
if test $pkg_failed = yes; then if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED _PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 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 "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met: [Package requirements ($2) were not met:
$$1_PKG_ERRORS $$1_PKG_ERRORS
@ -134,24 +135,23 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix. installed software in a non-standard prefix.
_PKG_TEXT _PKG_TEXT])dnl
])], ])
[AC_MSG_RESULT([no])
$4])
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it [The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config. path to pkg-config.
_PKG_TEXT _PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
[$4]) ])
else else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3]) $3
fi[]dnl fi[]dnl
])# PKG_CHECK_MODULES ])# PKG_CHECK_MODULES

2
src/Makefile.in
View File

@ -1007,6 +1007,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@ POSUB = @POSUB@
POW_LIB = @POW_LIB@ POW_LIB = @POW_LIB@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@

2
test/Makefile.in
View File

@ -532,6 +532,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@ POSUB = @POSUB@
POW_LIB = @POW_LIB@ POW_LIB = @POW_LIB@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@