X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=70d7f68be93e73b6128d5d063b8219ba1b8abd32;hp=ccedce4437da7731973125fc61d31ca45050cb43;hb=HEAD;hpb=7f7d329e78edfcea92bff630c3e942d3410fdaab

diff --git a/configure.in b/configure.in
index ccedce4..70d7f68 100644
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,6 @@ AC_ARG_ENABLE([ermt],
 if test "$enableval" = "no"
 then
 	ERMT=""
-	CRYPTO=""
 	echo "Not compiling ermt"
 else
 	if test "$RMTDIR" = ""
@@ -121,16 +120,13 @@ else
 		AC_MSG_ERROR(ermt requires --enable-rmt)
 	fi
 	ERMT="ermt"
-	CRYPTO="-lcrypto"
 	echo "Compiling ermt"
 fi
 ,
 ERMT=""
-CRYPTO=""
 echo "Not compiling ermt by default"
 )
 AC_SUBST(ERMT)
-AC_SUBST(CRYPTO)
 
 dnl
 dnl Handle --enable-kerberos
@@ -411,8 +407,11 @@ dnl
 dnl Check for Ext2fs headers and libraries
 dnl
 AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
-AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err])
-if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then
+PKG_CHECK_MODULES(EXT2FS, [ext2fs])
+if test -n "$STATIC" ; then
+	EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs`
+fi
+if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
 	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
 fi
 
@@ -465,11 +464,17 @@ dnl
 dnl Check for blkid headers libraries
 dnl
 AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-])
-AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid])
-if test "$blkid_h" = yes -a "$blkid_lib" = yes; then
-	AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
-	BLKID="-lblkid -luuid -ldevmapper -lselinux -lsepol"
-fi
+PKG_CHECK_EXISTS([blkid],
+	[
+	if test -n $STATIC ; then
+		BLKID=`$PKG_CONFIG --libs --static blkid`
+	else
+		BLKID=`$PKG_CONFIG --libs blkid`
+	fi
+	if test "$blkid_h" = yes ; then
+		AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
+	fi
+	],[BLKID=""])
 AC_SUBST(BLKID)
 
 dnl
@@ -477,13 +482,16 @@ dnl Check for ncurses or termcap libraries
 dnl
 AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no])
 AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no])
+AC_CHECK_LIB(tinfo, tgetent, [tinfo_lib=yes], [tinfo_lib=no])
 
-if test "$ncurses_lib" = no -a "$termcap_lib" = no; then
+if test "$ncurses_lib" = no -a "$termcap_lib" = no -a "$tinfo_lib" = no; then
 	if test "$READLINE" = "yes"; then
 		AC_MSG_ERROR(You need to install the ncurses or termcap library or configure without --enable-readline)
 	fi
 fi
-if test "$ncurses_lib" = yes; then
+if test "$tinfo_lib" = yes; then
+	rdllib="-ltinfo"
+elif test "$ncurses_lib" = yes; then
 	rdllib="-lncurses"
 elif test "$termcap_lib" = yes; then
 	rdllib="-ltermcap"
@@ -524,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"
@@ -554,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
@@ -583,15 +608,24 @@ if test "$ac_cv_func_glob" = "yes"; then
 fi
 
 dnl
-dnl Check for OpenSSL, for ermt
+dnl Check for OpenSSL, for ermt and encryption.
 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])
-	if test "$evp_h" = no -o "$crypto_lib" = no; 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])
+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(SSLLIB)
 
 dnl
 dnl Check for types
@@ -614,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)