From: Raúl Marín Rodríguez Date: Mon, 7 Oct 2019 11:41:55 +0000 (+0000) Subject: Fix lib detection with "--with-jsondir" flag X-Git-Tag: 3.0.0rc1~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f55f7f8f3b6452d82e2cbfdc4bff79a61ec54c9e;p=postgis Fix lib detection with "--with-jsondir" flag Patch by jabakobob References #4528 git-svn-id: http://svn.osgeo.org/postgis/trunk@17878 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/configure.ac b/configure.ac index be9dccf53..9af7282e4 100644 --- a/configure.ac +++ b/configure.ac @@ -929,19 +929,23 @@ if test "$CHECK_JSON" != "no"; then else AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR]) + JSON_LDFLAGS="-L$JSONDIR/lib" + LIBS_SAVE="$LIBS" + LIBS="$JSON_LDFLAGS" AC_CHECK_FILE("$JSONDIR/include/json-c/json.h", [ JSON_CPPFLAGS="-I$JSONDIR/include/json-c" - AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON_C=yes; JSON_LDFLAGS="-L$JSONDIR/lib -ljson-c"]) + AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON_C=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"]) ], [ AC_CHECK_FILE("$JSONDIR/include/json/json.h", [ JSON_CPPFLAGS="-I$JSONDIR/include/json" - AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="-L$JSONDIR/lib -ljson"]) + AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"]) ], [AC_MSG_ERROR([Could not find header: json.h])]) ]) + LIBS="$LIBS_SAVE" fi elif test ! -z "$PKG_CONFIG"; then PKG_CHECK_MODULES([JSONC], [json-c], [