[Xfce4-commits] <postler:master> Refine library checks to work with FreeBSD

Christian Dywan noreply at xfce.org
Thu Dec 16 18:54:01 CET 2010


Updating branch refs/heads/master
         to da47e0a200e29d3eed1ec4f18fc979fa83ca1f24 (commit)
       from aabfba4109673e35620e7a1aa2e20f88c94b4de6 (commit)

commit da47e0a200e29d3eed1ec4f18fc979fa83ca1f24
Author: André Stösel <andre at stoesel.de>
Date:   Thu Dec 16 18:18:26 2010 +0100

    Refine library checks to work with FreeBSD

 wscript |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/wscript b/wscript
index 6ea1af4..86984d9 100644
--- a/wscript
+++ b/wscript
@@ -122,12 +122,19 @@ def configure (conf):
         define_name='HAVE_VASPRINTF', msg='Checking for function vasprintf', \
         mandatory=True)
     check_function ('socket', 'sys/socket.h')
-    check_function ('inet_ntoa', 'arpa/inet.h', 'nsl')
+    if conf.env['DEST_OS'] == 'freebsd':
+        check_function ('inet_ntoa', 'arpa/inet.h')
+        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)
+    else:
+        check_function ('inet_ntoa', 'arpa/inet.h', 'nsl')
+        check_function ('dlopen', 'dlfcn.h', 'dl')
+        check_function ('db_create', 'db.h', 'db')
     check_pkg ('openssl')
-    check_function ('dlopen', 'dlfcn.h', 'dl')
     check_function ('CRYPTO_lock', 'openssl/crypto.h', 'crypto')
     check_function ('SSL_connect', 'openssl/ssl.h', 'ssl', 'HAVE_LIBSSL')
-    check_function ('db_create', 'db.h', 'db')
     conf.find_program ('msmtp', mandatory=True)
     if not conf.find_program ('dexter'):
         Utils.pprint ('YELLOW', 'Dexter is not installed. It is recommended ' \



More information about the Xfce4-commits mailing list