From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Tue, 24 Apr 2012 17:58:15 +0000 (+0000)
Subject: libjson configure test doesn't include support for DLL (#1787)
X-Git-Tag: 2.0.1~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=baf38393102dcf32e775558a1de095a411dade5a;p=postgis

libjson configure test doesn't include support for DLL (#1787)


git-svn-id: http://svn.osgeo.org/postgis/trunk@9659 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/configure.ac b/configure.ac
index 292df9fb2..ea56e87cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -713,10 +713,13 @@ if test ! "x$JSONDIR" = "x"; then
 	if test "x$JSONDIR" = "xyes"; then
 		AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
 	else
-		dnl We need (libjson.so OR libjson.a) AND json/json.h
-		if test ! -e "${JSONDIR}/lib/libjson.so" -a \
-		        ! -e "${JSONDIR}/lib/libjson.a" -o \
-		        ! -e "${JSONDIR}/include/json/json.h"
+		dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
+		if test ! -e "${JSONDIR}/include/json/json.h" -o \
+		        ! \( -e "${JSONDIR}/lib/libjson.so" -o \
+		            -e "${JSONDIR}/lib/libjson.dll" -o \
+		            -e "${JSONDIR}/lib/libjson.dylib" -o \
+		            -e "${JSONDIR}/bin/libjson.dll" -o \
+		            -e "${JSONDIR}/lib/libjson.a" \) 
 		then
 			AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
 		fi