diff --git a/.travis.yml b/.travis.yml
index 017992e98..58147a19d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,7 @@ script:
   else
     mkdir build-dir;
     cd build-dir;
-    cmake -DCMAKE_CXX_FLAGS='-Wall -Wextra -Wno-unused-parameter -pedantic' -DCMAKE_C_FLAGS='-Wall' -DWITH_STARTUPLOG=ON -DWITH_TEST=ON ..;
+    cmake -DCMAKE_CXX_FLAGS='-Wall -Wextra -Wno-unused-parameter -pedantic' -DCMAKE_C_FLAGS='-Wall -Wextra -Wno-unused-parameter' -DWITH_STARTUPLOG=ON -DWITH_TEST=ON ..;
     make -j2 || travis_terminate 1;
     make test || travis_terminate 1;
   fi
diff --git a/configure.ac b/configure.ac
index 9c1512a01..a906b9d1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,11 +142,9 @@ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable
 AS_IF([test x$enable_compiler_flags != xno], [
   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
-  AC_C_FLAG([-std=gnu99])
+
+  # For mac compiler which still stuck on c++98
   AC_CXX_FLAG([-std=c++11])
-  AC_CXX_FLAG([-Wno-narrowing])
-  AC_C_FLAG([-Wno-unused-local-typedefs])
-  AC_CXX_FLAG([-Wno-unused-local-typedefs])
 
   # -O* messes with debugging.
   AS_IF([test x$enable_debug = xyes], [