1 files changed, 5 insertions, 12 deletions

diff --git a/m4/gcc_check_builtin.m4 b/m4/gcc_check_builtin.m4
index 1434c5f80a..d5122502a6 100644
--- a/m4/gcc_check_builtin.m4
+++ b/m4/gcc_check_builtin.m4
@@ -1,20 +1,13 @@
 AC_DEFUN([EFL_CHECK_GCC_BUILTIN],
 [efl_check_gcc_builtin_save_libs=$LIBS
+EINA_CONFIGURE_$2=""
 LIBS="-lm $LIBS"
 AC_LINK_IFELSE(
 [AC_LANG_PROGRAM(
-[[#ifndef __GNUC__
-choke me
-#else
-#undef $1
-/* Declare this function with same prototype as __builtin_$1.
-  This removes warning about conflicting type with builtin */
-__typeof__(__builtin_$1) $1;
-
-__typeof__(__builtin_$1) *f = $1;
-#endif
-]], [[return f != $1;]]
+[[]], [[return __builtin_$1(42);]]
 )],
-[AC_DEFINE([$2], [123], [GCC builtin $1 exists])])
+[EINA_CONFIGURE_$2="#define EINA_$2"
+AC_DEFINE([$2], [1], [GCC builtin $1 exists])])
+AC_SUBST(EINA_CONFIGURE_$2)
 LIBS=$efl_check_gcc_builtin_save_libs])