From: Colin Walters <walters@verbum.org>
Date: Mon, 6 Nov 2017 19:37:24 +0000 (-0500)
Subject: build: Work around -Wundef with older GLib
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~29^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a16dddcaff5eb26f4843b89cd48213f1dd4817bd;p=ostree.git

build: Work around -Wundef with older GLib

This previous PR caused our `-Werror=undef` to trigger when building
with older GLib; this should work around it.

Closes: #1327
Approved by: jlebon
---

diff --git a/Makefile.am b/Makefile.am
index 2a33282f..e1dfd32b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
 	-DOSTREE_COMPILATION \
 	-DG_LOG_DOMAIN=\"OSTree\" \
   -DOSTREE_GITREV='"$(OSTREE_GITREV)"' \
-	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50 \
+	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,50)' \
 	-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
 AM_CFLAGS += -std=gnu99 $(WARN_CFLAGS)
 AM_DISTCHECK_CONFIGURE_FLAGS += \