From 4e0f712f570716886ebb6983e6fae5411d82d30c Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Fri, 15 Dec 2017 14:41:06 +0100 Subject: 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. --- libgd.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libgd.m4 b/libgd.m4 index 685c0a0..b71e344 100644 --- a/libgd.m4 +++ b/libgd.m4 @@ -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],[ -- cgit v1.2.1