From 45313933673d76adcf29361f0bd92617d529fc65 Mon Sep 17 00:00:00 2001 From: Mickey Rose Date: Thu, 28 Jun 2018 14:12:13 +0200 Subject: [PATCH] SConstruct: fix configure check ogr_enabled gdal-config --ogr-enabled writes yes/no to stdout, but always returns 0 (unless an invalid argument is given) --- SConstruct | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SConstruct b/SConstruct index 7587f04a0..6fbe2d27d 100644 --- a/SConstruct +++ b/SConstruct @@ -760,6 +760,8 @@ def ogr_enabled(context): context.Message( 'Checking if gdal is ogr enabled... ') context.sconf.cached = False ret, out = config_command(env['GDAL_CONFIG'], '--ogr-enabled') + if ret and out: + ret = (out == 'yes') if not ret: if 'ogr' not in env['SKIPPED_DEPS']: env['SKIPPED_DEPS'].append('ogr')