X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=configure.ac;h=ec5b65898d6d14f161557937e89f17406eb71732;hb=048bd6f9e7f316aafede310ba273776d0086b8ed;hp=c59f94205a5a489aa617b2c579b71c371e1b4bfd;hpb=dbafded223070ff12b0e321f21e6122ac5247e6e;p=coloredstderr%2Fcoloredstderr.git

diff --git a/configure.ac b/configure.ac
index c59f942..ec5b658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,11 @@ dnl Used by test suite.
 AC_PROG_SED
 AC_PROG_EGREP
 
-AC_CHECK_HEADERS([fcntl.h])
+if test "x$GCC" = xyes; then
+    CFLAGS="-Wall -Wextra -Wconversion $CFLAGS"
+fi
+
+AC_CHECK_HEADERS([fcntl.h error.h])
 
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
@@ -41,10 +45,16 @@ AC_TYPE_SSIZE_T
 AC_C_INLINE
 
 AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_CHECK_FUNCS([dup2 memmove setenv strdup])
 
+dnl Thanks to gperftools' configure.ac (https://code.google.com/p/gperftools).
+AC_MSG_CHECKING([for __builtin_expect])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([],[return __builtin_expect(main != 0, 1)])],
+               [AC_DEFINE([HAVE___BUILTIN_EXPECT], 1,
+                          [Define to 1 if the compiler supports __builtin_expect().])
+                AC_MSG_RESULT([yes])],
+               [AC_MSG_RESULT([no])])
+
 AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([dlsym() is required])])
 
 AC_ARG_ENABLE([debug],
@@ -53,5 +63,8 @@ AC_ARG_ENABLE([debug],
                    AC_DEFINE([DEBUG], 1, [Define to enable debug output.])
                fi])
 
+dnl Used in tests/Makefile.am to build the test only if error() is available.
+AM_CONDITIONAL([HAVE_ERROR_H],[test "x$ac_cv_header_error_h" = xyes])
+
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 AC_OUTPUT