Fix more JSON related things

diff --git a/src/modules/rlm_couchbase/all.mk.in b/src/modules/rlm_couchbase/all.mk.in
index f0172e9f3b59491f95ea9a3604f84abc0bf3b635..261b97cb8a48f4d8fa725853cd18a0729c8058a2 100644 (file)
--- a/src/modules/rlm_couchbase/all.mk.in
+++ b/src/modules/rlm_couchbase/all.mk.in
@@ -2,7 +2,7 @@
 #  might not always be available, and the TARGETNAME from the previous
 #  target may stick around.
 TARGETNAME     :=
--include $(top_builddir)/src/modules/rlm_json/libfreeradius-json.mk
+-include $(top_builddir)/src/lib/json/all.mk
 TARGET         :=
 
 #  Check the targetname defined by libfreeradius-json.mk

diff --git a/src/modules/rlm_json/all.mk b/src/modules/rlm_json/all.mk
index 354fcd28b3bf83cfe39e0868996dd803af803f98..3a385b6d35eb64502629efae4be3afc079d5eae3 100644 (file)
--- a/src/modules/rlm_json/all.mk
+++ b/src/modules/rlm_json/all.mk
@@ -2,7 +2,7 @@
 #  might not always be available, and the TARGETNAME from the previous
 #  target may stick around.
 TARGETNAME     :=
--include $(top_builddir)/src/modules/rlm_json/libfreeradius-json.mk
+-include $(top_builddir)/src/lib/json/all.mk
 
 ifneq "${TARGETNAME}" ""
   TARGETNAME   := rlm_json
@@ -14,5 +14,5 @@ SOURCES               := $(TARGETNAME).c
 #
 #  Append SRC_CFLAGS and leave TGT_LDLIBS alone
 #
-SRC_CFLAGS     += -I$(top_builddir)/src/modules/rlm_json
+SRC_CFLAGS     += -I$(top_builddir)/src/lib/json/
 TGT_PREREQS    := libfreeradius-json.a

diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index 3683aac85f655fc6de3365d040f50be3409909b6..7b3e3603667fd3df89ce4388afaaa4e963149763 100644 (file)
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -31,9 +31,9 @@ RCSID("$Id$")
 #include <freeradius-devel/modules.h>
 #include <freeradius-devel/map_proc.h>
 #include <freeradius-devel/rad_assert.h>
+#include <freeradius-devel/json/json.h>
 
 #include <ctype.h>
-#include "json.h"
 
 #ifndef HAVE_JSON
 #  error "rlm_json should not be built unless json-c is available"

diff --git a/src/modules/rlm_rest/all.mk.in b/src/modules/rlm_rest/all.mk.in
index 902b5f903a481c4406241b46fac4b9159f0c5b62..16780c19f15db505eb4e9f42db51fdca14b2bb38 100644 (file)
--- a/src/modules/rlm_rest/all.mk.in
+++ b/src/modules/rlm_rest/all.mk.in
@@ -1,7 +1,7 @@
 #  Check to see if we have our internal library libfreeradius-json
 #  which in turn depends on json-c.
 TARGETNAME     :=
--include $(top_builddir)/src/modules/rlm_json/libfreeradius-json.mk
+-include $(top_builddir)/src/lib/json/all.mk
 TARGET         :=
 
 #  Add libfreeradius-json to the prereqs (so rlm_rest links to it)