From d57029c075e897c1477c0fb3ce13ef68ca1d2fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Tue, 24 Oct 2017 20:51:47 +0200 Subject: [PATCH] [scons] move LIB* initializing block --- SConstruct | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/SConstruct b/SConstruct index 20552179..3b6b9241 100644 --- a/SConstruct +++ b/SConstruct @@ -292,6 +292,30 @@ if 1: else: autoconf.env.Append(APPEND_LIBS = '') + autoconf.env.Append( + LIBBZ2 = '', + LIBCRYPT = '', + LIBCRYPTO = '', + LIBDBI = '', + LIBDL = '', + LIBFCGI = '', + LIBGDBM = '', + LIBGSSAPI_KRB5 = '', + LIBKRB5 = '', + LIBLBER = '', + LIBLDAP = '', + LIBLUA = '', + LIBMEMCACHED = '', + LIBMYSQL = '', + LIBPCRE = '', + LIBPGSQL = '', + LIBSQLITE3 = '', + LIBSSL = '', + LIBUUID = '', + LIBXML2 = '', + LIBZ = '', + ) + autoconf.haveCHeaders([ 'arpa/inet.h', 'crypt.h', @@ -392,30 +416,6 @@ if 1: autoconf.haveTypes(Split('pid_t size_t off_t')) - autoconf.env.Append( - LIBBZ2 = '', - LIBCRYPT = '', - LIBCRYPTO = '', - LIBDBI = '', - LIBDL = '', - LIBFCGI = '', - LIBGDBM = '', - LIBGSSAPI_KRB5 = '', - LIBKRB5 = '', - LIBLBER = '', - LIBLDAP = '', - LIBLUA = '', - LIBMEMCACHED = '', - LIBMYSQL = '', - LIBPCRE = '', - LIBPGSQL = '', - LIBSQLITE3 = '', - LIBSSL = '', - LIBUUID = '', - LIBXML2 = '', - LIBZ = '', - ) - # have crypt_r/crypt, and is -lcrypt needed? if autoconf.CheckLib('crypt'): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_LIBCRYPT' ], LIBCRYPT = 'crypt')