[geany/geany-plugins] 004e8f: Be less aggressive when checking for the Discount library

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 10 Mar 2013 10:39:26 UTC
Commit:      004e8f708385eff933feb5a616e96fcb97b28e8e
             https://github.com/geany/geany-plugins/commit/004e8f708385eff933feb5a616e96fcb97b28e8e

Log Message:
-----------
Be less aggressive when checking for the Discount library

Instead of triggering an exception if Discount can not be found,
expect it might not be available.


Modified Paths:
--------------
    markdown/wscript_configure

Modified: markdown/wscript_configure
13 files changed, 5 insertions(+), 8 deletions(-)
===================================================================
@@ -36,13 +36,10 @@ for package_name, package_version, uselib_store in packages:
                      mandatory=True,
                      args='--cflags --libs')
 
-try:
-    # try Discount/libmarkdown
-    conf.check(header_name='mkdio.h',
-           mandatory=True)
+# try Discount/libmarkdown
+conf.check(header_name='mkdio.h',
+       mandatory=False)
+if conf.env['HAVE_MKDIO_H']:
     conf.check(lib='markdown',
            uselib_store='DISCOUNT',
-           mandatory=True)
-except ConfigurationError:
-    # fallback to embedded peg-markdown
-    pass
+           mandatory=False)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).