From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 4/4] xfsprogs: autoconf modernisation
Date: Wed, 27 Apr 2022 09:44:53 +1000 [thread overview]
Message-ID: <20220426234453.682296-5-david@fromorbit.com> (raw)
In-Reply-To: <20220426234453.682296-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Because apparently AC_TRY_COMPILE and AC_TRY_LINK has been
deprecated and made obsolete.
.....
configure.ac:164: warning: The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:164: You should run autoupdate.
./lib/autoconf/general.m4:2847: AC_TRY_COMPILE is expanded from...
m4/package_libcdev.m4:68: AC_HAVE_GETMNTENT is expanded from...
configure.ac:164: the top level
configure.ac:165: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:165: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
m4/package_libcdev.m4:84: AC_HAVE_FALLOCATE is expanded from...
configure.ac:165: the top level
.....
But "autoupdate" does nothing to fix this, so I have to manually do
these conversions:
- AC_TRY_COMPILE -> AC_COMPILE_IFELSE
- AC_TRY_LINK -> AC_LINK_IFELSE
because I have nothing better to do than fix currently working
code.
Also, running autoupdate forces the minimum pre-req to be autoconf
2.71 because it replaces other stuff...
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
configure.ac | 8 +--
m4/package_attr.m4 | 8 ++-
m4/package_libcdev.m4 | 158 ++++++++++++++++++++++++++----------------
m4/package_types.m4 | 8 ++-
m4/package_urcu.m4 | 18 +++--
5 files changed, 123 insertions(+), 77 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4278145fe74b..36e42394a9df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
-AC_INIT([xfsprogs], [5.15.0], [linux-xfs@vger.kernel.org])
-AC_PREREQ(2.50)
+AC_INIT([xfsprogs],[5.15.0],[linux-xfs@vger.kernel.org])
+AC_PREREQ([2.71])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([include/libxfs.h])
-AC_CONFIG_HEADER(include/platform_defs.h)
+AC_CONFIG_HEADERS([include/platform_defs.h])
AC_PREFIX_DEFAULT(/usr)
AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
AC_PROG_CC
AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
diff --git a/m4/package_attr.m4 b/m4/package_attr.m4
index 432492311d18..05e02b38fb5a 100644
--- a/m4/package_attr.m4
+++ b/m4/package_attr.m4
@@ -8,15 +8,17 @@ AC_DEFUN([AC_PACKAGE_WANT_ATTRIBUTES_H],
#
AC_DEFUN([AC_HAVE_LIBATTR],
[ AC_MSG_CHECKING([for struct attrlist_cursor])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <attr/attributes.h>
- ], [
+ ]], [[
struct attrlist_cursor *cur;
struct attrlist *list;
struct attrlist_ent *ent;
int flags = ATTR_ROOT;
- ], have_libattr=yes
+ ]])
+ ], have_libattr=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
AC_SUBST(have_libattr)
diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index adab9bb9773a..94d76c7b3a19 100644
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -3,11 +3,13 @@
#
AC_DEFUN([AC_HAVE_FADVISE],
[ AC_MSG_CHECKING([for fadvise ])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <fcntl.h>
- ], [
- posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
+ ]], [[
+posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
+ ]])
], have_fadvise=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -19,11 +21,13 @@ 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
#include <sys/mman.h>
- ], [
- posix_madvise(0, 0, MADV_NORMAL);
+ ]], [[
+posix_madvise(0, 0, MADV_NORMAL);
+ ]])
], have_madvise=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -35,11 +39,13 @@ 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
#include <sys/mman.h>
- ], [
- mincore(0, 0, 0);
+ ]], [[
+mincore(0, 0, 0);
+ ]])
], have_mincore=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -51,11 +57,13 @@ 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
#include <sys/sendfile.h>
- ], [
- sendfile(0, 0, 0, 0);
+ ]], [[
+sendfile(0, 0, 0, 0);
+ ]])
], have_sendfile=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -67,11 +75,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);
+ ]], [[
+getmntent(0);
+ ]])
], have_getmntent=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -83,12 +93,14 @@ AC_DEFUN([AC_HAVE_GETMNTENT],
#
AC_DEFUN([AC_HAVE_FALLOCATE],
[ AC_MSG_CHECKING([for fallocate])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/falloc.h>
- ], [
- fallocate(0, 0, 0, 0);
+ ]], [[
+fallocate(0, 0, 0, 0);
+ ]])
], have_fallocate=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -100,13 +112,15 @@ AC_DEFUN([AC_HAVE_FALLOCATE],
#
AC_DEFUN([AC_HAVE_FIEMAP],
[ AC_MSG_CHECKING([for fiemap])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <linux/fs.h>
#include <linux/fiemap.h>
- ], [
- struct fiemap *fiemap;
- ioctl(0, FS_IOC_FIEMAP, (unsigned long)fiemap);
+ ]], [[
+struct fiemap *fiemap;
+ioctl(0, FS_IOC_FIEMAP, (unsigned long)fiemap);
+ ]])
], have_fiemap=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -118,12 +132,14 @@ AC_DEFUN([AC_HAVE_FIEMAP],
#
AC_DEFUN([AC_HAVE_PREADV],
[ AC_MSG_CHECKING([for preadv])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _BSD_SOURCE
#define _DEFAULT_SOURCE
#include <sys/uio.h>
- ], [
- preadv(0, 0, 0, 0);
+ ]], [[
+preadv(0, 0, 0, 0);
+ ]])
], have_preadv=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -135,11 +151,13 @@ AC_DEFUN([AC_HAVE_PREADV],
#
AC_DEFUN([AC_HAVE_PWRITEV2],
[ AC_MSG_CHECKING([for pwritev2])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _BSD_SOURCE
#include <sys/uio.h>
- ], [
- pwritev2(0, 0, 0, 0, 0);
+ ]], [[
+pwritev2(0, 0, 0, 0, 0);
+ ]])
], have_pwritev2=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -151,12 +169,14 @@ AC_DEFUN([AC_HAVE_PWRITEV2],
#
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);
+ ]], [[
+syscall(__NR_copy_file_range, 0, 0, 0, 0, 0, 0);
+ ]])
], have_copy_file_range=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -168,11 +188,13 @@ AC_DEFUN([AC_HAVE_COPY_FILE_RANGE],
#
AC_DEFUN([AC_HAVE_SYNC_FILE_RANGE],
[ AC_MSG_CHECKING([for sync_file_range])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <fcntl.h>
- ], [
- sync_file_range(0, 0, 0, 0);
+ ]], [[
+sync_file_range(0, 0, 0, 0);
+ ]])
], have_sync_file_range=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -184,11 +206,13 @@ AC_DEFUN([AC_HAVE_SYNC_FILE_RANGE],
#
AC_DEFUN([AC_HAVE_SYNCFS],
[ AC_MSG_CHECKING([for syncfs])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <unistd.h>
- ], [
- syncfs(0);
+ ]], [[
+syncfs(0);
+ ]])
], have_syncfs=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -200,10 +224,12 @@ AC_DEFUN([AC_HAVE_SYNCFS],
#
AC_DEFUN([AC_HAVE_READDIR],
[ AC_MSG_CHECKING([for readdir])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#include <dirent.h>
- ], [
- readdir(0);
+ ]], [[
+readdir(0);
+ ]])
], have_readdir=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -304,15 +330,17 @@ AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG],
#
AC_DEFUN([AC_HAVE_GETFSMAP],
[ AC_MSG_CHECKING([for GETFSMAP])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <sys/syscall.h>
#include <unistd.h>
#include <linux/fs.h>
#include <linux/fsmap.h>
- ], [
- unsigned long x = FS_IOC_GETFSMAP;
- struct fsmap_head fh;
+ ]], [[
+unsigned long x = FS_IOC_GETFSMAP;
+struct fsmap_head fh;
+ ]])
], have_getfsmap=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -338,11 +366,13 @@ AC_DEFUN([AC_HAVE_STATFS_FLAGS],
#
AC_DEFUN([AC_HAVE_MAP_SYNC],
[ AC_MSG_CHECKING([for MAP_SYNC])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#include <asm-generic/mman.h>
#include <asm-generic/mman-common.h>
- ], [
- int flags = MAP_SYNC | MAP_SHARED_VALIDATE;
+ ]], [[
+int flags = MAP_SYNC | MAP_SHARED_VALIDATE;
+ ]])
], have_map_sync=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -354,13 +384,15 @@ AC_DEFUN([AC_HAVE_MAP_SYNC],
#
AC_DEFUN([AC_HAVE_MALLINFO],
[ AC_MSG_CHECKING([for mallinfo ])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#include <malloc.h>
- ], [
- struct mallinfo test;
+ ]], [[
+struct mallinfo test;
- test.arena = 0; test.hblkhd = 0; test.uordblks = 0; test.fordblks = 0;
- test = mallinfo();
+test.arena = 0; test.hblkhd = 0; test.uordblks = 0; test.fordblks = 0;
+test = mallinfo();
+ ]])
], have_mallinfo=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -400,10 +432,13 @@ AC_DEFUN([AC_HAVE_FSTATAT],
#
AC_DEFUN([AC_HAVE_SG_IO],
[ AC_MSG_CHECKING([for struct sg_io_hdr ])
- AC_TRY_COMPILE([#include <scsi/sg.h>],
- [
- struct sg_io_hdr hdr;
- ioctl(0, SG_IO, &hdr);
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
+#include <scsi/sg.h>
+ ]], [[
+struct sg_io_hdr hdr;
+ioctl(0, SG_IO, &hdr);
+ ]])
], have_sg_io=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -415,10 +450,13 @@ AC_DEFUN([AC_HAVE_SG_IO],
#
AC_DEFUN([AC_HAVE_HDIO_GETGEO],
[ AC_MSG_CHECKING([for struct hd_geometry ])
- AC_TRY_COMPILE([#include <linux/hdreg.h>],
- [
- struct hd_geometry hdr;
- ioctl(0, HDIO_GETGEO, &hdr);
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
+#include <linux/hdreg.h>,
+ ]], [[
+struct hd_geometry hdr;
+ioctl(0, HDIO_GETGEO, &hdr);
+ ]])
], have_hdio_getgeo=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
diff --git a/m4/package_types.m4 b/m4/package_types.m4
index 1c35839319d6..6e817a310f79 100644
--- a/m4/package_types.m4
+++ b/m4/package_types.m4
@@ -4,9 +4,11 @@
AH_TEMPLATE([HAVE_UMODE_T], [Whether you have umode_t])
AC_DEFUN([AC_TYPE_UMODE_T],
[ AC_MSG_CHECKING([for umode_t])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#include <asm/types.h>
- ], [
- umode_t umode;
+ ]], [[
+umode_t umode;
+ ]])
], AC_DEFINE(HAVE_UMODE_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
])
diff --git a/m4/package_urcu.m4 b/m4/package_urcu.m4
index f8e798b66136..ef116e0cda76 100644
--- a/m4/package_urcu.m4
+++ b/m4/package_urcu.m4
@@ -10,11 +10,13 @@ AC_DEFUN([AC_PACKAGE_NEED_URCU_H],
AC_DEFUN([AC_PACKAGE_NEED_RCU_INIT],
[ AC_MSG_CHECKING([for liburcu])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <urcu.h>
- ], [
- rcu_init();
+ ]], [[
+rcu_init();
+ ]])
], liburcu=-lurcu
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
@@ -28,12 +30,14 @@ AC_DEFUN([AC_PACKAGE_NEED_RCU_INIT],
#
AC_DEFUN([AC_HAVE_LIBURCU_ATOMIC64],
[ AC_MSG_CHECKING([for atomic64_t support in liburcu])
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [ AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <urcu.h>
- ], [
- long long f = 3;
- uatomic_inc(&f);
+ ]], [[
+long long f = 3;
+uatomic_inc(&f);
+ ]])
], have_liburcu_atomic64=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
--
2.35.1
next prev parent reply other threads:[~2022-04-26 23:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 23:44 [PATCH 0/4] xfsprogs: fixes and updates Dave Chinner
2022-04-26 23:44 ` [PATCH 1/4] metadump: handle corruption errors without aborting Dave Chinner
2022-04-27 0:45 ` Darrick J. Wong
2022-04-27 1:26 ` Dave Chinner
2022-04-26 23:44 ` [PATCH 2/4] metadump: be careful zeroing corrupt inode forks Dave Chinner
2022-04-27 0:40 ` Darrick J. Wong
2022-04-27 1:27 ` Dave Chinner
2022-04-26 23:44 ` [PATCH 3/4] xfs_io: add a quiet option to bulkstat Dave Chinner
2022-04-27 0:38 ` Darrick J. Wong
2022-04-26 23:44 ` Dave Chinner [this message]
2022-04-27 0:42 ` [PATCH 4/4] xfsprogs: autoconf modernisation Darrick J. Wong
2022-04-27 1:33 ` Dave Chinner
2022-05-26 18:49 ` Eric Sandeen
2022-05-26 19:44 ` Eric Sandeen
2022-05-27 1:11 ` Dave Chinner
2022-05-27 6:17 ` Christoph Hellwig
2022-05-27 17:04 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220426234453.682296-5-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.