Only use -Wall and gcc-only flags with gcc.

2005-12-28  Tollef Fog Heen  <tfheen@err.no>

	* configure.in, Makefile.am: Only use -Wall and other gcc-only
	flags when we don't have a set of CFLAGS already set and we're
	using gcc.  Freedesktop #4888.

diff --git a/ChangeLog b/ChangeLog
index 94d8a2b9c2306b5b7e705fb76d80563930c1a5c7..2787525c5e9d711493d1784446512d984865c55c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-28  Tollef Fog Heen  <tfheen@err.no>
+
+       * configure.in, Makefile.am: Only use -Wall and other gcc-only
+       flags when we don't have a set of CFLAGS already set and we're
+       using gcc.  Freedesktop #4888.
+
 2005-10-17  Tollef Fog Heen  <tfheen@err.no>
 
        * pkg.m4: Do AC_MSG_RESULT([no]) even if $4 is set (so we don't

diff --git a/Makefile.am b/Makefile.am
index ee81bb4e787e2234ce8df1380e003405d2dc5b27..4fcde308d635d45b3c76d9b1d7a8f70c4cf2d70d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ man_MANS = pkg-config.1
 EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
 
 bin_PROGRAMS = pkg-config
-AM_CFLAGS=-g -Wall -O2
+AM_CFLAGS=@WARN_CFLAGS@
 
 INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes)
 

diff --git a/configure.in b/configure.in
index 3d7437dd8fc556b2dd1a51bb0b1683d0083a2037..543228909205d294a93b5cc1921556668b6a0201 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -58,6 +58,16 @@ or auto])
 esac
 AC_MSG_RESULT($use_indirect_deps)
 
+#
+# Choose default CFLAGS and warnings depending on compiler.
+#
+
+WARN_CFLAGS=""
+if test "${GCC}" = "yes" && test "${ac_env_CFLAGS_set}" != "set"; then
+   WARN_CFLAGS="-g -Wall -O2"
+fi
+AC_SUBST(WARN_CFLAGS)
+
 AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones])
 
 AC_MSG_CHECKING([for Win32])