bb12234: Fix for oversight in libjson and libcurl detection code, so that --with-json=<path> will work.

NEWS.md

@@ -29,13 +29,17 @@ To address this issue, the internal `cltypes.h` header has been replaced by
 a `clamav-types.h` that is generated on `./configure` and will be installed
 alongside `clamav.h`.
 
-Additional Changes:
+### Other changes
+
 - Increased the default CommandReadTimeout to reduce the chance of mail loss
   if using clamav-milter with the TCP socket. Contribution by Scott Kitterman.
+- Fixes for `--with-libjson` and `--with-libcurl` to correctly accept library
+  install path arguments.
 
 ### Acknowledgements
 
 The ClamAV team thanks the following individuals for their code submissions:
+
 - Scott Kitterman
 
 ## 0.101.0

configure

@@ -22235,7 +22235,10 @@ if test "X$withval" = "Xyes"; then
     find_json="yes"
 else
     if test "X$withval" != "Xno"; then
-        LIBJSON_HOME="$withval"
+        if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then
+            LIBJSON_HOME="$withval"
+            have_json_header="yes"
+        fi
     fi
 fi
 
@@ -28844,7 +28847,10 @@ if test "X$withval" = "Xyes"; then
     find_curl="yes"
 else
     if test "X$withval" != "Xno"; then
-        LIBCURL_HOME="$withval"
+        if test -f "${withval}/bin/curl-config"; then
+            LIBCURL_HOME="$withval"
+            have_curl="yes"
+        fi
     fi
 fi
 

m4/reorganization/libs/curl.m4

@@ -12,7 +12,10 @@ if test "X$withval" = "Xyes"; then
     find_curl="yes"
 else
     if test "X$withval" != "Xno"; then
-        LIBCURL_HOME="$withval"
+        if test -f "${withval}/bin/curl-config"; then
+            LIBCURL_HOME="$withval"
+            have_curl="yes"
+        fi
     fi
 fi
 ],

m4/reorganization/libs/json.m4

@@ -12,7 +12,10 @@ if test "X$withval" = "Xyes"; then
     find_json="yes"
 else
     if test "X$withval" != "Xno"; then
-        LIBJSON_HOME="$withval"
+        if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then
+            LIBJSON_HOME="$withval"
+            have_json_header="yes"
+        fi
     fi
 fi
 ],