summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-03-16 17:30:37 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2013-03-16 17:30:37 +0000
commitf803c88bd550d944cbf9949430f0eb79990839da (patch)
treebdfdea1289aa3c5ce02a3ea5b0202ded8f7a16f5
parentfix/suppress build warnings (diff)
downloadinkscape-f803c88bd550d944cbf9949430f0eb79990839da.tar.gz
inkscape-f803c88bd550d944cbf9949430f0eb79990839da.zip
Only suppress compiler warnings for GDL if option is supported
(bzr r12216)
-rw-r--r--configure.ac2
-rw-r--r--src/libgdl/Makefile_insert2
2 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 3248ad9d2..cc2c19e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@ if test "$GCC" = "yes"; then
CFLAGS="$ink_svd_CFLAGS"
fi
+ AM_CONDITIONAL(CC_W_NO_SUPPORTED, test "$ink_opt_ok" = "yes")
+
####
# Linker flags...
diff --git a/src/libgdl/Makefile_insert b/src/libgdl/Makefile_insert
index d7892e334..e92223f0b 100644
--- a/src/libgdl/Makefile_insert
+++ b/src/libgdl/Makefile_insert
@@ -44,11 +44,13 @@ libgdl/all: libgdl/libgdl.a
libgdl/clean:
rm -f libgdl/libgdl.a $(libgdl_gdl_a_OBJECTS)
+if CC_W_NO_SUPPORTED
# Suppress some non-critical warnings for libgdl. We will drop our forked copy
# of GDL once we upgrade to Gtk+ 3 so it's more important to minimise the number
# of changes we make to GDL than to fix these minor issues in trunk.
libgdl_libgdl_a_CFLAGS = -Wno-unused-parameter -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable $(AM_CFLAGS)
+endif
libgdl_libgdl_a_SOURCES = \
libgdl/gdl-dock-object.h \