[libgd] libgd.m4: Fix order for gtk-hacks



commit 4e0f712f570716886ebb6983e6fae5411d82d30c
Author: Marinus Schraal <mschraal gnome org>
Date:   Fri Dec 15 14:41:06 2017 +0100

    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 files 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],[


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]