Regenerate configure.

[dump.git] / configure.in

diff --git a/configure.in b/configure.in
index 62ec978eb144a0650c6d7d0dfc00ac0bdce51c28..70d7f68be93e73b6128d5d063b8219ba1b8abd32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -532,7 +532,7 @@ dnl
 dnl Check for zlib headers and libraries
 dnl
 AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no], [-])
-AC_CHECK_LIB(z, compress2, [zlib_lib=yes], [zlib_lib=no])
+AC_CHECK_LIB(z, zlibVersion, [zlib_lib=yes], [zlib_lib=no])
 if test "$zlib_h" = yes -a "$zlib_lib" = yes; then
        if test "$STATICZ" = yes; then
                ZLIB="-Wl,-Bstatic -lz -Wl,-Bdynamic"
@@ -562,6 +562,23 @@ else
 fi
 AC_SUBST(BZLIB)
 
+dnl
+dnl Check for sqlite3 headers and libraries
+dnl
+AC_CHECK_HEADER(sqlite3.h, [sqlite3_h=yes], [sqlite3_h=no], [-])
+AC_CHECK_LIB(sqlite3, sqlite3_initialize, [sqlite3_lib=yes], [sqlite3_lib=no])
+if test "$sqlite3_h" = yes -a "$sqlite3_lib" = yes; then
+    if test "$STATICZ" = yes; then
+        SQLITE3="-Wl,-Bstatic -lsqlite3 -Wl,-Bdynamic"
+    else
+        SQLITE3="-lsqlite3"
+    fi
+    AC_DEFINE([HAVE_SQLITE3],1,[Define this if you have sqlite3 library.])
+else
+    SQLITE3=""
+fi
+AC_SUBST(SQLITE3)
+
 dnl
 dnl Check for library functions
 dnl
@@ -591,24 +608,24 @@ if test "$ac_cv_func_glob" = "yes"; then
 fi
 
 dnl
-dnl Check for OpenSSL, for ermt
-dnl
-if test "$ERMT" != ""; then
-       AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no])
-       AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no])
-       PKG_CHECK_EXISTS([libcrypto],
-               [
-               if test -n $STATIC ; then
-                       CRYPTO=`$PKG_CONFIG --libs --static libcrypto`
-               else
-                       CRYPTO=`$PKG_CONFIG --libs libcrypto`
-               fi
-               ],[CRYPTO=""])
-       if test "$evp_h" = no -o "x$CRYPTO" = "x"; then
+dnl Check for OpenSSL, for ermt and encryption.
+dnl
+AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no])
+AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no])
+if test "$evp_h" = yes -a "$crypto_lib" = yes; then
+       if test "$STATICZ" = yes; then
+               SSLLIB="-Wl,-Bstatic -lssl -Wl,-Bdynamic"
+       else
+               SSLLIB="-lssl"
+       fi
+       AC_DEFINE([HAVE_OPENSSL],1,[Define this if you have openssl library.])
+else
+       SSLLIB=""
+       if test "$ERMT" != ""; then
                AC_MSG_ERROR(You need to install the OpenSSL library (version 0.9.7a or later), or configure without --enable-ermt)
        fi
 fi
-AC_SUBST(CRYPTO)
+AC_SUBST(SSLLIB)
 
 dnl
 dnl Check for types
@@ -631,4 +648,4 @@ test -d compat/lib || mkdir compat/lib
 dnl
 dnl Output files
 dnl
-AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE)
+AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile testing/Makefile $RMTMAKEFILE)