[gimp] Bug 783482 - Fail to link invert-svg in jhbuild prefix on FreeBSD...

[Jehan Pagès <jehanp src gnome org>]

commit 20fdb8dfa319d57e86f9f135f2d6c246df088357
Author: Jehan <jehan girinstud io>
Date:   Wed Jun 7 11:16:37 2017 +0200

    Bug 783482 - Fail to link invert-svg in jhbuild prefix on FreeBSD...
    
    ... because LDFLAGS is ignored.
    Firstly let's make sure that invert-svg build uses LDFLAGS_FOR_BUILD and
    CFLAGS_FOR_BUILD; secondly, default these to LDFLAGS and CFLAGS
    respectively when not-cross-compiling, unless values are explicitly set.

 configure.ac      |   11 +++++++++++
 tools/Makefile.am |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea19993..1b46c5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2134,6 +2134,17 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
 # Check for vector icons
 ########################
 
+# If not cross-compiling, default build's link and compile flags to the
+# target's flags.
+if test "$cross_compiling" != "yes"; then
+  if test "x$LDFLAGS_FOR_BUILD" = "x"; then
+    LDFLAGS_FOR_BUILD="$LDFLAGS"
+  fi
+  if test "x$CFLAGS_FOR_BUILD" = "x"; then
+    CFLAGS_FOR_BUILD="$CFLAGS"
+  fi
+fi
+
 AC_ARG_ENABLE(vector-icons, [  --disable-vector-icons  use raster icons rather than vector ones 
(default=auto)], ,
               enable_vector_icons=auto)
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d5d017a..d111eb7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,7 +45,7 @@ test_clipboard_LDADD = $(GTK_LIBS)
 
 if ENABLE_VECTOR_ICONS
 invert-svg$(BUILD_EXEEXT): invert-svg.c
-       $(CC_FOR_BUILD) -o $@ $< $(NATIVE_GLIB_LIBS) $(NATIVE_GLIB_CFLAGS)
+       $(CC_FOR_BUILD) -o $@ $< $(NATIVE_GLIB_LIBS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) 
$(NATIVE_GLIB_CFLAGS)
 
 
 # compute_svg_viewbox is not built or used because librsvg is just too buggy