diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-30 22:25:21 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-30 22:25:21 +0000 |
| commit | 3602dcca4612e8cba9ea30f0adb73dc225009bdb (patch) | |
| tree | 27fcf2d0c667234a8718eb852946cb3d6ad0ea90 | |
| parent | ed3b351c49cb4fbd48105a89eb26a31d057e2e2b (diff) | |
| download | glib-3602dcca4612e8cba9ea30f0adb73dc225009bdb.tar.gz | |
Bug 529321 – make check fails in glib/pcre
* glib/pcre/Makefile.am: include Makefile.decl to fix 'make check'.
Patch by Hiroyuki Ikezoe
svn path=/branches/glib-2-16/; revision=7113
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | glib/pcre/Makefile.am | 2 |
2 files changed, 11 insertions, 0 deletions
@@ -2,6 +2,15 @@ Backport from trunk: + 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-30 Matthias Clasen <mclasen@redhat.com> + + Backport from trunk: + Bug 536158 – also bump GHashTable version when a node is removed via g_hash_table_iter_remove()/g_hash_table_iter_steal() diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am index 47563574e..de481057f 100644 --- 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 \ |