]> granicus.if.org Git - postgis/commitdiff
libjson configure test doesn't include support for DLL (#1787)
authorPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 24 Apr 2012 17:58:15 +0000 (17:58 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 24 Apr 2012 17:58:15 +0000 (17:58 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@9659 b70326c6-7e19-0410-871a-916f4a2858ee

configure.ac

index 292df9fb2827340f29943bc49c5cc03711443dee..ea56e87cba7bb56778eac3178dcb4b26f82bd29e 100644 (file)
@@ -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