Index: autogen.sh
--- autogen.sh.orig	2009-05-14 12:51:44 +0200
+++ autogen.sh	2009-05-14 14:44:24 +0200
@@ -9,14 +9,14 @@
 echo "bin_PROGRAMS = ${PROGS}" >>$OUT
 echo "noinst_LIBRARIES = libcommon.a" >>$OUT
 echo "libcommon_a_SOURCES = $COMMON" >>$OUT
-echo "libcommon_a_CPPFLAGS = -Iinclude/" >>$OUT
+echo "libcommon_a_CPPFLAGS = @CPPFLAGS@ -Iinclude/" >>$OUT
 
 for i in $PROGS ; do
 	SOURCES=`echo src/$i/*.cpp`
 	echo "${i}_SOURCES = $SOURCES" >>$OUT
-	echo "${i}_CPPFLAGS = -Isrc/$i/ -Iinclude/" >>$OUT
+	echo "${i}_CPPFLAGS = @CPPFLAGS@ -Isrc/$i/ -Iinclude/" >>$OUT
 	echo "${i}_LDADD = libcommon.a" >>$OUT
-	echo "${i}_LDFLAGS = " >>$OUT #empty for future use.
+	echo "${i}_LDFLAGS = @LDFLAGS@ " >>$OUT #empty for future use.
 	[ -f src/$i/Makefile.am.extra ] &&
 		while read l ; do
 			[ "$l" ] && echo "${i}_${l}" >>$OUT
