[121215] trunk/dports/gis/gdal/Portfile

[vince at macports.org]

Revision: 121215
          https://trac.macports.org/changeset/121215
Author:   vince at macports.org
Date:     2014-06-20 07:49:22 -0700 (Fri, 20 Jun 2014)
Log Message:
-----------
Fix #44098 by forcing use of internal JSON parser.

Modified Paths:
--------------
    trunk/dports/gis/gdal/Portfile

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile	2014-06-20 14:26:37 UTC (rev 121214)
+++ trunk/dports/gis/gdal/Portfile	2014-06-20 14:49:22 UTC (rev 121215)
@@ -92,6 +92,9 @@
                     --without-poppler \
                     --mandir=${prefix}/share/man
 
+# Always choose internal libjson code (#44098)
+configure.args-append   --with-libjson-c=internal
+
 # Patch to ensure that the python installation respects DESTDIR
 patchfiles          patch-swig_python_GNUmakefile \
                     patch-gdalwarpkernel_opencl_c.diff \
@@ -324,13 +327,6 @@
 
 default_variants    +expat
 
-# Choose external libjson if available (#44098)
-if {[file exists ${prefix}/lib/libjson-c.dylib]} {
-    configure.args-append   --with-libjson-c=${prefix}/lib
-} else {
-    configure.args-append   --with-libjson-c=internal
-}
-
 # Postconfigure hack to avoid read ${include} .h files before
 # GDAL own include directories
 post-configure {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140620/d192d388/attachment.html>