Bug 729001 - Work around warnings invalid for C++

configure.ac

@@ -1013,7 +1013,12 @@ then
   then
     enable_compile_warnings="yes"
   fi
+#Save CFLAGS so that we can put the warnings in AM_CFLAGS
+  __cflags="$CFLAGS"
+  CFLAGS=
   GNOME_COMPILE_WARNINGS
+  AM_CFLAGS="$CFLAGS"
+  CFLAGS="$__cflags"
 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
   AS_SCRUB_INCLUDE(GTK_CFLAGS)
@@ -1142,7 +1147,7 @@ else
   if test ${GCC}x = yesx
   then
     # We should always see these errors...
-    CFLAGS="${CFLAGS} -Wall"
+    AM_CFLAGS="${AM_CFLAGS} -Wall"
   fi
 
 fi
@@ -1267,7 +1272,7 @@ AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
 if test ${GCC}x = yesx
 then
   warnFLAGS=
-  CFLAGS="${CFLAGS} -Wno-unused"
+  AM_CFLAGS="${AM_CFLAGS} -Wno-unused"
   # other flags...
   # These next two are included in the GNOME_COMPILE_WARNINGS
   #warnFLAGS="${warnFLAGS} -Wmissing-prototypes"
@@ -1318,10 +1323,11 @@ then
          fi
     fi
   fi
-  CFLAGS="${warnFLAGS} ${CFLAGS}"
+  AM_CFLAGS="${warnFLAGS} ${AM_CFLAGS}"
 else
   warnFLAGS=none
 fi
+AC_SUBST(AM_CFLAGS)
 AC_MSG_RESULT($warnFLAGS)
 
 ### --------------------------------------------------------------------------

src/bin/Makefile.am

@@ -56,7 +56,8 @@ gnucash_LDADD = \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
-  ${GTK_LIBS}
+  ${GTK_LIBS} \
+  -lprofiler
 
 GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
 

src/engine/Makefile.am

@@ -130,7 +130,7 @@ noinst_SCRIPTS = iso-currencies-to-c
 
 libgncmod_engine_la_LDFLAGS = -avoid-version
 if CLANG
-libgncmod_engine_la_CFLAGS = -Wno-invalid-source-encoding
+libgncmod_engine_la_CFLAGS = ${AM_CFLAGS} -Wno-invalid-source-encoding
 endif
 libgncmod_engine_la_LIBADD = \
   ../gnc-module/libgnc-module.la \

src/libqof/qof/Makefile.am

@@ -86,7 +86,7 @@ libmd5_la_SOURCES = md5.c
 libmd5_la_CFLAGS = -fno-strict-aliasing
 
 libgnc_qof_la_LIBADD += libmd5.la
-libgnc_qof_la_CFLAGS = -xc++
+libgnc_qof_la_CFLAGS = -xc++ -Wall -Werror
 
 EXTRA_DIST += \
   qofmath128.c
@@ -104,5 +104,6 @@ test_qofmath_SOURCES = gnc-numeric.cpp
 test_qofmath_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_128_BIT_MULT
 test_qofmath_LDFLAGS = $(libgnc_qof_la_LDFLAGS)
 test_qofmath_LDADD = $(libgnc_qof_common_libs)
+test_qofmath_CXXFLAGS = -Wall -Werror
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"qof\"