diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-09-09 12:49:11 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-09-09 12:49:11 +0000 |
| commit | b23c3facc963be3adaa1b24363b25988ec0564d3 (patch) | |
| tree | 536c5b690067d4f23a76b425c4f10b3562cc022c /m4 | |
| parent | 79597c32cceb66a17370ac5c2780af14b2137346 (diff) | |
2008-09-09 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Merged from stable-0.15
* m4/libcares.m4
Use pkg-config
* m4/sqlite3.m4
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libcares.m4 | 8 | ||||
| -rw-r--r-- | m4/sqlite3.m4 | 37 |
2 files changed, 37 insertions, 8 deletions
diff --git a/m4/libcares.m4 b/m4/libcares.m4 index b995ab3d..6fab7eae 100644 --- a/m4/libcares.m4 +++ b/m4/libcares.m4 @@ -20,6 +20,11 @@ CPPFLAGS="-I$libcares_prefix_include -Wall $CPPFLAGS" AC_CHECK_LIB([cares], [ares_init], [have_libcares=yes]) +if test "x$have_libcares" != "xyes"; then + AC_CHECK_LIB([cares], [ares_init], [have_libcares=yes need_librt=yes], [], + [-lrt]) +fi + if test "x$have_libcares" = "xyes"; then AC_MSG_CHECKING([whether ares_host_callback accepts timeouts(c-ares >= 1.5)]) @@ -42,6 +47,9 @@ if test "x$have_libcares" = "xyes"; then AC_DEFINE([HAVE_LIBCARES], [1], [Define to 1 if you have libcares.]) LIBCARES_LIBS="-L$libcares_prefix_lib -lcares" + if test "x$need_librt" = "xyes"; then + LIBCARES_LIBS="$LIBCARES_LIBS -lrt" + fi LIBCARES_CPPFLAGS="-I$libcares_prefix_include" AC_SUBST(LIBCARES_LIBS) AC_SUBST(LIBCARES_CPPFLAGS) diff --git a/m4/sqlite3.m4 b/m4/sqlite3.m4 index e1112225..aa987819 100644 --- a/m4/sqlite3.m4 +++ b/m4/sqlite3.m4 @@ -8,20 +8,41 @@ if test "x$sqlite3_prefix" = "x"; then sqlite3_prefix="/usr" fi -sqlite3_prefix_lib=$sqlite3_prefix/lib -sqlite3_prefix_include=$sqlite3_prefix/include - LIBS_save=$LIBS CPPFLAGS_save=$CPPFLAGS -LIBS="-L$sqlite3_prefix_lib $LIBS" -CPPFLAGS="-I$sqlite3_prefix_include $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` -AC_CHECK_LIB([sqlite3], [sqlite3_open], [have_sqlite3=yes]) -if test "x$have_sqlite3" = "xyes"; then - AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.]) + 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 + sqlite3_prefix_lib=$sqlite3_prefix/lib + sqlite3_prefix_include=$sqlite3_prefix/include + + LIBS="-L$sqlite3_prefix_lib $LIBS" + CPPFLAGS="-I$sqlite3_prefix_include $CPPFLAGS" + + 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" + fi +fi +if test "x$have_sqlite3" = "xyes"; then + AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.]) AC_SUBST(SQLITE3_LIBS) AC_SUBST(SQLITE3_CPPFLAGS) fi |