diff --git a/Makefile.in b/Makefile.in
index fa94887..0d61c2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,8 +165,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \
 	$(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \
 	$(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \
 	$(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \
-	ac/compile ac/config.guess ac/config.sub ac/depcomp \
-	ac/install-sh ac/ltmain.sh ac/missing
+	ac/compile ac/config.guess ac/config.sub ac/install-sh \
+	ac/ltmain.sh ac/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/configure b/configure
index c59d89a..f96c5e5 100755
--- a/configure
+++ b/configure
@@ -14044,9 +14044,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memset" >&5
-$as_echo_n "checking __builtin_memset... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memset" >&5
+$as_echo_n "checking for __builtin_memset... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14072,8 +14071,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memcpy" >&5
-$as_echo_n "checking __builtin_memcpy... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memcpy" >&5
+$as_echo_n "checking for __builtin_memcpy... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14099,8 +14098,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memmove" >&5
-$as_echo_n "checking __builtin_memmove... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memmove" >&5
+$as_echo_n "checking for __builtin_memmove... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14126,8 +14125,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin_memcmp" >&5
-$as_echo_n "checking __builtin_memcmp... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memcmp" >&5
+$as_echo_n "checking for __builtin_memcmp... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/configure.ac b/configure.ac
index 0e4ee78..d8c238a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,39 +70,34 @@ AC_SUBST(LIBM, $LIBM)
 
 AX_PTHREAD()
 
-
 dnl check some compiler builtins
-AC_MSG_CHECKING([__builtin_memset])
-AC_TRY_LINK(
-	[],
-	[__builtin_memset ((void*)1, ' ', 10);],
+AC_MSG_CHECKING([for __builtin_memset])
+AC_LINK_IFELSE(
+	[AC_LANG_PROGRAM([], [__builtin_memset ((void*)1, ' ', 10);])],
 	[AC_MSG_RESULT(yes)
 	 AC_DEFINE([HAVE___BUILTIN_MEMSET], [1], [__builtin_memset])],
 	[AC_MSG_RESULT(no)]
 )
 
-AC_MSG_CHECKING([__builtin_memcpy])
-AC_TRY_LINK(
-	[],
-	[__builtin_memcpy ((void*)1, (void*)2, 10);],
+AC_MSG_CHECKING([for __builtin_memcpy])
+AC_LINK_IFELSE(
+	[AC_LANG_PROGRAM([], [__builtin_memcpy ((void*)1, (void*)2, 10);])],
 	[AC_MSG_RESULT(yes)
 	 AC_DEFINE([HAVE___BUILTIN_MEMCPY], [1], [__builtin_memcpy])],
 	[AC_MSG_RESULT(no)]
 )
 
-AC_MSG_CHECKING([__builtin_memmove])
-AC_TRY_LINK(
-	[],
-	[__builtin_memmove ((void*)1, (void*)2, 10);],
+AC_MSG_CHECKING([for __builtin_memmove])
+AC_LINK_IFELSE(
+	[AC_LANG_PROGRAM([], [__builtin_memmove ((void*)1, (void*)2, 10);])],
 	[AC_MSG_RESULT(yes)
 	 AC_DEFINE([HAVE___BUILTIN_MEMMOVE], [1], [__builtin_memmove])],
 	[AC_MSG_RESULT(no)]
 )
 
-AC_MSG_CHECKING([__builtin_memcmp])
-AC_TRY_LINK(
-	[],
-	[int a = __builtin_memcmp ((void*)1, (void*)2, 10);],
+AC_MSG_CHECKING([for __builtin_memcmp])
+AC_LINK_IFELSE(
+	[AC_LANG_PROGRAM([], [int a = __builtin_memcmp ((void*)1, (void*)2, 10);])],
 	[AC_MSG_RESULT(yes)
 	 AC_DEFINE([HAVE___BUILTIN_MEMCMP], [1], [__builtin_memcmp])],
 	[AC_MSG_RESULT(no)]