Merge build changes.

diff --git a/configure.ac b/configure.ac
index 86700a5e027ab569d8a84ce9f7d722635d2d302c..06033bfb44ca44b0b0737221bd1fa2bf8c000f8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ else
   building_from_bzr=no
 fi
 
-AC_PROG_CC
 AC_PROG_CC_C99
 AC_PROG_CXX
 
@@ -97,10 +96,6 @@ fi
 AC_SUBST(LD_VERSION_SCRIPT)
 AC_SUBST(LD_UTIL_VERSION_SCRIPT)
 
-# Use the C99 enabling flag found earlier
-AS_IF([test "$ac_cv_prog_cc_c99" != "no"],
-      [CFLAGS="$ac_cv_prog_cc_c99 ${CFLAGS}"])
-
 # Build optimized or debug version ?
 # First check for gcc and g++
 if test "$GCC" = "yes"