Maintenance: update --with-tdb detection (#1776)

[thirdparty/squid.git] / acinclude / tdb.m4

diff --git a/acinclude/tdb.m4 b/acinclude/tdb.m4
index be1eb0ec12dded1a23dee466bc3693ac82e2bef2..d6666599443868f66c19db7a666ab05455fe1ba0 100644 (file)
--- a/acinclude/tdb.m4
+++ b/acinclude/tdb.m4
@@ -6,42 +6,18 @@
 ##
 
 dnl check for --with-tdb option
-AC_DEFUN([SQUID_CHECK_LIBTDB],[
-AC_ARG_WITH(tdb,
-  AS_HELP_STRING([--without-tdb],
-                 [Do not use Samba TrivialDB. Default: auto-detect]),[
-  AS_CASE(["$with_tdb"],
-    [yes|no|auto],[:],
-    [
-      AS_IF([test ! -d "$withval"],
-        AC_MSG_ERROR([--with-tdb path ($with_tdb) does not point to a directory])
-      )
-      LIBTDB_PATH="-L$withval/lib"
-      CPPFLAGS="-I$withval/include $CPPFLAGS"
-    ]
-  )
-])
-AH_TEMPLATE(USE_TRIVIALDB,[Samba TrivialDB support is available])
-AS_IF([test "x$with_tdb" != "xno"],[
+AC_DEFUN_ONCE([SQUID_CHECK_LIBTDB],[
+SQUID_AUTO_LIB(tdb,[Samba TrivialDB],[LIBTDB])
+SQUID_CHECK_LIB_WORKS(tdb,[
   SQUID_STATE_SAVE(squid_libtdb_state)
   LIBS="$LIBS $LIBTDB_PATH"
-  PKG_CHECK_MODULES([LIBTDB],[tdb],[CPPFLAGS="$CPPFLAGS $LIBTDB_CFLAGS"],[:])
+  PKG_CHECK_MODULES([LIBTDB],[tdb],[:],[:])
+  CPPFLAGS="$CPPFLAGS $LIBTDB_CFLAGS"
   AC_CHECK_HEADERS([sys/stat.h tdb.h],,,[
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
   ])
   SQUID_STATE_ROLLBACK(squid_libtdb_state) #de-pollute LIBS
-
-  AS_IF([test "x$with_tdb" = "xyes" -a "x$LIBTDB_LIBS" = "x"],
-    AC_MSG_ERROR([Required TrivialDB library not found])
-  )
-  AS_IF([test "x$LIBTDB_LIBS" != "x"],[
-    CXXFLAGS="$LIBTDB_CFLAGS $CXXFLAGS"
-    LIBTDB_LIBS="$LIBTDB_PATH $LIBTDB_LIBS"
-    AC_DEFINE_UNQUOTED(USE_TRIVIALDB, HAVE_TDB_H, [Samba TrivialDB support is available])
-  ],[with_tdb=no])
 ])
-AC_MSG_NOTICE([Samba TrivialDB library support: ${with_tdb:=auto} ${LIBTDB_PATH} ${LIBTDB_LIBS}])
-AC_SUBST(LIBTDB_LIBS)
 ])