From: Colin Walters <walters@verbum.org>
Date: Thu, 24 Aug 2023 23:48:22 +0000 (-0400)
Subject: build-sys: Really fix composefs check
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3648c5ae29ce823592708cc1b9cca4f202d282a4;p=ostree.git

build-sys: Really fix composefs check

The ordering of the includes apparently matters...and I didn't
actually check that the previous change enables composefs on c9s.
But I did now.  For reals.

While we have the patient open, I switched to `AC_LANG_PROGRAM`
because I originally thought the bug had something to do with that.
As far as I understand, more cleanly separating the includes
from the injected body text is a useful thing in `AC_LANG_PROGRAM`.
---

diff --git a/configure.ac b/configure.ac
index 20f9e4ed..a98736eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,11 +277,11 @@ AM_CONDITIONAL(USE_GPGME, test "x$have_gpgme" = xyes)
 dnl composefs won't work at all without this
 AC_MSG_CHECKING([for MOUNT_ATTR_IDMAP])
 AC_COMPILE_IFELSE(
-	[AC_LANG_SOURCE([[
-			#include <linux/mount.h>
+	[AC_LANG_PROGRAM([
 			#include <sys/mount.h>
-      int foo = MOUNT_ATTR_IDMAP;
-	]])],
+			#include <linux/mount.h>
+  ],[int foo = MOUNT_ATTR_IDMAP;]
+	)],
 	[AC_MSG_RESULT(yes)
 	 have_mount_attr_idmap=yes],
 	[AC_MSG_RESULT(no)])