Tweak builtin checks

diff --git a/acinclude.m4 b/acinclude.m4
index 592b584..c38bb07 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -459,47 +459,41 @@ AC_DEFUN([VL_LIB_READLINE], [
 ])dnl
 
 dnl #
-dnl #  Figure out which storage class specifier for Thread Local Storage is supported by the compiler
+dnl #  Check if we have the choose expr builtin
 dnl #
 AC_DEFUN([FR_HAVE_BUILTIN_CHOOSE_EXPR],
 [
-dnl #
-dnl #  See if the compilation works with __thread, for thread-local storage
-dnl #
   AC_MSG_CHECKING(for __builtin_choose_expr support in compiler)
   AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
       [[
         int main(int argc, char **argv) {
-               return __builtin_choose_expr(0, 1, 0);
+          return __builtin_choose_expr(0, 1, 0);
         }
       ]])
-    ],[have_builtin=yes],[have_builtin=no],[have_builtin=no])
-  AC_MSG_RESULT($have_builtin)
-  if test "x$have_builtin" = "xyes"; then
+    ],[have_builtin_choose_expr=yes],[have_builtin_choose_expr=no],[have_builtin_choose_expr=no])
+  AC_MSG_RESULT($have_builtin_choose_expr)
+  if test "x$have_builtin_choose_expr" = "xyes"; then
     AC_DEFINE([HAVE_BUILTIN_CHOOSE_EXPR],1,[Define if the compiler supports __builtin_choose_expr])
   fi
 ])
 
 dnl #
-dnl #  Figure out which storage class specifier for Thread Local Storage is supported by the compiler
+dnl #  Check if we have the types compatible p builtin
 dnl #
 AC_DEFUN([FR_HAVE_BUILTIN_TYPES_COMPATIBLE_P],
 [
-dnl #
-dnl #  See if the compilation works with __thread, for thread-local storage
-dnl #
   AC_MSG_CHECKING(for __builtin_types_compatible_p support in compiler)
   AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
       [[
         int main(int argc, char **argv) {
-               return !(__builtin_types_compatible_p(char *, char *));
+          return !(__builtin_types_compatible_p(char *, char *));
         }
       ]])
-    ],[have_builtin=yes],[have_builtin=no],[have_builtin=no])
-  AC_MSG_RESULT($have_builtin)
-  if test "x$have_builtin" = "xyes"; then
+    ],[have_builtin_types_compatible_p=yes],[have_builtin_types_compatible_p=no],[have_builtin_types_compatible_p=no])
+  AC_MSG_RESULT($have_builtin_types_compatible_p)
+  if test "x$have_builtin_types_compatible_p" = "xyes"; then
     AC_DEFINE([HAVE_BUILTIN_TYPES_COMPATIBLE_P],1,[Define if the compiler supports __builtin_types_compatible_p])
   fi
 ])