[Xfce4-commits] <postler:master> Print a proper error message if libdb is missing

[Christian Dywan]

Updating branch refs/heads/master
         to 5e93d680fad5ea767cbc19d4424daca740efae21 (commit)
       from bb7269971959bcb5659e6719b04c94a0b09059c5 (commit)

commit 5e93d680fad5ea767cbc19d4424daca740efae21
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Jul 24 20:49:48 2011 +0200

    Print a proper error message if libdb is missing
    
    Fixes: https://bugs.launchpad.net/postler/+bug/804952

 wscript |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index 789a57f..745daff 100644
--- a/wscript
+++ b/wscript
@@ -185,11 +185,14 @@ def configure (conf):
         check_function ('dlopen', 'dlfcn.h')
         conf.check(function_name='db_create', header_name='db.h',
                    includes=['/usr/local/include/db42'],
-                   libpath=['/usr/local/lib/db42'], lib='db', mandatory=True)
+                   libpath=['/usr/local/lib/db42'], lib='db', mandatory=False)
     else:
         check_function ('inet_ntoa', 'arpa/inet.h', 'nsl')
         check_function ('dlopen', 'dlfcn.h', 'dl')
-        check_function ('db_create', 'db.h', 'db')
+        check_function ('db_create', 'db.h', 'db', mandatory=False)
+    if not conf.env['HAVE_DB_CREATE']:
+        Utils.pprint ('RED', 'libdb (Berkely DB) was not found.')
+        sys.exit (1)
     check_pkg ('openssl')
     check_function ('CRYPTO_lock', 'openssl/crypto.h', 'crypto')
     check_function ('SSL_connect', 'openssl/ssl.h', 'ssl', 'HAVE_LIBSSL')