1 files changed, 35 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index 557bd0cd..c8a7c3f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,19 +89,42 @@ MHD_LIBDEPS=""
 MHD_REQ_PRIVATE=''
 MHD_LIBDEPS_PKGCFG=''
 
-AC_CHECK_TYPE([_Bool],
-  [ AC_DEFINE([_MHD_bool],[_Bool],[Define to type which will be used as boolean type.]) ],
+AH_TEMPLATE([[HAVE_STDBOOL_H]], [Define to 1 if you have the <stdbool.h> header file and <stdbool.h> defines 'bool' type.])
+AH_TEMPLATE([[HAVE_REAL_BOOL]], [Define to 1 if you have the real boolean type.])
+AH_TEMPLATE([[bool]], [Define to type name which will be used as boolean type.])
+AC_CHECK_HEADER([stdbool.h],
   [
-    AC_CHECK_HEADER([stdbool.h], [ AC_DEFINE([HAVE_STDBOOL_H],[1],[Define to 1 if you have the <stdbool.h> header file and it's required for _MHD_bool.]) ], [], [AC_INCLUDES_DEFAULT])
-    AC_CHECK_TYPE([bool],
-      [ AC_DEFINE([_MHD_bool],[bool]) ],
-      [ AC_DEFINE([_MHD_bool],[int]) ],
-      [[
-#ifdef HAVE_STDBOOL_H
+   AC_CHECK_TYPE([bool],
+     [
+      AC_DEFINE([[HAVE_STDBOOL_H]], [[1]])
+      AC_DEFINE([[HAVE_REAL_BOOL]], [[1]])
+     ],
+     [
+      AC_MSG_WARN([[Header <stdbool.h> is present, but "bool" type cannot be detected. Check compiler flags.]])
+      AC_DEFINE([[bool]], [[int]])
+     ], [
 #include <stdbool.h>
-#endif
-      ]])
-  ])
+        ]
+   )
+  ],
+  [
+   AC_CHECK_TYPE([bool],
+     [AC_DEFINE([[HAVE_REAL_BOOL]], [[1]])],
+     [
+      AC_CHECK_TYPE([_Bool],
+        [
+         AC_DEFINE([[HAVE_REAL_BOOL]], [[1]])
+         AC_DEFINE([[bool]], [[_Bool]])
+        ],
+        [
+         AC_DEFINE([[bool]], [[int]])
+        ], []
+      )
+     ], []
+   )
+  ],
+  [AC_INCLUDES_DEFAULT]
+)
 
 AX_CHECK_COMPILE_FLAG([[-Werror=attributes]],
                       [[errattr_CFLAGS="-Werror=attributes"]],
@@ -131,7 +154,7 @@ choke me
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
 #endif
-         static $inln_prfx_chk _MHD_bool cmpfn(int x, int y)
+         static $inln_prfx_chk bool cmpfn(int x, int y)
          { return x > y; }
          static $inln_prfx_chk int sumfn(int x, int y)
          { return x + y; }