[libgd] libgd.m4: simplify a little main-view dependencies



commit fcd61d752142723ebcfc04fa0402e5af46178a2d
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Tue Aug 21 21:37:21 2012 +0200

    libgd.m4: simplify a little main-view dependencies

 libgd.m4 |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/libgd.m4 b/libgd.m4
index dd6f33b..4ef6a97 100644
--- a/libgd.m4
+++ b/libgd.m4
@@ -50,6 +50,14 @@ AC_DEFUN([LIBGD_INIT], [
         AC_DEFINE([LIBGD_GTK_HACKS], [1], [Description])
     ])
 
+    # main-view:
+    AM_CONDITIONAL([LIBGD_MAIN_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])])
+    _LIBGD_IF_OPTION_SET([main-view],[
+        _LIBGD_SET_OPTION([main-icon-view])
+        _LIBGD_SET_OPTION([main-list-view])
+        AC_DEFINE([LIBGD_MAIN_VIEW], [1], [Description])
+    ])
+
     # main-icon-view:
     AM_CONDITIONAL([LIBGD_MAIN_ICON_VIEW],[_LIBGD_IF_OPTION_SET([main-icon-view],[true],[false])])
     _LIBGD_IF_OPTION_SET([main-icon-view],[
@@ -62,16 +70,6 @@ AC_DEFUN([LIBGD_INIT], [
         AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description])
     ])
 
-    # main-view:
-    AM_CONDITIONAL([LIBGD_MAIN_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])])
-    AM_CONDITIONAL([LIBGD_MAIN_ICON_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])])
-    AM_CONDITIONAL([LIBGD_MAIN_LIST_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])])
-    _LIBGD_IF_OPTION_SET([main-view],[
-        AC_DEFINE([LIBGD_MAIN_ICON_VIEW], [1], [Description])
-        AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description])
-        AC_DEFINE([LIBGD_MAIN_VIEW], [1], [Description])
-    ])
-
     # main-toolbar:
     AM_CONDITIONAL([LIBGD_MAIN_TOOLBAR],[_LIBGD_IF_OPTION_SET([main-toolbar],[true],[false])])
     _LIBGD_IF_OPTION_SET([main-toolbar],[



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