--- a/acinclude.m4
+++ b/acinclude.m4
@@ -320,17 +320,16 @@ mg_save_CPPFLAGS="$CPPFLAGS"
 ifelse($4, , , CPPFLAGS="$CPPFLAGS [$4]")
 
 AH_TEMPLATE([$3],[$5])
-AC_TRY_RUN([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <stdio.h>
-int main(int c, char **v) {
 $1
-#if $2
-  return 0;
-#else
-  return 1;
+#if !($2)
+#error condition not met
 #endif
+int main(int c, char **v) {
+  return 0;
 }
-], [:], [AC_DEFINE($3)])
+])], [:], [AC_DEFINE($3)])
 
 CPPFLAGS="$mg_save_CPPFLAGS"
 ])
@@ -1186,7 +1185,7 @@ int main(void)
   return 0;
 }
     ],
-    [has_safety_mkstemp=yes], [has_safety_mkstemp=no])
+    [has_safety_mkstemp=yes], [has_safety_mkstemp=no], [has_safety_mkstemp=yes])
   fi
   AH_TEMPLATE([HAVE_SAFETY_MKSTEMP],[Enable the use of mkstemp])
   if test x$has_safety_mkstemp = xno; then
--- a/configure.ac
+++ b/configure.ac
@@ -1197,7 +1197,7 @@ int main()
 		logical_unicode_str);
 	return 0;
 }
-], [:], [fribidi_in_path=no])
+], [:], [fribidi_in_path=no], [:])
   LIBS="$ac_save_LIBS"
   if test ! x"$fribidi_in_path" = xyes; then
     ac_save_CFLAGS="$CFLAGS"
@@ -1215,7 +1215,7 @@ int main()
 		logical_unicode_str);
 	return 0;
 }
-], [:], [with_bidi=no; problem_bidi=": Bad fribidi version, see config.log"])
+], [:], [with_bidi=no; problem_bidi=": Bad fribidi version, see config.log"], [:])
     CFLAGS="$ac_save_CFLAGS"
     LIBS="$ac_save_LIBS"
   fi
@@ -1237,7 +1237,7 @@ else
     int main(int c, char **v) {
       return FRIBIDI_CHARSET_NOT_FOUND * 0;
     }
-  ], [AC_DEFINE(FRIBIDI_CHARSET_SPELLING)])
+  ], [AC_DEFINE(FRIBIDI_CHARSET_SPELLING)], [], [:])
 fi
 AH_VERBATIM([_FRIBIDI_CHARSET_SPELLING],
 [#ifdef FRIBIDI_CHARSET_SPELLING