Browse code

make json library optional.

Steven Morgan authored on 2014/04/17 07:14:45
Showing 2 changed files
... ...
@@ -16745,11 +16745,13 @@ $as_echo "$LIBJSON_HOME" >&6; }
16745 16745
 fi
16746 16746
 
16747 16747
 
16748
+have_json="no"
16749
+
16748 16750
 if test ! -f "$LIBJSON_HOME/include/json/json.h"
16749 16751
 then
16750
-    as_fn_error $? "libjson not found." "$LINENO" 5
16751
-fi
16752
-
16752
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json not found." >&5
16753
+$as_echo "$as_me: WARNING: json not found." >&2;}
16754
+else
16753 16755
 JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
16754 16756
 JSON_LIBS="-ljson"
16755 16757
 JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
... ...
@@ -16760,8 +16762,6 @@ LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
16760 16760
 save_CFLAGS="$CFLAGS"
16761 16761
 CFLAGS="$JSON_CPPFLAGS"
16762 16762
 
16763
-have_json="no"
16764
-
16765 16763
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_new_object in -ljson" >&5
16766 16764
 $as_echo_n "checking for json_object_new_object in -ljson... " >&6; }
16767 16765
 if ${ac_cv_lib_json_json_object_new_object+:} false; then :
... ...
@@ -16807,6 +16807,7 @@ fi
16807 16807
 
16808 16808
 LDFLAGS="$save_LDFLAGS"
16809 16809
 CFLAGS="$save_CFLAGS"
16810
+fi
16810 16811
 
16811 16812
 if test "$have_json" = "yes"; then
16812 16813
 
... ...
@@ -17,11 +17,12 @@ fi
17 17
 AC_MSG_RESULT([$LIBJSON_HOME])
18 18
 ])
19 19
 
20
+have_json="no"
21
+
20 22
 if test ! -f "$LIBJSON_HOME/include/json/json.h"
21 23
 then
22
-    AC_MSG_ERROR([libjson not found.])
23
-fi
24
-
24
+    AC_MSG_WARN([json not found.])
25
+else
25 26
 JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
26 27
 JSON_LIBS="-ljson"
27 28
 JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
... ...
@@ -32,12 +33,11 @@ LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
32 32
 save_CFLAGS="$CFLAGS"
33 33
 CFLAGS="$JSON_CPPFLAGS"
34 34
 
35
-have_json="no"
36
-
37 35
 AC_CHECK_LIB([json], [json_object_new_object], [have_json="yes"], [AC_MSG_ERROR([Your libjson installation is misconfigured or missing])])
38 36
 
39 37
 LDFLAGS="$save_LDFLAGS"
40 38
 CFLAGS="$save_CFLAGS"
39
+fi
41 40
 
42 41
 if test "$have_json" = "yes"; then
43 42
 AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])