From 196e10f44c97a3c692f4fc2e0d9f0c4954f80e7c Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Thu, 5 Sep 2024 08:44:38 +0200 Subject: [PATCH] Use pkgconfig to compute cflags for wbxml2 instead of hardcoding them libwbxml2 recently changed their API version from 1.0 to 1.1. Avoid a build failure by retrieving the include dir from the provided pkgconfig definition. --- ActiveSync/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ActiveSync/GNUmakefile b/ActiveSync/GNUmakefile index 926e02725..b5d58fd6a 100644 --- a/ActiveSync/GNUmakefile +++ b/ActiveSync/GNUmakefile @@ -34,7 +34,7 @@ ActiveSync_RESOURCE_FILES += \ ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/ ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/ -ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/ +ADDITIONAL_INCLUDE_DIRS += $(shell pkg-config --cflags libwbxml2) ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2 -include GNUmakefile.preamble