fstests: autoconf has deprecated a bunch of macros

Latest debian unstable environment results in these build warnings:

autoconf
configure.ac:8: warning: The macro `AC_HEADER_STDC' is obsolete.
configure.ac:8: You should run autoupdate.
./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from...
configure.ac:8: the top level
configure.ac:50: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:50: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
m4/package_xfslibs.m4:95: AC_PACKAGE_NEED_XFSCTL_MACRO is expanded from...
configure.ac:50: the top level
configure.ac:63: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:63: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
acinclude.m4:19: AC_PACKAGE_WANT_FALLOCATE is expanded from...
configure.ac:63: the top level
configure.ac:64: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:64: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
acinclude.m4:32: AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT is expanded from...
configure.ac:64: the top level
configure.ac:69: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:69: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
m4/package_libcdev.m4:106: AC_HAVE_COPY_FILE_RANGE is expanded from...
configure.ac:69: the top level
configure.ac:107: warning: The macro `AC_CONFIG_HEADER' is obsolete.
configure.ac:107: You should run autoupdate.
./lib/autoconf/status.m4:719: AC_CONFIG_HEADER is expanded from...
configure.ac:107: the top level

So, run autoupdate and then fix all the warnings.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/acinclude.m4 b/acinclude.m4
index a605c01c61de781c8a71c3d4e7581ed6f609d920..fd92f0d53e9533adecfcb46909e51c9e33b57a33 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,28 +18,22 @@ AC_DEFUN([AC_PACKAGE_WANT_LINUX_FS_H],
 
 AC_DEFUN([AC_PACKAGE_WANT_FALLOCATE],
   [ AC_MSG_CHECKING([for fallocate])
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <fcntl.h>
-#include <linux/falloc.h> ],
-      [ fallocate(0, 0, 0, 0); ],
-      [ have_fallocate=true; AC_MSG_RESULT(yes) ],
-      [ have_fallocate=false; AC_MSG_RESULT(no) ])
+#include <linux/falloc.h> ]], [[ fallocate(0, 0, 0, 0); ]])],[ have_fallocate=true; AC_MSG_RESULT(yes) ],[ have_fallocate=false; AC_MSG_RESULT(no) ])
     AC_SUBST(have_fallocate)
   ])
 
 AC_DEFUN([AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT],
   [ AC_MSG_CHECKING([for open_by_handle_at])
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #include <fcntl.h>
-      ],
-      [
+      ]], [[
           struct file_handle fh;
           open_by_handle_at(0, &fh, 0);
-      ],
-      [ have_open_by_handle_at=true; AC_MSG_RESULT(yes) ],
-      [ have_open_by_handle_at=false; AC_MSG_RESULT(no) ])
+      ]])],[ have_open_by_handle_at=true; AC_MSG_RESULT(yes) ],[ have_open_by_handle_at=false; AC_MSG_RESULT(no) ])
     AC_SUBST(have_open_by_handle_at)
   ])

diff --git a/configure.ac b/configure.ac
index 6e5ab397301e3cd6a29bfcffe25e371942a91b3d..cbf8377988557ae5df846af0c4f271f74c7cac1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,11 @@
-AC_INIT([xfstests], [1.1.1])
+AC_INIT([xfstests],[1.1.2])
 AC_CONFIG_MACRO_DIR([m4])
 LT_INIT
 AC_CONFIG_SRCDIR([src/xfsctl.c])
 AC_PACKAGE_GLOBALS(xfstests)
 AC_PACKAGE_UTILITIES(xfstests)
 
