xfs_repair: don't use do_warn for normal log message

[thirdparty/xfsprogs-dev.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 530650bb6bb0b642a6aace2cbe4a2a84bb94b4f0..d5f072af3f39abe4875df44ffe10d767f8669151 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xfsprogs], [4.2.0-rc1])
+AC_INIT([xfsprogs], [4.12.0], [linux-xfs@vger.kernel.org])
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
@@ -6,14 +6,25 @@ AC_CONFIG_SRCDIR([include/libxfs.h])
 AC_CONFIG_HEADER(include/platform_defs.h)
 AC_PREFIX_DEFAULT(/usr)
 
+AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
 AC_PROG_CC
-if test $cross_compiling = no; then
-  BUILD_CC="$CC"
-  AC_SUBST(BUILD_CC)
-else
-  AC_CHECK_PROGS(BUILD_CC, gcc cc)
+AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
+if test "${BUILD_CC+set}" != "set"; then
+  if test $cross_compiling = no; then
+    BUILD_CC="$CC"
+  else
+    AC_CHECK_PROGS(BUILD_CC, gcc cc)
+  fi
+fi
+AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
+if test "${BUILD_CFLAGS+set}" != "set"; then
+  if test $cross_compiling = no; then
+    BUILD_CFLAGS="$CFLAGS"
+  else
+    BUILD_CFLAGS="-g -O2"
+  fi
 fi
 
 AC_ARG_ENABLE(shared,
@@ -26,6 +37,11 @@ AC_ARG_ENABLE(gettext,
        enable_gettext=yes)
 AC_SUBST(enable_gettext)
 
+AC_ARG_ENABLE(blkid,
+[ --enable-blkid=[yes/no] Enable use of block device id library [default=yes]],,
+       enable_blkid=yes)
+AC_SUBST(enable_blkid)
+
 AC_ARG_ENABLE(readline,
 [ --enable-readline=[yes/no] Enable readline command editing [default=no]],
        test $enable_readline = yes && libreadline="-lreadline",
@@ -51,6 +67,11 @@ AC_ARG_ENABLE(lib64,
        enable_lib64=yes)
 AC_SUBST(enable_lib64)
 
+AC_ARG_ENABLE(librt,
+[ --enable-librt=[yes/no] Enable librt support [default=yes]],,
+       enable_librt=yes)
+AC_SUBST(enable_librt)
+
 #
 # If the user specified a libdir ending in lib64 do not append another
 # 64 to the library names.
@@ -95,9 +116,7 @@ AC_SUBST(LOCALIZED_FILES)
 AC_PACKAGE_GLOBALS(xfsprogs)
 AC_PACKAGE_UTILITIES(xfsprogs)
 AC_MULTILIB($enable_lib64)
-
-AC_PACKAGE_NEED_AIO_H
-AC_PACKAGE_NEED_LIO_LISTIO
+AC_RT($enable_librt)
 
 AC_PACKAGE_NEED_UUID_H
 AC_PACKAGE_NEED_UUIDCOMPARE
@@ -114,9 +133,20 @@ AC_HAVE_GETMNTINFO
 AC_HAVE_FALLOCATE
 AC_HAVE_FIEMAP
 AC_HAVE_PREADV
+AC_HAVE_COPY_FILE_RANGE
 AC_HAVE_SYNC_FILE_RANGE
-AC_HAVE_BLKID_TOPO
+AC_HAVE_SYNCFS
+AC_HAVE_MNTENT
+AC_HAVE_FLS
 AC_HAVE_READDIR
+AC_HAVE_FSETXATTR
+AC_HAVE_MREMAP
+AC_NEED_INTERNAL_FSXATTR
+AC_HAVE_GETFSMAP
+
+if test "$enable_blkid" = yes; then
+AC_HAVE_BLKID_TOPO
+fi
 
 AC_CHECK_SIZEOF([long])
 AC_CHECK_SIZEOF([char *])