Turn off optimisation for test build.

Author: fragglet

configure.ac

@@ -9,18 +9,31 @@ AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+if [[ "$GCC" = "yes" ]]; then
+	is_gcc=true
+else
+	is_gcc=false
+fi
+
+TEST_CFLAGS=""
+
+# Turn on all warnings for gcc.  Turn off optimisation for the test build.
+
+if $is_gcc; then
+	CFLAGS="$CFLAGS -Wall"
+	TEST_CFLAGS="$TEST_CFLAGS -Wall -O0"
+fi
+
 # Support for coverage analysis via gcov:
 
 coverage=no
 AC_ARG_ENABLE(coverage, 
 [  --enable-coverage       Enable coverage testing. ],
 [ coverage=yes ])
 
-COV_FLAGS=""
-
 if [[ "$coverage" = "yes" ]]; then
-        if [[ "$GCC" = "yes" ]]; then
-                COV_FLAGS="-fprofile-arcs -ftest-coverage"
+        if $is_gcc; then
+                TEST_CFLAGS="$TEST_CFLAGS -fprofile-arcs -ftest-coverage"
         else
                 AC_MSG_ERROR([Can only enable coverage when using gcc.])
         fi
@@ -43,9 +56,16 @@ fi
 
 AM_CONDITIONAL(USE_VALGRIND, $use_valgrind)
 
+# Save the default CFLAGS and clear them, so that the test build
+# of the library doesn't get the optimisation flags.
+
+MAIN_CFLAGS="$CFLAGS"
+CFLAGS=""
+
 AM_CONFIG_HEADER(config.h:config.h.in)
 
-AC_SUBST(COV_FLAGS)
+AC_SUBST(MAIN_CFLAGS)
+AC_SUBST(TEST_CFLAGS)
 AC_SUBST(ac_aux_dir)
 
 AC_OUTPUT([

src/Makefile.am

@@ -1,6 +1,4 @@
 
-AM_CFLAGS = -Wall
-
 check_LIBRARIES=libcalgtest.a
 lib_LTLIBRARIES=libcalg.la
 
@@ -18,9 +16,10 @@ avl-tree.c     compare-string.c   hash-string.c   queue.c  trie.c        \
 compare-int.c  hash-int.c         hash-table.c    set.c    binary-heap.c \
 bloom-filter.c binomial-heap.c
 
-libcalgtest_a_CFLAGS=$(COV_FLAGS) -O0 -DALLOC_TESTING -I../test
+libcalgtest_a_CFLAGS=$(TEST_CFLAGS) -DALLOC_TESTING -I../test
 libcalgtest_a_SOURCES=$(SRC) $(MAIN_HEADERFILES)
 
+libcalg_la_CFLAGS=$(MAIN_CFLAGS)
 libcalg_la_SOURCES=$(SRC) $(MAIN_HEADERFILES) $(CALG_HEADERFILES)
 
 headerfilesdir=$(includedir)/libcalg-1.0

test/Makefile.am

@@ -27,7 +27,7 @@ libtestframework_a_SOURCES=\
 alloc-testing.c      alloc-testing.h        \
 framework.c          framework.h
 
-AM_CFLAGS = $(COV_FLAGS) -I../src -Wall
+AM_CFLAGS = $(TEST_CFLAGS) -I../src
 LDADD = $(top_builddir)/src/libcalgtest.a libtestframework.a
 
 EXTRA_DIST=valgrind-wrapper