--- configure.ac.orig	2020-09-28 08:43:13.000000000 +0100
+++ configure.ac	2021-09-22 11:46:25.000000000 +0100
@@ -15,12 +15,12 @@
 AC_PROG_CC
 AC_PROG_CC_C99
 
-dnl Find C++ compiler 
-AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) 
-if test "$HAVE_CXX" = "no"  
-then 
-  AC_MSG_ERROR([Could not find a c++ compiler]); 
-fi
+dnl Find C++ compiler
+dnl AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) 
+dnl if test "$HAVE_CXX" = "no"  
+dnl then 
+dnl   AC_MSG_ERROR([Could not find a c++ compiler]); 
+dnl fi
 
 # Checks for libraries.
 
@@ -74,9 +74,13 @@
   AC_MSG_ERROR([Could not find apxs on the path.])
 fi
 
-AC_SEARCH_LIBS([iniparser_load], [iniparser], [
-	AC_CHECK_HEADERS([iniparser.h], [have_system_iniparser=yes])
-])
+AC_SEARCH_LIBS([iniparser_load], [iniparser],
+    [
+        AC_CHECK_HEADERS([iniparser/iniparser.h], [have_system_iniparser=yes])
+    ],
+    [
+        AC_MSG_ERROR([Could not find iniparser library.])
+    ])
 AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
 if test "x$have_system_iniparser" = "xyes"; then
     AC_SUBST(SYSTEM_LIBINIPARSER, 1)