SF.net SVN: geany-plugins:[2179] trunk/geany-plugins/devhelp/ wscript_configure

eht16 at users.sourceforge.net eht16 at xxxxx
Sat Aug 27 21:52:57 UTC 2011


Revision: 2179
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2179&view=rev
Author:   eht16
Date:     2011-08-27 21:52:56 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Adjust devhelp build for libdevhelp-[1|2].0 versions

Modified Paths:
--------------
    trunk/geany-plugins/devhelp/wscript_configure

Modified: trunk/geany-plugins/devhelp/wscript_configure
===================================================================
--- trunk/geany-plugins/devhelp/wscript_configure	2011-08-27 21:04:41 UTC (rev 2178)
+++ trunk/geany-plugins/devhelp/wscript_configure	2011-08-27 21:52:56 UTC (rev 2179)
@@ -21,13 +21,12 @@
 #
 # $Id: wscript_configure 1735 2010-11-09 17:03:40Z eht16 $
 
-from build.wafutils import check_cfg_cached
+from build.wafutils import add_to_env_and_define, check_cfg_cached
 
 packages = [
 	('gtk+-2.0', '2.16', 'GTK'),
     ('glib-2.0', '2.16', 'GLIB'),
     ('gthread-2.0','','GTHREAD'),
-    ('libdevhelp-2.0', '2.32.0', 'LIBDEVHELP'),
     ('webkit-1.0', '1.1.18', 'WEBKIT')
     ]
 
@@ -38,3 +37,25 @@
                      uselib_store=uselib_store,
                      mandatory=True,
                      args='--cflags --libs')
+
+
+# Use newer libdevhelp-2.0 if present, and fallback on older libdevhelp-1.0
+check_cfg_cached(conf,
+                 package='libdevhelp-2.0',
+                 atleast_version='2.32.0',
+                 uselib_store='LIBDEVHELP',
+                 mandatory=False,
+                 args='--cflags --libs')
+
+if not conf.env['HAVE_LIBDEVHELP'] == 1:
+    # fallback
+    check_cfg_cached(conf,
+                     package='libdevhelp-1.0',
+                     atleast_version='2.30.1',
+                     uselib_store='LIBDEVHELP',
+                     mandatory=False,
+                     args='--cflags --libs')
+else:
+    add_to_env_and_define(conf, 'HAVE_BOOK_MANAGER', 1)
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Plugins-Commits mailing list