Merge branch 'support-fuse3' of https://github.com/DrDaveD/e2fsprogs into next

[tools/e2fsprogs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3cdf4c5..e4a17b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1118,6 +1118,7 @@ AC_CHECK_DECL(fsmap_sizeof,[AC_DEFINE(HAVE_FSMAP_SIZEOF, 1,
 dnl
 dnl Word sizes...
 dnl
+AC_SYS_LARGEFILE
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -1298,6 +1299,15 @@ if test "$ac_cv_func_dlopen" = yes ; then
 fi
 AC_SUBST(MAGIC_LIB)
 dnl
+dnl libarchive
+dnl
+AC_CHECK_LIB(archive, archive_read_new, [ARCHIVE_LIB=-larchive
+AC_CHECK_HEADERS([archive.h])])
+if test "$ac_cv_func_dlopen" = yes ; then
+   ARCHIVE_LIB=$DLOPEN_LIB
+fi
+AC_SUBST(ARCHIVE_LIB)
+dnl
 dnl Check to see if librt is required for clock_gettime() (glibc < 2.17)
 dnl
 AC_CHECK_LIB(rt, clock_gettime, [CLOCK_GETTIME_LIB=-lrt])
@@ -1936,8 +1946,6 @@ OS_IO_FILE=""
 esac]
 AC_SUBST(OS_IO_FILE)
 
-AC_SYS_LARGEFILE
-
 dnl
 dnl Make our output files, being sure that we create the some miscellaneous 
 dnl directories