Message ID | YpfXeCzZlBIq+vFI@magnolia (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
Series | xfsprogs: more autoconf modernisation | expand |
On Wed, Jun 01, 2022 at 02:17:44PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Fix a few autoconf things that were added after the submission of the > autoconf modernization patch. This was performed by running: > > $ autoupdate configure.ac m4/*.m4 > > And manually putting the version back to 2.69. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> Looks good. Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/configure.ac b/configure.ac index a4e14e17..02afd805 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([xfsprogs],[5.18.0-rc1],[linux-xfs@vger.kernel.org]) -AC_PREREQ(2.69) +AC_PREREQ([2.69]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([include/libxfs.h]) diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index 4dff8792..70badac3 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -404,13 +404,15 @@ test = mallinfo(); # AC_DEFUN([AC_HAVE_MALLINFO2], [ AC_MSG_CHECKING([for mallinfo2 ]) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE( + [ AC_LANG_PROGRAM([[ #include <malloc.h> - ], [ - struct mallinfo2 test; + ]], [[ +struct mallinfo2 test; - test.arena = 0; test.hblkhd = 0; test.uordblks = 0; test.fordblks = 0; - test = mallinfo2(); +test.arena = 0; test.hblkhd = 0; test.uordblks = 0; test.fordblks = 0; +test = mallinfo2(); + ]]) ], have_mallinfo2=yes AC_MSG_RESULT(yes), AC_MSG_RESULT(no))