mirror of
https://github.com/aria2/aria2.git
synced 2024-11-24 02:23:38 +08:00
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed PKG_CONFIG variable in sqlite3.m4, which conflicts the variable in pkg.m4. Use PKG_CHECK_MODULES instead of hand-crafted scripts. Renamed SQLITE3_CPPFLAGS as SQLITE3_CFLAGS since PKG_CHECK_MODULES macro uses latter name. * m4/sqlite3.m4 * src/Makefile.am * test/Makefile.am
This commit is contained in:
Tatsuhiro Tsujikawa
parent
b60f5d7338
commit
50060985c3
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||
|
||||
Removed PKG_CONFIG variable in sqlite3.m4, which conflicts the
|
||||
variable in pkg.m4. Use PKG_CHECK_MODULES instead of hand-crafted
|
||||
scripts. Renamed SQLITE3_CPPFLAGS as SQLITE3_CFLAGS since
|
||||
PKG_CHECK_MODULES macro uses latter name.
|
||||
* m4/sqlite3.m4
|
||||
* src/Makefile.am
|
||||
* test/Makefile.am
|
||||
|
||||
2009-05-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||
|
||||
Fixed typo
|
||||
|
||||
@ -206,7 +206,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
|
||||
335
configure
vendored
335
configure
vendored
@ -752,9 +752,9 @@ LIBGCRYPT_CONFIG
|
||||
LIBGNUTLS_CONFIG
|
||||
LIBGNUTLS_LIBS
|
||||
LIBGNUTLS_CFLAGS
|
||||
PKG_CONFIG
|
||||
SQLITE3_CPPFLAGS
|
||||
SQLITE3_LIBS
|
||||
SQLITE3_CFLAGS
|
||||
PKG_CONFIG
|
||||
LIBEXPAT_CPPFLAGS
|
||||
LIBEXPAT_LIBS
|
||||
XML_LIBS
|
||||
@ -916,6 +916,8 @@ YACC
|
||||
YFLAGS
|
||||
CXXCPP
|
||||
PKG_CONFIG
|
||||
SQLITE3_CFLAGS
|
||||
SQLITE3_LIBS
|
||||
LIBGNUTLS_CFLAGS
|
||||
LIBGNUTLS_LIBS'
|
||||
|
||||
@ -1611,6 +1613,10 @@ Some influential environment variables:
|
||||
default value of `-d' given by some make applications.
|
||||
CXXCPP C++ preprocessor
|
||||
PKG_CONFIG path to pkg-config utility
|
||||
SQLITE3_CFLAGS
|
||||
C compiler flags for SQLITE3, overriding pkg-config
|
||||
SQLITE3_LIBS
|
||||
linker flags for SQLITE3, overriding pkg-config
|
||||
LIBGNUTLS_CFLAGS
|
||||
C compiler flags for LIBGNUTLS, overriding pkg-config
|
||||
LIBGNUTLS_LIBS
|
||||
@ -6108,6 +6114,122 @@ fi
|
||||
if test "x$with_sqlite3" = "xyes"; then
|
||||
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; 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.
|
||||
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
||||
$as_echo "$PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
||||
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $ac_pt_PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
||||
if test -n "$ac_pt_PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
||||
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_pt_PKG_CONFIG" = x; then
|
||||
PKG_CONFIG=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||
fi
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
||||
fi
|
||||
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=0.9.0
|
||||
{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
||||
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-sqlite3-prefix was given.
|
||||
if test "${with_sqlite3_prefix+set}" = set; then
|
||||
withval=$with_sqlite3_prefix; sqlite3_prefix=$withval
|
||||
@ -6122,27 +6244,82 @@ fi
|
||||
LIBS_save=$LIBS
|
||||
CPPFLAGS_save=$CPPFLAGS
|
||||
|
||||
PKG_CONFIG="$sqlite3_prefix/bin/pkg-config"
|
||||
if test -x $PKG_CONFIG; then
|
||||
{ $as_echo "$as_me:$LINENO: checking checking availability of sqlite3 using pkg-config" >&5
|
||||
$as_echo_n "checking checking availability of sqlite3 using pkg-config... " >&6; }
|
||||
$PKG_CONFIG --exists sqlite3
|
||||
if test "$?" = "0"; then
|
||||
# Use pkg-config to detect LIBS and CFLAGS
|
||||
SQLITE3_LIBS=`$PKG_CONFIG --libs sqlite3`
|
||||
SQLITE3_CFLAGS=`$PKG_CONFIG --cflags sqlite3`
|
||||
|
||||
LIBS="$SQLITE3_LIBS $LIBS"
|
||||
CPPFLAGS="$SQLITE3_CFLAGS $CPPFLAGS"
|
||||
have_sqlite3=yes
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:$LINENO: checking for SQLITE3" >&5
|
||||
$as_echo_n "checking for SQLITE3... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$SQLITE3_CFLAGS"; then
|
||||
pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$SQLITE3_LIBS"; then
|
||||
pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "sqlite3") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3"`
|
||||
else
|
||||
SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SQLITE3_PKG_ERRORS" >&5
|
||||
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
have_sqlite3=no
|
||||
elif test $pkg_failed = untried; then
|
||||
have_sqlite3=no
|
||||
else
|
||||
SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
|
||||
SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
have_sqlite3=yes
|
||||
fi
|
||||
|
||||
if test "x$have_sqlite3" != "xyes"; then
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: $SQLITE3_PKG_ERRORS" >&5
|
||||
$as_echo "$as_me: WARNING: $SQLITE3_PKG_ERRORS" >&2;}
|
||||
|
||||
sqlite3_prefix_lib=$sqlite3_prefix/lib
|
||||
sqlite3_prefix_include=$sqlite3_prefix/include
|
||||
|
||||
@ -6220,7 +6397,7 @@ fi
|
||||
|
||||
if test "x$have_sqlite3" = "xyes"; then
|
||||
SQLITE3_LIBS="-L$sqlite3_prefix_lib -lsqlite3"
|
||||
SQLITE3_CPPFLAGS="-I$sqlite3_prefix_include"
|
||||
SQLITE3_CFLAGS="-I$sqlite3_prefix_include"
|
||||
fi
|
||||
fi
|
||||
if test "x$have_sqlite3" = "xyes"; then
|
||||
@ -6344,122 +6521,6 @@ 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.
|
||||
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; 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.
|
||||
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
||||
$as_echo "$PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
||||
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $ac_pt_PKG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
||||
if test -n "$ac_pt_PKG_CONFIG"; then
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
||||
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_pt_PKG_CONFIG" = x; then
|
||||
PKG_CONFIG=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||
fi
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
||||
fi
|
||||
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=0.9.0
|
||||
{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
||||
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:$LINENO: checking for LIBGNUTLS" >&5
|
||||
$as_echo_n "checking for LIBGNUTLS... " >&6; }
|
||||
|
||||
@ -180,7 +180,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
|
||||
@ -166,7 +166,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
|
||||
@ -166,7 +166,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
|
||||
@ -11,24 +11,11 @@ fi
|
||||
LIBS_save=$LIBS
|
||||
CPPFLAGS_save=$CPPFLAGS
|
||||
|
||||
PKG_CONFIG="$sqlite3_prefix/bin/pkg-config"
|
||||
if test -x $PKG_CONFIG; then
|
||||
AC_MSG_CHECKING([checking availability of sqlite3 using pkg-config])
|
||||
$PKG_CONFIG --exists sqlite3
|
||||
if test "$?" = "0"; then
|
||||
# Use pkg-config to detect LIBS and CFLAGS
|
||||
SQLITE3_LIBS=`$PKG_CONFIG --libs sqlite3`
|
||||
SQLITE3_CFLAGS=`$PKG_CONFIG --cflags sqlite3`
|
||||
PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=yes],[have_sqlite3=no])
|
||||
|
||||
LIBS="$SQLITE3_LIBS $LIBS"
|
||||
CPPFLAGS="$SQLITE3_CFLAGS $CPPFLAGS"
|
||||
have_sqlite3=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
if test "x$have_sqlite3" != "xyes"; then
|
||||
AC_MSG_WARN([$SQLITE3_PKG_ERRORS])
|
||||
|
||||
sqlite3_prefix_lib=$sqlite3_prefix/lib
|
||||
sqlite3_prefix_include=$sqlite3_prefix/include
|
||||
|
||||
@ -38,14 +25,14 @@ if test "x$have_sqlite3" != "xyes"; then
|
||||
AC_CHECK_LIB([sqlite3], [sqlite3_open], [have_sqlite3=yes])
|
||||
if test "x$have_sqlite3" = "xyes"; then
|
||||
SQLITE3_LIBS="-L$sqlite3_prefix_lib -lsqlite3"
|
||||
SQLITE3_CPPFLAGS="-I$sqlite3_prefix_include"
|
||||
SQLITE3_CFLAGS="-I$sqlite3_prefix_include"
|
||||
fi
|
||||
fi
|
||||
if test "x$have_sqlite3" = "xyes"; then
|
||||
AC_CHECK_FUNCS([sqlite3_open_v2])
|
||||
AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.])
|
||||
AC_SUBST(SQLITE3_LIBS)
|
||||
AC_SUBST(SQLITE3_CPPFLAGS)
|
||||
AC_SUBST(SQLITE3_CFLAGS)
|
||||
fi
|
||||
|
||||
LIBS=$LIBS_save
|
||||
|
||||
@ -524,5 +524,5 @@ AM_CPPFLAGS = -Wall\
|
||||
-I../lib -I../intl -I$(top_srcdir)/intl\
|
||||
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
|
||||
@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@\
|
||||
-DLOCALEDIR=\"$(localedir)\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg
|
||||
|
||||
@ -983,7 +983,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
@ -1203,7 +1203,7 @@ AM_CPPFLAGS = -Wall\
|
||||
-I../lib -I../intl -I$(top_srcdir)/intl\
|
||||
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
|
||||
@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@\
|
||||
-DLOCALEDIR=\"$(localedir)\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg
|
||||
|
||||
all: all-am
|
||||
|
||||
@ -210,7 +210,7 @@ AM_CPPFLAGS = -Wall\
|
||||
-I../lib -I../intl -I$(top_srcdir)/intl\
|
||||
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
|
||||
@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||
|
||||
EXTRA_DIST = 4096chunk.txt\
|
||||
chunkChecksumTestFile250.txt\
|
||||
|
||||
@ -502,7 +502,7 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
RANLIB = @RANLIB@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
|
||||
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
|
||||
SQLITE3_LIBS = @SQLITE3_LIBS@
|
||||
STRIP = @STRIP@
|
||||
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
|
||||
@ -625,7 +625,7 @@ AM_CPPFLAGS = -Wall\
|
||||
-I../lib -I../intl -I$(top_srcdir)/intl\
|
||||
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
|
||||
@LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||
@LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" @DEFS@
|
||||
|
||||
EXTRA_DIST = 4096chunk.txt\
|
||||
chunkChecksumTestFile250.txt\
|
||||
|
||||
Loading…
Reference in New Issue
Block a user