self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-24 09:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not override JSON_LDFLAGS, fixing --with-jsondir usage

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@11563 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Sandro Santilli 2013-06-21 15:15:58 +00:00
parent 1c988618c9
commit e2350ec2b9
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -776,7 +776,7 @@ if test ! "x$JSONDIR" = "x"; then
dnl Add the include directory to JSON_CPPFLAGS
JSON_CPPFLAGS="-I$JSONDIR/include"
JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
JSON_LDFLAGS="-L$JSONDIR/lib"
fi
fi
@ -789,16 +789,13 @@ CPPFLAGS="$CPPFLAGS_SAVE"
dnl Ensure we can link against libjson
LIBS_SAVE="$LIBS"
LIBS="$JSON_LDFLAGS"
AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="-ljson-c"], [
AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="-ljson"], [], [])
AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [
AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], [])
], [])
LIBS="$LIBS_SAVE"
if test "$HAVE_JSON" = "yes"; then
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
if test "x$JSON_LDFLAGS" = "x"; then
JSON_LDFLAGS="-ljson"
fi
fi
AC_SUBST([JSON_CPPFLAGS])