From 6510e1ff306116f0c3d003a8efcf7589fcb6bf5d Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 16 Aug 2019 13:24:25 +0100
Subject: [PATCH] hide a gcc warning

gcc has an "unknown pragma" warning which triggers for clang pragmas we need to hide clang compiler warnings (!!)
---
 configure.ac                   | 16 ----------------
 libvips/conversion/Makefile.am |  8 +++++++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f2b6b11..818c7605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1441,22 +1441,6 @@ image pyramid export:			$with_gsf
 use libexif to load/save JPEG metadata: $with_libexif
 ])
 
-if test x"$found_introspection" = x"yes" -a "$VIPS_LIBDIR/girepository-1.0" != "$INTROSPECTION_TYPELIBDIR"; then
-  case "$VIPS_LIBDIR" in
-    /usr/local/Cellar/vips/*)
-      ;; # ignore for homebrew
-    *)
-      AC_MSG_RESULT([dnl
-Vips-8.0.typelib will be installed to $VIPS_LIBDIR/girepository-1.0, but 
-your system repository seems to be $INTROSPECTION_TYPELIBDIR. 
-You may need to add this directory to your typelib path, for example:
-
-	export GI_TYPELIB_PATH="$VIPS_LIBDIR/girepository-1.0"
-      ])
-      ;;
-  esac
-fi
-
 if test x"$vips_os_win32" = x"yes"; then
   if test x"$have_g_win32_get_command_line" != x"yes"; then
     AC_MSG_RESULT([dnl
diff --git a/libvips/conversion/Makefile.am b/libvips/conversion/Makefile.am
index 95b8d4fc..da804a11 100644
--- a/libvips/conversion/Makefile.am
+++ b/libvips/conversion/Makefile.am
@@ -44,4 +44,10 @@ libconversion_la_SOURCES = \
 	subsample.c \
 	zoom.c
 
-AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
+# gcc annoyingly warns about clang pragmas, and does not support suppressing
+# the warning with a gcc pragma
+AM_CPPFLAGS = \
+	-I${top_srcdir}/libvips/include \
+	@VIPS_CFLAGS@ @VIPS_INCLUDES@ \
+	-Wno-unknown-pragmas
+