Make it work regardless of --enable-debug

svn path=/trunk/; revision=5683

diff --git a/ChangeLog b/ChangeLog
index 34a1755..b945832 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols:
+       * glib/Makefile.am:
+       * glib/abicheck.sh: Make it work regardless of --enable-debug
+
 2007-08-08  Tristan Van Berkom <tvb@gnome.org>
 
        * docs/reference/gobject/tmpl/gparamspec.sgml: Fixed minor typo in docs.

diff --git a/glib/Makefile.am b/glib/Makefile.am
index b1f8cc6..22ecd19 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -36,6 +36,7 @@ galiasdef.c: glib.symbols
 
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY
+TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
 TESTS = abicheck.sh pltcheck.sh
 endif
 endif

diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index 3e69685..ce9a966 100755 (executable)
--- a/glib/abicheck.sh
+++ b/glib/abicheck.sh
@@ -3,7 +3,7 @@
 egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
 
 INCLUDES="-include ${top_builddir:-..}/config.h"
-INCLUDES="$INCLUDES -include glibconfig.cpp"
+INCLUDES="$INCLUDES -include glibconfig.cpp $GLIB_DEBUG_FLAGS"
 
 cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 rm -f glibconfig.cpp