From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 31 Jul 2015 20:12:16 +0000 (-0400)
Subject: HAVE_JSON set in config.h
X-Git-Tag: release_3_0_10~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7113aaae9cf6472d24c1016048046d0ff0d31402;p=thirdparty%2Ffreeradius-server.git

HAVE_JSON set in config.h
---

diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index eee846e8ec0..2ac3798c511 100644
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -28,17 +28,15 @@ RCSIDH(other_h, "$Id$")
 #include <freeradius-devel/connection.h>
 #include "config.h"
 
-#ifdef HAVE_JSON_JSONH
-#define HAVE_JSON
-#endif
-
 #define CURL_NO_OLDIES 1
 #include <curl/curl.h>
 
-#if defined(HAVE_JSONMC_JSON_H)
-#  include <json-c/json.h>
-#elif defined(HAVE_JSON_JSON_H)
-#  include <json/json.h>
+#ifdef HAVE_JSON
+#  if defined(HAVE_JSONMC_JSON_H)
+#    include <json-c/json.h>
+#  elif defined(HAVE_JSON_JSON_H)
+#    include <json/json.h>
+#  endif
 #endif
 
 #define REST_URI_MAX_LEN		2048