... | ... |
@@ -978,6 +978,7 @@ enable_xml |
978 | 978 |
with_xml |
979 | 979 |
with_openssl |
980 | 980 |
with_libjson |
981 |
+with_libjson_static |
|
981 | 982 |
with_pcre |
982 | 983 |
with_system_libmspack |
983 | 984 |
enable_maintainer_mode |
... | ... |
@@ -1764,6 +1765,8 @@ Optional Packages: |
1764 | 1764 |
--with-libjson[=DIR] path to directory containing libjson |
1765 | 1765 |
[default=/usr/local or /usr if not found in |
1766 | 1766 |
/usr/local] |
1767 |
+ --with-libjson-static=DIR |
|
1768 |
+ path to libjson-c.a static library |
|
1767 | 1769 |
--with-pcre[=DIR] path to directory containing libpcre library, |
1768 | 1770 |
prioritizes PCRE2 over PCRE [default=search PATH |
1769 | 1771 |
environment variable] |
... | ... |
@@ -22520,20 +22523,21 @@ $as_echo_n "checking for libjson installation... " >&6; } |
22520 | 22520 |
# Check whether --with-libjson was given. |
22521 | 22521 |
if test "${with_libjson+set}" = set; then : |
22522 | 22522 |
withval=$with_libjson; |
22523 |
-find_json="no" |
|
22524 |
-if test "X$withval" = "Xyes"; then |
|
22525 |
- find_json="yes" |
|
22526 |
-else |
|
22527 |
- if test "X$withval" != "Xno"; then |
|
22528 |
- if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then |
|
22529 |
- LIBJSON_HOME="$withval" |
|
22530 |
- have_json_header="yes" |
|
22523 |
+ find_json="no" |
|
22524 |
+ if test "X$withval" = "Xyes"; then |
|
22525 |
+ find_json="yes" |
|
22526 |
+ else |
|
22527 |
+ if test "X$withval" != "Xno"; then |
|
22528 |
+ if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then |
|
22529 |
+ LIBJSON_HOME="$withval" |
|
22530 |
+ have_json_header="yes" |
|
22531 |
+ fi |
|
22532 |
+ fi |
|
22531 | 22533 |
fi |
22532 |
- fi |
|
22533 |
-fi |
|
22534 | 22534 |
|
22535 | 22535 |
else |
22536 | 22536 |
find_json="yes" |
22537 |
+ |
|
22537 | 22538 |
fi |
22538 | 22539 |
|
22539 | 22540 |
|
... | ... |
@@ -22576,12 +22580,13 @@ $as_echo "$as_me: WARNING: json header lost." >&2;} |
22576 | 22576 |
CFLAGS="$CFLAGS $JSON_CPPFLAGS" |
22577 | 22577 |
fi |
22578 | 22578 |
|
22579 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get_ex" >&5 |
|
22580 |
-$as_echo_n "checking for library containing json_object_object_get_ex... " >&6; } |
|
22581 |
-if ${ac_cv_search_json_object_object_get_ex+:} false; then : |
|
22579 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get_ex in -ljson-c" >&5 |
|
22580 |
+$as_echo_n "checking for json_object_object_get_ex in -ljson-c... " >&6; } |
|
22581 |
+if ${ac_cv_lib_json_c_json_object_object_get_ex+:} false; then : |
|
22582 | 22582 |
$as_echo_n "(cached) " >&6 |
22583 | 22583 |
else |
22584 |
- ac_func_search_save_LIBS=$LIBS |
|
22584 |
+ ac_check_lib_save_LIBS=$LIBS |
|
22585 |
+LIBS="-ljson-c $LIBS" |
|
22585 | 22586 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
22586 | 22587 |
/* end confdefs.h. */ |
22587 | 22588 |
|
... | ... |
@@ -22600,47 +22605,76 @@ return json_object_object_get_ex (); |
22600 | 22600 |
return 0; |
22601 | 22601 |
} |
22602 | 22602 |
_ACEOF |
22603 |
-for ac_lib in '' json-c json; do |
|
22604 |
- if test -z "$ac_lib"; then |
|
22605 |
- ac_res="none required" |
|
22606 |
- else |
|
22607 |
- ac_res=-l$ac_lib |
|
22608 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
|
22609 |
- fi |
|
22610 |
- if ac_fn_c_try_link "$LINENO"; then : |
|
22611 |
- ac_cv_search_json_object_object_get_ex=$ac_res |
|
22603 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
22604 |
+ ac_cv_lib_json_c_json_object_object_get_ex=yes |
|
22605 |
+else |
|
22606 |
+ ac_cv_lib_json_c_json_object_object_get_ex=no |
|
22612 | 22607 |
fi |
22613 | 22608 |
rm -f core conftest.err conftest.$ac_objext \ |
22614 |
- conftest$ac_exeext |
|
22615 |
- if ${ac_cv_search_json_object_object_get_ex+:} false; then : |
|
22616 |
- break |
|
22609 |
+ conftest$ac_exeext conftest.$ac_ext |
|
22610 |
+LIBS=$ac_check_lib_save_LIBS |
|
22617 | 22611 |
fi |
22618 |
-done |
|
22619 |
-if ${ac_cv_search_json_object_object_get_ex+:} false; then : |
|
22612 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_object_get_ex" >&5 |
|
22613 |
+$as_echo "$ac_cv_lib_json_c_json_object_object_get_ex" >&6; } |
|
22614 |
+if test "x$ac_cv_lib_json_c_json_object_object_get_ex" = xyes; then : |
|
22615 |
+ |
|
22616 |
+ have_json="yes" |
|
22617 |
+ have_deprecated_json="no" |
|
22618 |
+ json_libname="json-c" |
|
22619 |
+ |
|
22620 |
+else |
|
22621 |
+ |
|
22622 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get_ex in -ljson" >&5 |
|
22623 |
+$as_echo_n "checking for json_object_object_get_ex in -ljson... " >&6; } |
|
22624 |
+if ${ac_cv_lib_json_json_object_object_get_ex+:} false; then : |
|
22625 |
+ $as_echo_n "(cached) " >&6 |
|
22626 |
+else |
|
22627 |
+ ac_check_lib_save_LIBS=$LIBS |
|
22628 |
+LIBS="-ljson $LIBS" |
|
22629 |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
22630 |
+/* end confdefs.h. */ |
|
22620 | 22631 |
|
22632 |
+/* Override any GCC internal prototype to avoid an error. |
|
22633 |
+ Use char because int might match the return type of a GCC |
|
22634 |
+ builtin and then its argument prototype would still apply. */ |
|
22635 |
+#ifdef __cplusplus |
|
22636 |
+extern "C" |
|
22637 |
+#endif |
|
22638 |
+char json_object_object_get_ex (); |
|
22639 |
+int |
|
22640 |
+main () |
|
22641 |
+{ |
|
22642 |
+return json_object_object_get_ex (); |
|
22643 |
+ ; |
|
22644 |
+ return 0; |
|
22645 |
+} |
|
22646 |
+_ACEOF |
|
22647 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
22648 |
+ ac_cv_lib_json_json_object_object_get_ex=yes |
|
22621 | 22649 |
else |
22622 |
- ac_cv_search_json_object_object_get_ex=no |
|
22650 |
+ ac_cv_lib_json_json_object_object_get_ex=no |
|
22623 | 22651 |
fi |
22624 |
-rm conftest.$ac_ext |
|
22625 |
-LIBS=$ac_func_search_save_LIBS |
|
22652 |
+rm -f core conftest.err conftest.$ac_objext \ |
|
22653 |
+ conftest$ac_exeext conftest.$ac_ext |
|
22654 |
+LIBS=$ac_check_lib_save_LIBS |
|
22626 | 22655 |
fi |
22627 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get_ex" >&5 |
|
22628 |
-$as_echo "$ac_cv_search_json_object_object_get_ex" >&6; } |
|
22629 |
-ac_res=$ac_cv_search_json_object_object_get_ex |
|
22630 |
-if test "$ac_res" != no; then : |
|
22631 |
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
|
22656 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_object_object_get_ex" >&5 |
|
22657 |
+$as_echo "$ac_cv_lib_json_json_object_object_get_ex" >&6; } |
|
22658 |
+if test "x$ac_cv_lib_json_json_object_object_get_ex" = xyes; then : |
|
22659 |
+ |
|
22660 |
+ have_json="yes" |
|
22661 |
+ have_deprecated_json="no" |
|
22662 |
+ json_libname="json" |
|
22632 | 22663 |
|
22633 |
- have_json="yes" |
|
22634 |
- have_deprecated_json="no" |
|
22635 | 22664 |
else |
22636 | 22665 |
|
22637 |
- have_json="no" |
|
22638 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5 |
|
22639 |
-$as_echo_n "checking for library containing json_object_object_get... " >&6; } |
|
22640 |
-if ${ac_cv_search_json_object_object_get+:} false; then : |
|
22666 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get in -ljson-c" >&5 |
|
22667 |
+$as_echo_n "checking for json_object_object_get in -ljson-c... " >&6; } |
|
22668 |
+if ${ac_cv_lib_json_c_json_object_object_get+:} false; then : |
|
22641 | 22669 |
$as_echo_n "(cached) " >&6 |
22642 | 22670 |
else |
22643 |
- ac_func_search_save_LIBS=$LIBS |
|
22671 |
+ ac_check_lib_save_LIBS=$LIBS |
|
22672 |
+LIBS="-ljson-c $LIBS" |
|
22644 | 22673 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
22645 | 22674 |
/* end confdefs.h. */ |
22646 | 22675 |
|
... | ... |
@@ -22659,42 +22693,85 @@ return json_object_object_get (); |
22659 | 22659 |
return 0; |
22660 | 22660 |
} |
22661 | 22661 |
_ACEOF |
22662 |
-for ac_lib in '' json-c json; do |
|
22663 |
- if test -z "$ac_lib"; then |
|
22664 |
- ac_res="none required" |
|
22665 |
- else |
|
22666 |
- ac_res=-l$ac_lib |
|
22667 |
- LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
|
22668 |
- fi |
|
22669 |
- if ac_fn_c_try_link "$LINENO"; then : |
|
22670 |
- ac_cv_search_json_object_object_get=$ac_res |
|
22662 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
22663 |
+ ac_cv_lib_json_c_json_object_object_get=yes |
|
22664 |
+else |
|
22665 |
+ ac_cv_lib_json_c_json_object_object_get=no |
|
22671 | 22666 |
fi |
22672 | 22667 |
rm -f core conftest.err conftest.$ac_objext \ |
22673 |
- conftest$ac_exeext |
|
22674 |
- if ${ac_cv_search_json_object_object_get+:} false; then : |
|
22675 |
- break |
|
22668 |
+ conftest$ac_exeext conftest.$ac_ext |
|
22669 |
+LIBS=$ac_check_lib_save_LIBS |
|
22676 | 22670 |
fi |
22677 |
-done |
|
22678 |
-if ${ac_cv_search_json_object_object_get+:} false; then : |
|
22671 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_object_get" >&5 |
|
22672 |
+$as_echo "$ac_cv_lib_json_c_json_object_object_get" >&6; } |
|
22673 |
+if test "x$ac_cv_lib_json_c_json_object_object_get" = xyes; then : |
|
22679 | 22674 |
|
22675 |
+ have_json="yes" |
|
22676 |
+ have_deprecated_json="yes" |
|
22677 |
+ json_libname="json-c" |
|
22678 |
+ |
|
22679 |
+else |
|
22680 |
+ |
|
22681 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get in -ljson" >&5 |
|
22682 |
+$as_echo_n "checking for json_object_object_get in -ljson... " >&6; } |
|
22683 |
+if ${ac_cv_lib_json_json_object_object_get+:} false; then : |
|
22684 |
+ $as_echo_n "(cached) " >&6 |
|
22680 | 22685 |
else |
22681 |
- ac_cv_search_json_object_object_get=no |
|
22686 |
+ ac_check_lib_save_LIBS=$LIBS |
|
22687 |
+LIBS="-ljson $LIBS" |
|
22688 |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
22689 |
+/* end confdefs.h. */ |
|
22690 |
+ |
|
22691 |
+/* Override any GCC internal prototype to avoid an error. |
|
22692 |
+ Use char because int might match the return type of a GCC |
|
22693 |
+ builtin and then its argument prototype would still apply. */ |
|
22694 |
+#ifdef __cplusplus |
|
22695 |
+extern "C" |
|
22696 |
+#endif |
|
22697 |
+char json_object_object_get (); |
|
22698 |
+int |
|
22699 |
+main () |
|
22700 |
+{ |
|
22701 |
+return json_object_object_get (); |
|
22702 |
+ ; |
|
22703 |
+ return 0; |
|
22704 |
+} |
|
22705 |
+_ACEOF |
|
22706 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
22707 |
+ ac_cv_lib_json_json_object_object_get=yes |
|
22708 |
+else |
|
22709 |
+ ac_cv_lib_json_json_object_object_get=no |
|
22682 | 22710 |
fi |
22683 |
-rm conftest.$ac_ext |
|
22684 |
-LIBS=$ac_func_search_save_LIBS |
|
22711 |
+rm -f core conftest.err conftest.$ac_objext \ |
|
22712 |
+ conftest$ac_exeext conftest.$ac_ext |
|
22713 |
+LIBS=$ac_check_lib_save_LIBS |
|
22685 | 22714 |
fi |
22686 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get" >&5 |
|
22687 |
-$as_echo "$ac_cv_search_json_object_object_get" >&6; } |
|
22688 |
-ac_res=$ac_cv_search_json_object_object_get |
|
22689 |
-if test "$ac_res" != no; then : |
|
22690 |
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
|
22715 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_object_object_get" >&5 |
|
22716 |
+$as_echo "$ac_cv_lib_json_json_object_object_get" >&6; } |
|
22717 |
+if test "x$ac_cv_lib_json_json_object_object_get" = xyes; then : |
|
22718 |
+ |
|
22719 |
+ have_json="yes" |
|
22720 |
+ have_deprecated_json="yes" |
|
22721 |
+ json_libname="json" |
|
22722 |
+ |
|
22723 |
+else |
|
22724 |
+ |
|
22725 |
+ have_json="no" |
|
22726 |
+ as_fn_error $? "Unable to find libjson library." "$LINENO" 5 |
|
22727 |
+ |
|
22728 |
+ |
|
22729 |
+fi |
|
22730 |
+ |
|
22691 | 22731 |
|
22692 |
- have_json="yes" |
|
22693 |
- have_deprecated_json="yes" |
|
22694 | 22732 |
|
22695 | 22733 |
fi |
22696 | 22734 |
|
22697 | 22735 |
|
22736 |
+ |
|
22737 |
+fi |
|
22738 |
+ |
|
22739 |
+ |
|
22740 |
+ |
|
22698 | 22741 |
fi |
22699 | 22742 |
|
22700 | 22743 |
|
... | ... |
@@ -22711,7 +22788,22 @@ $as_echo "#define HAVE_JSON 1" >>confdefs.h |
22711 | 22711 |
$as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h |
22712 | 22712 |
|
22713 | 22713 |
fi |
22714 |
- JSON_LIBS="$LIBS" |
|
22714 |
+ |
|
22715 |
+ |
|
22716 |
+# Check whether --with-libjson-static was given. |
|
22717 |
+if test "${with_libjson_static+set}" = set; then : |
|
22718 |
+ withval=$with_libjson_static; |
|
22719 |
+ json_linking="static" |
|
22720 |
+ JSON_LIBS="$withval $LIBS" |
|
22721 |
+ |
|
22722 |
+else |
|
22723 |
+ |
|
22724 |
+ json_linking="dynamic" |
|
22725 |
+ JSON_LIBS="-l${json_libname} $LIBS" |
|
22726 |
+ |
|
22727 |
+ |
|
22728 |
+fi |
|
22729 |
+ |
|
22715 | 22730 |
fi |
22716 | 22731 |
|
22717 | 22732 |
LIBS="$save_LIBS" |
... | ... |
@@ -36874,13 +36966,13 @@ fi |
36874 | 36874 |
|
36875 | 36875 |
$as_echo_n " clamsubmit : " |
36876 | 36876 |
if test "xyes" = "xno"; then : |
36877 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (disabled)" |
|
36877 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (disabled)" |
|
36878 | 36878 |
elif test "xyes" = "xyes"; then : |
36879 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)" |
|
36879 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)" |
|
36880 | 36880 |
elif test "xyes" = "x"; then : |
36881 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)" |
|
36881 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)" |
|
36882 | 36882 |
else |
36883 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (yes)" |
|
36883 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (yes)" |
|
36884 | 36884 |
fi |
36885 | 36885 |
|
36886 | 36886 |
else |
... | ... |
@@ -37098,13 +37190,13 @@ if test "X$have_json" = "Xyes"; then |
37098 | 37098 |
|
37099 | 37099 |
$as_echo_n " preclass : " |
37100 | 37100 |
if test "xyes" = "xno"; then : |
37101 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (disabled)" |
|
37101 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (disabled)" |
|
37102 | 37102 |
elif test "xyes" = "xyes"; then : |
37103 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)" |
|
37103 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)" |
|
37104 | 37104 |
elif test "xyes" = "x"; then : |
37105 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)" |
|
37105 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)" |
|
37106 | 37106 |
else |
37107 |
- $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (yes)" |
|
37107 |
+ $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (yes)" |
|
37108 | 37108 |
fi |
37109 | 37109 |
|
37110 | 37110 |
else |
... | ... |
@@ -37225,27 +37317,27 @@ fi |
37225 | 37225 |
# 4.0.x, and 4.1.0 are the known buggy versions |
37226 | 37226 |
# 3.4 doesn't have the bug |
37227 | 37227 |
if test "x$gcc_check" != "xyes"; then |
37228 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
|
37228 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
|
37229 | 37229 |
****** Optimizations disabled to avoid compiler bugs |
37230 | 37230 |
****** The resulting binaries will be slow! |
37231 | 37231 |
****** It is recommended to either upgrade or downgrade your compiler |
37232 |
-" >&5 |
|
37232 |
+ " >&5 |
|
37233 | 37233 |
$as_echo "$as_me: WARNING: |
37234 | 37234 |
****** Optimizations disabled to avoid compiler bugs |
37235 | 37235 |
****** The resulting binaries will be slow! |
37236 | 37236 |
****** It is recommended to either upgrade or downgrade your compiler |
37237 |
-" >&2;} |
|
37237 |
+ " >&2;} |
|
37238 | 37238 |
fi |
37239 | 37239 |
|
37240 | 37240 |
if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$bzip_check" != "xok" ; then |
37241 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
|
37241 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
|
37242 | 37242 |
****** WARNING: |
37243 | 37243 |
****** You are cross compiling to a different host or you are |
37244 | 37244 |
****** linking to bugged system libraries or you have manually |
37245 | 37245 |
****** disabled important configure checks. |
37246 | 37246 |
****** Please be aware that this build may be badly broken. |
37247 | 37247 |
****** DO NOT REPORT BUGS BASED ON THIS BUILD !!! |
37248 |
-" >&5 |
|
37248 |
+ " >&5 |
|
37249 | 37249 |
$as_echo "$as_me: WARNING: |
37250 | 37250 |
****** WARNING: |
37251 | 37251 |
****** You are cross compiling to a different host or you are |
... | ... |
@@ -37253,6 +37345,20 @@ $as_echo "$as_me: WARNING: |
37253 | 37253 |
****** disabled important configure checks. |
37254 | 37254 |
****** Please be aware that this build may be badly broken. |
37255 | 37255 |
****** DO NOT REPORT BUGS BASED ON THIS BUILD !!! |
37256 |
-" >&2;} |
|
37256 |
+ " >&2;} |
|
37257 | 37257 |
fi |
37258 | 37258 |
|
37259 |
+if test "X$have_json" = "Xyes" && test "x$json_linking" = "xdynamic"; then |
|
37260 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: |
|
37261 |
+****** libjson-c is known to share symbol names with other JSON libraries |
|
37262 |
+****** which may result in crashes for applications that use libclamav. |
|
37263 |
+****** Consider using --with-libjson-static=path/to/libjson-c.a, |
|
37264 |
+****** providing a json-c library that was compiled with CFLAGS=\"-fPIC\". |
|
37265 |
+ " >&5 |
|
37266 |
+$as_echo "$as_me: WARNING: |
|
37267 |
+****** libjson-c is known to share symbol names with other JSON libraries |
|
37268 |
+****** which may result in crashes for applications that use libclamav. |
|
37269 |
+****** Consider using --with-libjson-static=path/to/libjson-c.a, |
|
37270 |
+****** providing a json-c library that was compiled with CFLAGS=\"-fPIC\". |
|
37271 |
+ " >&2;} |
|
37272 |
+fi |
... | ... |
@@ -1233,7 +1233,7 @@ libclamav_internal_utils_la_SOURCES = str.c\ |
1233 | 1233 |
|
1234 | 1234 |
libclamav_internal_utils_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@ |
1235 | 1235 |
libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS) -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ |
1236 |
-libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ |
|
1236 |
+libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @PCRE_LIBS@ |
|
1237 | 1237 |
libclamav_internal_utils_nothreads_la_SOURCES = str.c\ |
1238 | 1238 |
conv.c \ |
1239 | 1239 |
conv.h \ |
... | ... |
@@ -1259,7 +1259,7 @@ libclamav_internal_utils_nothreads_la_SOURCES = str.c\ |
1259 | 1259 |
|
1260 | 1260 |
libclamav_internal_utils_nothreads_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@ |
1261 | 1261 |
libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
1262 |
-libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ |
|
1262 |
+libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @PCRE_LIBS@ |
|
1263 | 1263 |
SUBDIRS = $(am__append_6) |
1264 | 1264 |
@ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la |
1265 | 1265 |
@ENABLE_LLVM_TRUE@LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm |