Merge pull request #18 from hydroxycarbamide/master

Fix build compilation errors with new iniparser 4.2.2
LukashonakV · May 23, 2024 · a02946c · a02946c
2 parents ca02eef + 49d97ad
commit a02946c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/meson.build b/meson.build
@@ -65,9 +65,15 @@ endif
 
 ### Iniparser
 iniparser_dep = cc.find_library('iniparser', has_headers: 'iniparser.h', required: false)
+
+if not iniparser_dep.found()
+   iniparser_dep = cc.find_library('iniparser', has_headers: 'iniparser/iniparser.h', required: false)
+endif
+
 if not iniparser_dep.found()
    iniparser_dep = cc.find_library('iniparser4', has_headers: 'iniparser4/iniparser.h', required: false)
 endif
+
 if not iniparser_dep.found()
    error('iniparser library is required')
 else

diff --git a/src/config.c b/src/config.c
@@ -6,6 +6,8 @@
 #ifndef _MSC_VER
 #if __has_include(<iniparser.h>)
 #include <iniparser.h>
+#elif __has_include(<iniparser/iniparser.h>)
+#include <iniparser/iniparser.h>
 #elif __has_include(<iniparser4/iniparser.h>)
 #include <iniparser4/iniparser.h>
 #endif