From 08c8749b481ce3a2e3fb3ac026dea2a3d7d84f27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20B=C3=BChler?= Date: Tue, 24 Oct 2017 13:34:37 +0200 Subject: [PATCH] [scons] add with_uuid option, document webdav relations --- SConstruct | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 20987e7e..c6ae4254 100644 --- a/SConstruct +++ b/SConstruct @@ -135,11 +135,11 @@ vars.AddVariables( BoolVariable('with_openssl', 'enable openssl support', 'no'), PackageVariable('with_pcre', 'enable pcre support', 'yes'), PackageVariable('with_pgsql', 'enable pgsql support', 'no'), - BoolVariable('with_sqlite3', 'enable sqlite3 support', 'no'), - # with_uuid not supported + BoolVariable('with_sqlite3', 'enable sqlite3 support (required for webdav props)', 'no'), + BoolVariable('with_uuid', 'enable uuid support (required for webdav locks)', 'no'), # with_valgrind not supported # with_xattr not supported - PackageVariable('with_xml', 'enable xml support', 'no'), + PackageVariable('with_xml', 'enable xml support (required for webdav props)', 'no'), BoolVariable('with_zlib', 'enable deflate/gzip compression', 'no'), BoolVariable('with_all', 'enable all with_* features', 'no'), @@ -271,8 +271,9 @@ if 1: if autoconf.CheckLibWithHeader('rt', 'time.h', 'c', 'clock_gettime(CLOCK_MONOTONIC, (struct timespec*)0);', autoadd = 0): autoconf.env.Append(CPPFLAGS = [ '-DHAVE_CLOCK_GETTIME' ], LIBS = [ 'rt' ]) - if autoconf.CheckLibWithHeader('uuid', 'uuid/uuid.h', 'C', autoadd = 0): - autoconf.env.Append(CPPFLAGS = [ '-DHAVE_UUID_UUID_H', '-DHAVE_LIBUUID' ], LIBUUID = 'uuid') + if env['with_uuid']: + if autoconf.CheckLibWithHeader('uuid', 'uuid/uuid.h', 'C', autoadd = 0): + autoconf.env.Append(CPPFLAGS = [ '-DHAVE_UUID_UUID_H', '-DHAVE_LIBUUID' ], LIBUUID = 'uuid') if env['with_openssl']: if autoconf.CheckLibWithHeader('ssl', 'openssl/ssl.h', 'C', autoadd = 0): -- 2.11.4.GIT