From: Steve Youngs <steve@sxemacs.org>
Date: Mon, 20 Apr 2020 11:39:00 +0000 (+1000)
Subject: Build Fix -- FFI auto-detection via pkg-config
X-Git-Tag: v22.1.17~3^2~1
X-Git-Url: http://cgit.sxemacs.org/?p=sxemacs;a=commitdiff_plain;h=16de74c3a0cabb8219672bb7a9c7fd72f2717572

Build Fix -- FFI auto-detection via pkg-config

	* m4/sxe-emodffi.m4 (SXE_FFI_TRY_PKGCONFIG): Save the results of
	SXE_PC_CHECK_CPPFLAGS into FFI_CPPFLAGS _before_ checking for
	headers.

Signed-off-by: Steve Youngs <steve@sxemacs.org>
---

diff --git a/m4/sxe-emodffi.m4 b/m4/sxe-emodffi.m4
index be8849f..4c0c0d9 100644
--- a/m4/sxe-emodffi.m4
+++ b/m4/sxe-emodffi.m4
@@ -118,14 +118,15 @@ AC_DEFUN([SXE_FFI_TRY_PKGCONFIG], [dnl
 		sxe_cv_feat_ffi="no"
 		MM_FAIL
 	else
-		SXE_CHECK_HEADERS([ffi.h])
 	        SXE_PC_CHECK_EXISTS([libffi])
 	        SXE_PC_CHECK_VERSION([libffi])
 	        SXE_PC_CHECK_CPPFLAGS([libffi])
 	        SXE_PC_CHECK_LDFLAGS([libffi])
 	        SXE_PC_CHECK_LIBS([libffi])
-		SXE_DUMP_LIBS
+		FFI_CPPFLAGS="${sxe_cv_pc_libffi_cppflags}"
 		CPPFLAGS="$CPPFLAGS $FFI_CPPFLAGS"
+		SXE_CHECK_HEADERS([ffi.h])
+		SXE_DUMP_LIBS
 		if test "$ac_cv_header_ffi_h" = "yes"; then
 			AC_CHECK_LIB([ffi], [ffi_call], [dnl
 				sxe_cv_feat_ffi="yes"