From 14d30ac458af6216e790481c1593110cdaa01b3c Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 15 Dec 2005 19:41:02 +0000 Subject: [PATCH] Enhanced detection of GnuTLS (SCons). --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 356e8193..01e293d0 100644 --- a/SConstruct +++ b/SConstruct @@ -597,7 +597,10 @@ if env['with_sasl'] == 'yes': env.ParseConfig('pkg-config --cflags --libs libgsasl') if env['with_tls'] == 'yes': - libgnutls_pc = os.popen("pkg-config --list-all | grep gnutls | cut -f 1 -d ' '").read() + libgnutls_pc = string.strip(os.popen("pkg-config --list-all | grep '^libgnutls[ ]' | cut -f 1 -d ' '").read()) + if len(libgnutls_pc) == 0: + libgnutls_pc = string.strip(os.popen("pkg-config --list-all | grep '^gnutls[ ]' | cut -f 1 -d ' '").read()) + env.ParseConfig('pkg-config --cflags --libs ' + libgnutls_pc) # Generate help text for command line options