summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2021-10-11 10:06:58 +1100
committerEryu Guan <guaneryu@gmail.com>2021-10-24 21:25:36 +0800
commit7b2e36d1bc6c2d116217bc14f182c5cdcab8ef5a (patch)
tree2ef8460ed8bff6cf817da9be7a2ed7a248101305 /m4
parent74055e9afecdab30ba0588e9c71564106275b00e (diff)
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>
Diffstat (limited to 'm4')
-rw-r--r--m4/package_libcdev.m463
-rw-r--r--m4/package_ncurses.m47
-rw-r--r--m4/package_xfslibs.m47
3 files changed, 32 insertions, 45 deletions
diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 14e67e18..5c76c0f7 100644
--- 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 83a2c382..b220dd64 100644
--- 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 9be56e11..0746cd1d 100644
--- 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.'