integrate external libraries as subproject

Instead of inlining external libraries it is
benefictial to dynamically integrate them to
get the latest bugfixes etc.
Meson provides the features subproject() and
a wrap dependency system. Using these the
currently used libraries inih and hashmap.c
can be dynamically integrated to a specific
revision of the project - replacing the
inlined library code.

Signed-off-by: Michael Engel <[email protected]>

.gitignore

@@ -7,6 +7,8 @@ builddir/
 hirte.spec
 rpmbuild/
 artifacts/
+subprojects/inih/
+subprojects/hashmap.c/
 ## python build artifacts
 build/
 dist/

meson.build

@@ -46,6 +46,13 @@ config_h = configure_file(
 add_project_arguments('-include', 'config.h', language : 'c')
 
 
+# (External) subprojects used by hirte
+inih = subproject('inih', default_options: ['default_library=static'])
+inih_dep = inih.get_variable('inih_dep')
+
+hashmapc = subproject('hashmap.c', default_options: ['default_library=static', 'werror=false'])
+hashmapc_dep = hashmapc.get_variable('hashmapc_dep')
+
 # Subdirectory for the shared library.
 subdir('src/libhirte')
 

src/agent/agent.h

@@ -5,9 +5,10 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 
+#include <hashmap.h>
+
 #include "libhirte/common/cfg.h"
 #include "libhirte/common/common.h"
-#include "libhirte/hashmap/hashmap.h"
 
 #include "types.h"
 

src/agent/meson.build

@@ -13,6 +13,8 @@ executable(
   node_src,
   dependencies: [
     systemd_dep,
+    inih_dep, 
+    hashmapc_dep,
   ],
   link_with: [
     hirte_lib,

src/libhirte/common/cfg.c

@@ -8,10 +8,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <hashmap.h>
+
+#include "ini.h"
 #include "libhirte/common/list.h"
 #include "libhirte/common/network.h"
-#include "libhirte/hashmap/hashmap.h"
-#include "libhirte/ini/ini.h"
 
 #include "cfg.h"
 #include "common.h"