From 10706a0cba4033259b3332b73d88dd8c71c2ebc6 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 13 Jul 2009 09:12:33 -0400
Subject: [PATCH] Build all SSSD components with warnings enabled

Previously, only the SSSD server components were being built with
compile-time warnings enabled. This patch will ensure that all
components in common and sss_client are also built the same way.
---
 common/collection/Makefile.am  |   11 ++++++++++-
 common/collection/configure.ac |    2 ++
 common/dhash/Makefile.am       |    8 +++++++-
 common/dhash/configure.ac      |    2 ++
 common/ini/Makefile.am         |   11 ++++++++++-
 common/ini/configure.ac        |    2 ++
 sss_client/Makefile.am         |    5 +++++
 sss_client/configure.ac        |    2 ++
 8 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/common/collection/Makefile.am b/common/collection/Makefile.am
index fe07490..a802cf0 100644
--- a/common/collection/Makefile.am
+++ b/common/collection/Makefile.am
@@ -2,7 +2,16 @@
 TRACE_LEVEL=@TRACE_VAR@
 
 topdir=$(srcdir)/..
-AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
+
+AM_CFLAGS =
+if HAVE_GCC
+    AM_CFLAGS += \
+        -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+        -Wcast-align -Wwrite-strings
+endif
+
+AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
+
 ACLOCAL_AMFLAGS = -I m4
 
 # Set up the pkg-config file
diff --git a/common/collection/configure.ac b/common/collection/configure.ac
index 504cd4d..290a310 100644
--- a/common/collection/configure.ac
+++ b/common/collection/configure.ac
@@ -7,6 +7,8 @@ AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 
+AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
+
 m4_pattern_allow([AM_SILENT_RULES])
 AM_SILENT_RULES
 
diff --git a/common/dhash/Makefile.am b/common/dhash/Makefile.am
index 9037bf9..b8d5ce6 100644
--- a/common/dhash/Makefile.am
+++ b/common/dhash/Makefile.am
@@ -1,4 +1,10 @@
-AM_CPPFLAGS = -Wall
+AM_CFLAGS =
+if HAVE_GCC
+    AM_CFLAGS += \
+        -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+        -Wcast-align -Wwrite-strings
+endif
+
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/common/dhash/configure.ac b/common/dhash/configure.ac
index feabc48..bd21028 100644
--- a/common/dhash/configure.ac
+++ b/common/dhash/configure.ac
@@ -7,6 +7,8 @@ AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 
+AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
+
 m4_pattern_allow([AM_SILENT_RULES])
 AM_SILENT_RULES
 
diff --git a/common/ini/Makefile.am b/common/ini/Makefile.am
index 03d8912..dc30e94 100644
--- a/common/ini/Makefile.am
+++ b/common/ini/Makefile.am
@@ -2,7 +2,16 @@
 TRACE_LEVEL=@TRACE_VAR@
 
 topdir=$(srcdir)/..
-AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL)
+
+AM_CFLAGS =
+if HAVE_GCC
+    AM_CFLAGS += \
+        -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+        -Wcast-align -Wwrite-strings
+endif
+
+AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection $(TRACE_LEVEL)
+
 ACLOCAL_AMFLAGS = -I m4
 
 # Set up the pkg-config file
diff --git a/common/ini/configure.ac b/common/ini/configure.ac
index 14280cf..c4732cf 100644
--- a/common/ini/configure.ac
+++ b/common/ini/configure.ac
@@ -7,6 +7,8 @@ AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 
+AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
+
 m4_pattern_allow([AM_SILENT_RULES])
 AM_SILENT_RULES
 
diff --git a/sss_client/Makefile.am b/sss_client/Makefile.am
index 346e6b1..4552720 100644
--- a/sss_client/Makefile.am
+++ b/sss_client/Makefile.am
@@ -11,6 +11,11 @@ if WANT_AUX_INFO
     AM_CFLAGS += -aux-info $@.X
 endif
 
+if HAVE_GCC
+    AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \
+                 -Wcast-qual -Wcast-align -Wwrite-strings
+endif
+
 nsslibdir = @nsslibdir@
 pamlibdir = $(nsslibdir)/security
 
diff --git a/sss_client/configure.ac b/sss_client/configure.ac
index be1b4cc..97fc83d 100644
--- a/sss_client/configure.ac
+++ b/sss_client/configure.ac
@@ -11,6 +11,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.17])
 
+AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])
+
 m4_pattern_allow([AM_SILENT_RULES])
 AM_SILENT_RULES
 
-- 
1.6.2.5