[vcpkg.json] Add my new libbsd port (on Linux) ; [acquire/CMakeLists.txt] Fix libbsd resolution ; [acquire/acquire_string_extras.h] Fix double-definition warning

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -266,7 +266,13 @@ else ()
     if (NOT BSD)
         find_package(LibBSD)
         if (LibBSD_FOUND)
-            target_link_directories("${LIBRARY_NAME}_lib" PUBLIC "${BSD_LIBRARY}")
+            if (NOT DEFINED LibBSD_LIBRARIES)
+                set(LibBSD_LIBRARIES "${BSD_LIBRARY}")
+            endif (NOT DEFINED LibBSD_LIBRARIES)
+            target_link_directories("${LIBRARY_NAME}_lib" PUBLIC "${LibBSD_LIBRARIES}")
+            if (DEFINED LibBSD_INCLUDEDIR)
+                target_include_directories("${LIBRARY_NAME}_lib" PUBLIC "${LibBSD_INCLUDEDIR}")
+            endif (DEFINED LibBSD_INCLUDEDIR)
             target_compile_definitions("${LIBRARY_NAME}_lib" PUBLIC HAVE_STRNSTR=1)
             target_compile_definitions("${LIBRARY_NAME}_lib" PUBLIC HAVE_LIBBSD=1)
         endif (LibBSD_FOUND)

acquire/acquire_string_extras.h

@@ -61,7 +61,7 @@ extern "C" {
 #endif /* defined(__APPLE__) && defined(__MACH__) */
 
 #if defined(BSD) && (BSD >= 199306) && !defined(__linux__) &&                  \
-    !defined(linux) && !defined(__linux)
+    !defined(linux) && !defined(__linux) && !defined(HAVE_STRNSTR)
 #define HAVE_STRNSTR
 #endif /* defined(BSD) && (BSD >= 199306) && !defined(__linux__) &&            \
           !defined(linux) && !defined(__linux) */

vcpkg.json

@@ -3,6 +3,10 @@
   "version-string": "0.0.1",
   "dependencies": [
     "libarchive",
-    "rhash"
+    "rhash",
+    {
+      "name": "libbsd",
+      "platform": "linux"
+    }
   ]
 }