diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-03-12 22:11:54 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-03-12 22:11:54 -0400 |
| commit | 2f10a5b886c5b024d33a91247d830af00543f5f4 (patch) | |
| tree | 5ff7ba1d49c031abe6b4723286187474bb730dbc /libgd.m4 | |
| parent | 69eac3f668ecc4e282802a1061686f1255372a4f (diff) | |
| download | libgd-2f10a5b886c5b024d33a91247d830af00543f5f4.tar.gz | |
libgd: Move _defines to the end
_header-button was evaluated before stack, which means that the set
wouldn't have any effect. Move _header-button and _view-common to the
end, so they're evaluated after everything else.
Diffstat (limited to 'libgd.m4')
| -rw-r--r-- | libgd.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -72,12 +72,6 @@ AC_DEFUN([LIBGD_INIT], [ AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description]) ]) - # _view-common: - AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) - _LIBGD_IF_OPTION_SET([_view-common],[ - AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description]) - ]) - # main-toolbar: AM_CONDITIONAL([LIBGD_MAIN_TOOLBAR],[_LIBGD_IF_OPTION_SET([main-toolbar],[true],[false])]) _LIBGD_IF_OPTION_SET([main-toolbar],[ @@ -92,12 +86,6 @@ AC_DEFUN([LIBGD_INIT], [ AC_DEFINE([LIBGD_HEADER_BAR], [1], [Description]) ]) - # _header-button: - AM_CONDITIONAL([LIBGD__HEADER_BUTTON],[_LIBGD_IF_OPTION_SET([_header-button],[true],[false])]) - _LIBGD_IF_OPTION_SET([_header-button],[ - AC_DEFINE([LIBGD__HEADER_BUTTON], [1], [Description]) - ]) - # margin-container: AM_CONDITIONAL([LIBGD_MARGIN_CONTAINER],[_LIBGD_IF_OPTION_SET([margin-container],[true],[false])]) _LIBGD_IF_OPTION_SET([margin-container],[ @@ -145,6 +133,18 @@ AC_DEFUN([LIBGD_INIT], [ GOBJECT_INTROSPECTION_REQUIRE([0.9.6]) ]) + # _header-button: + AM_CONDITIONAL([LIBGD__HEADER_BUTTON],[_LIBGD_IF_OPTION_SET([_header-button],[true],[false])]) + _LIBGD_IF_OPTION_SET([_header-button],[ + AC_DEFINE([LIBGD__HEADER_BUTTON], [1], [Description]) + ]) + + # _view-common: + AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) + _LIBGD_IF_OPTION_SET([_view-common],[ + AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description]) + ]) + PKG_CHECK_MODULES(LIBGD, [ $LIBGD_MODULES ]) AC_SUBST(LIBGD_GIR_INCLUDES) AC_SUBST(LIBGD_SOURCES) |