-AC_HEADER_STDC
-    AC_CHECK_HEADERS([ assert.h                \
+AC_CHECK_HEADERS([     assert.h                \
                        bstring.h               \
                        libgen.h                \
                        dirent.h                \
@@ -34,7 +33,7 @@ AC_HEADER_STDC
                        btrfs/ioctl.h           \
                        cifs/ioctl.h            \
                        sys/mman.h              \
-    ])
+])
 
 AC_CHECK_HEADERS([xfs/xfs_log_format.h],,,[
 #define _GNU_SOURCE
@@ -104,6 +103,6 @@ AC_CHECK_MEMBERS([struct btrfs_ioctl_vol_args_v2.subvolid], [], [], [[
 #include <linux/btrfs.h>
 ]])
 
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_FILES([include/builddefs])
 AC_OUTPUT

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 14e67e18e7723da8820bb6a8463a0fe3773d01eb..5c76c0f73e2abaa49f114ac25c732bfcea8454c3 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -3,15 +3,14 @@
 # 
 AC_DEFUN([AC_HAVE_FADVISE],
   [ AC_MSG_CHECKING([for fadvise ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <fcntl.h>
-    ], [
+    ]], [[
        posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
-    ], have_fadvise=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_fadvise=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_fadvise)
   ])
 
@@ -20,15 +19,14 @@ AC_DEFUN([AC_HAVE_FADVISE],
 # 
 AC_DEFUN([AC_HAVE_MADVISE],
   [ AC_MSG_CHECKING([for madvise ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <sys/mman.h>
-    ], [
+    ]], [[
        posix_madvise(0, 0, MADV_NORMAL);
-    ], have_madvise=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_madvise=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_madvise)
   ])
 
@@ -37,15 +35,14 @@ AC_DEFUN([AC_HAVE_MADVISE],
 # 
 AC_DEFUN([AC_HAVE_MINCORE],
   [ AC_MSG_CHECKING([for mincore ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <sys/mman.h>
-    ], [
+    ]], [[
        mincore(0, 0, 0);
-    ], have_mincore=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_mincore=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_mincore)
   ])
 
@@ -54,15 +51,14 @@ AC_DEFUN([AC_HAVE_MINCORE],
 # 
 AC_DEFUN([AC_HAVE_SENDFILE],
   [ AC_MSG_CHECKING([for sendfile ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 #include <sys/sendfile.h>
-    ], [
+    ]], [[
          sendfile(0, 0, 0, 0);
-    ], have_sendfile=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_sendfile=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_sendfile)
   ])
 
@@ -71,14 +67,13 @@ AC_DEFUN([AC_HAVE_SENDFILE],
 #
 AC_DEFUN([AC_HAVE_GETMNTENT],
   [ AC_MSG_CHECKING([for getmntent ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <mntent.h>
-    ], [
+    ]], [[
          getmntent(0);
-    ], have_getmntent=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_getmntent=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_getmntent)
   ])
 
@@ -87,15 +82,14 @@ AC_DEFUN([AC_HAVE_GETMNTENT],
 #
 AC_DEFUN([AC_HAVE_GETMNTINFO],
   [ AC_MSG_CHECKING([for getmntinfo ])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
-    ], [
+    ]], [[
          getmntinfo(0, 0);
-    ], have_getmntinfo=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_getmntinfo=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_getmntinfo)
   ])
 
@@ -105,15 +99,14 @@ AC_DEFUN([AC_HAVE_GETMNTINFO],
 #
 AC_DEFUN([AC_HAVE_COPY_FILE_RANGE],
   [ AC_MSG_CHECKING([for copy_file_range])
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #include <sys/syscall.h>
 #include <unistd.h>
-    ], [
+    ]], [[
          syscall(__NR_copy_file_range, 0, 0, 0, 0, 0, 0);
-    ], have_copy_file_range=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
+    ]])],[have_copy_file_range=yes
+       AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
     AC_SUBST(have_copy_file_range)
   ])
 

diff --git a/m4/package_ncurses.m4 b/m4/package_ncurses.m4
index 83a2c382b44ef731222e377166be3c789472e87a..b220dd64122a4777f878b711123f139c5bb33aa3 100644 (file)
--- a/m4/package_ncurses.m4
+++ b/m4/package_ncurses.m4
@@ -19,12 +19,9 @@ AC_DEFUN([AC_PACKAGE_WANT_WORKING_LIBNCURSES],
     libcurses="-lncurses"
     LIBS="$LIBS $libcurses"
     CFLAGS="$CFLAGS -D_GNU_SOURCE"
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <ncurses.h>
-#include <signal.h>],
-        [wgetch(stdscr);],
-        [enable_curses=yes; AC_MSG_RESULT([ok])],
-        [enable_curses=no; libcurses=""; AC_MSG_RESULT([disabling curses])])
+#include <signal.h>]], [[wgetch(stdscr);]])],[enable_curses=yes; AC_MSG_RESULT([ok])],[enable_curses=no; libcurses=""; AC_MSG_RESULT([disabling curses])])
     AC_SUBST(enable_curses)
     AC_SUBST(libcurses)
   ])

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index 9be56e1103ac75432ab700c077081b6b2725c7e1..0746cd1dc5d203ceda00f7007ed770b51e3c43c4 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -94,13 +94,10 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
 
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
   [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
-    AC_TRY_LINK([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
-#include <xfs/xfs.h> ],
-      [ int x = xfsctl(0, 0, 0, 0); ],
-      [ echo ok ],
-      [ echo
+#include <xfs/xfs.h> ]], [[ int x = xfsctl(0, 0, 0, 0); ]])],[ echo ok ],[ echo
         echo 'FATAL ERROR: cannot find required macros in the XFS headers.'
         echo 'Upgrade your XFS programs (xfsprogs) development package.'
         echo 'Alternatively, run "make install-dev" from the xfsprogs source.'