Fix make check

svn path=/trunk/; revision=7014

diff --git a/ChangeLog b/ChangeLog
index 9849fd98d1c218eaa8fddfd4bc476d86733a1e86..f382142f294bd6937349333af4362f978c2dc655 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 529321 – make check fails in glib/pcre
+
+       * glib/pcre/Makefile.am: include Makefile.decl to fix 'make check'.
+       Patch by Hiroyuki Ikezoe
+
 2008-06-11  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c: g_win32_error_message() works fine for the

diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index bbea2e498c9e2f8efd7cd265ce55dc9613770742..78a76b143ca5b60b0411e0e2340c37dd761fcfc8 100644 (file)
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
        -DG_LOG_DOMAIN=\"GLib-GRegex\" \
        -DSUPPORT_UCP \
@@ -62,5 +64,3 @@ EXTRA_DIST =                          \
                COPYING                 \
                makefile.msc
 
-# automake workaround
-test: