diff options
| author | Marinus Schraal <mschraal@gnome.org> | 2017-12-15 14:41:06 +0100 |
|---|---|---|
| committer | fosero <fosero@users.noreply.github.com> | 2017-12-15 14:49:38 +0100 |
| commit | 4e0f712f570716886ebb6983e6fae5411d82d30c (patch) | |
| tree | 30ffe8720ab098a350ef9830c50f337e7a034970 | |
| parent | 10de85141f91859c9f1708c317df5129b4172f0c (diff) | |
| download | libgd-4e0f712f570716886ebb6983e6fae5411d82d30c.tar.gz | |
libgd.m4: Fix order for gtk-hacks
Order gtk-hacks below widgets requiring it in the macro.
Apparently the order of conditional dependencies matter for m4 macros.
For example, main-view is depending on gtk-hacks, but gtk-hacks is
defined before main-view and did not get picked up. This resulted in
linking errors when gtk-hacks itself was omitted from the superprojects
init.
| -rw-r--r-- | libgd.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -44,12 +44,6 @@ AC_DEFUN([LIBGD_INIT], [ AM_CONDITIONAL([LIBGD_STATIC],[_LIBGD_IF_OPTION_SET([static],[true],[false])]) - # gtk-hacks: collection of Gtk+ hacks and workarounds - AM_CONDITIONAL([LIBGD_GTK_HACKS],[_LIBGD_IF_OPTION_SET([gtk-hacks],[true],[false])]) - _LIBGD_IF_OPTION_SET([gtk-hacks],[ - AC_DEFINE([LIBGD_GTK_HACKS], [1], [Description]) - ]) - # main-box: AM_CONDITIONAL([LIBGD_MAIN_BOX],[_LIBGD_IF_OPTION_SET([main-box],[true],[false])]) _LIBGD_IF_OPTION_SET([main-box],[ @@ -122,6 +116,12 @@ AC_DEFUN([LIBGD_INIT], [ GOBJECT_INTROSPECTION_REQUIRE([0.9.6]) ]) + # gtk-hacks: collection of Gtk+ hacks and workarounds + AM_CONDITIONAL([LIBGD_GTK_HACKS],[_LIBGD_IF_OPTION_SET([gtk-hacks],[true],[false])]) + _LIBGD_IF_OPTION_SET([gtk-hacks],[ + AC_DEFINE([LIBGD_GTK_HACKS], [1], [Description]) + ]) + # _box-common: AM_CONDITIONAL([LIBGD__BOX_COMMON],[_LIBGD_IF_OPTION_SET([_box-common],[true],[false])]) _LIBGD_IF_OPTION_SET([_box-common],[ |