X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.in;h=ffb014eef46936e512f27c402af63c094884a877;hb=64ac23537ea19d91ecabe52129bb7fa73b1c9043;hp=1726bee00726bd68dec0e650a9879cf59d38cecc;hpb=1f981816ac8d855cc2af6150711f3417e02e12bf;p=tools%2Fe2fsprogs.git

diff --git a/configure.in b/configure.in
index 1726bee..ffb014e 100644
--- a/configure.in
+++ b/configure.in
@@ -569,21 +569,24 @@ AC_SUBST(QUOTA_MAN_COMMENT)
 PKG_PROG_PKG_CONFIG
 AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
 AC_ARG_ENABLE([quota],
-[  --enable-quota	  enable quota support],
+[  --disable-quota	  disable quota support],
 if test "$enableval" = "no"
 then
 	QUOTA_CMT=#
 	AC_MSG_RESULT([Disabling quota support])
+	QUOTA_CMT="#"
 else
 	QUOTA_CMT=
 	AC_DEFINE(CONFIG_QUOTA, 1)
+	QUOTA_CMT=
 	AC_MSG_RESULT([Enabling quota support])
 	QUOTA_MAN_COMMENT=""
 	AC_SUBST(QUOTA_MAN_COMMENT)
 fi
 ,
-QUOTA_CMT=#
-AC_MSG_RESULT([Disabling quota support by default])
+AC_DEFINE(CONFIG_QUOTA, 1)
+QUOTA_CMT=
+AC_MSG_RESULT([Enabling quota support by default])
 )
 dnl
 dnl Define stuff expected for quota library
@@ -636,6 +639,28 @@ DEBUGFS_CMT=
 )
 AC_SUBST(DEBUGFS_CMT)
 dnl
+dnl handle --enable-e2scan
+dnl
+AC_ARG_ENABLE([e2scan],
+[  --disable-e2scan   	  disable support of e2scan program],
+if test "$enableval" = "no"
+then
+	echo "Disabling e2scan support"
+	E2SCAN_CMT="#"
+	E2SCAN_MAN='.\"'
+else
+	E2SCAN_CMT=
+	E2SCAN_MAN=
+	echo "Enabling e2scan support"
+fi
+,
+echo "Enabling e2scan support by default"
+E2SCAN_CMT=
+E2SCAN_MAN=
+)
+AC_SUBST(E2SCAN_CMT)
+AC_SUBST(E2SCAN_MAN)
+dnl
 dnl handle --enable-imager
 dnl
 AC_ARG_ENABLE([imager],
@@ -910,6 +935,10 @@ AC_CHECK_HEADERS(net/if.h,,,
 #include <sys/socket.h>
 #endif
 ]])
+dnl do not check sqlite3.h if e2scan is disabled
+if test x"$E2SCAN_CMT" == x; then
+AC_CHECK_HEADERS(sqlite3.h)
+fi
 AC_FUNC_VPRINTF
 dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
 dnl is not decleared.
@@ -1099,6 +1128,53 @@ SOCKET_LIB=''
 AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket])
 AC_SUBST(SOCKET_LIB)
 dnl
+dnl
+dnl Check to see if static sqlite exists
+dnl
+AC_ARG_WITH(
+	[sqlite3],
+	[  --with-sqlite3=DIR      location of sqlite3 library (default /usr/lib)],
+	[SQLITE3_LIBS="-L$with_sqlite3"],,
+	[SQLITE3_LIBS="-L/usr/lib64 -L/usr/lib"])
+
+dnl do not check sqlite3 library if e2scan is disabled
+if test x"$E2SCAN_CMT" == x; then
+
+CFLAGS_OLD=$CFLAGS
+SQLITE3_LIB=''
+dnl
+dnl check static sqlite3 first
+dnl
+CFLAGS="$CFLAGS_OLD $SQLITE3_LIBS -static -pthread"
+AC_CHECK_LIB(sqlite3, sqlite3_open,
+	[
+	SQLITE3_LIB="$SQLITE3_LIBS -static -pthread -lsqlite3"
+	AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if SQLite library is present])
+	])
+
+if test x"$SQLITE3_LIB" == x; then
+dnl
+dnl static sqlite3 is not found, check dynamic sqlite3
+dnl
+	AC_MSG_WARN(no static sqlite3 - looking for dynamic one)
+	CFLAGS="$CFLAGS_OLD $SQLITE3_LIBS -pthread"
+	AC_CHECK_LIB(sqlite3, sqlite3_close,
+		[
+		SQLITE3_LIB="$SQLITE3_LIBS -pthread -lsqlite3"
+		AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if SQLite library is present])
+		])
+fi
+
+AC_SUBST(SQLITE3_LIB)
+CFLAGS=$CFLAGS_OLD
+
+if test x"$SQLITE3_LIB" == x; then
+	AC_MSG_WARN(no sqlite3 - e2scan will not support database based scanning)
+fi
+
+fi
+
+dnl
 dnl See if optreset exists
 dnl
 AC_MSG_CHECKING(for optreset)
@@ -1338,7 +1414,7 @@ for i in MCONFIG Makefile e2fsprogs.spec \
 	lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \
 	lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
 	misc/Makefile ext2ed/Makefile e2fsck/Makefile \
-	debugfs/Makefile tests/Makefile tests/progs/Makefile \
+	debugfs/Makefile e2scan/Makefile tests/Makefile tests/progs/Makefile \
 	resize/Makefile doc/Makefile intl/Makefile \
 	intl/libgnuintl.h po/Makefile.in ; do
 	if test -d `dirname ${srcdir}/$i` ; then