From 886d67d0f5d37c9d705fb6ad1225c55c15465584 Mon Sep 17 00:00:00 2001 From: Riccardo Mottola Date: Wed, 18 Apr 2012 22:37:54 +0000 Subject: [PATCH] libpng-config: get I_opts and not the whole cflags, which break debug builds git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35090 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ configure | 2 +- configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f68c0d77d..3d72712d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-04-19 Riccardo Mottola + + * configure + * configure.ac + libpng-config: get I_opts and not the whole cflags, which break debug builds + 2012-04-10 Fred Kiefer * Source/NSTabView.m (+initialize): Increase version number. diff --git a/configure b/configure index f010f5617..686f150ec 100755 --- a/configure +++ b/configure @@ -5006,7 +5006,7 @@ fi if test "$HAVE_LIBPNG_CONFIG" = "yes"; then - PNG_CFLAGS="`libpng-config --cflags`" + PNG_CFLAGS="`libpng-config --I_opts`" PNG_LDFLAGS="`libpng-config --ldflags`" CFLAGS="$PNG_CFLAGS ${CFLAGS}" LDFLAGS="$PNG_LDFLAGS ${LDFLAGS}" diff --git a/configure.ac b/configure.ac index 232b4a289..62b7e4531 100644 --- a/configure.ac +++ b/configure.ac @@ -242,7 +242,7 @@ if test $enable_png = yes; then # use libpng-config if available AC_CHECK_PROG(HAVE_LIBPNG_CONFIG, [libpng-config], yes) if test "$HAVE_LIBPNG_CONFIG" = "yes"; then - PNG_CFLAGS="`libpng-config --cflags`" + PNG_CFLAGS="`libpng-config --I_opts`" PNG_LDFLAGS="`libpng-config --ldflags`" CFLAGS="$PNG_CFLAGS ${CFLAGS}" LDFLAGS="$PNG_LDFLAGS ${LDFLAGS}"