--- rules.mk.orig	2001-01-17 02:15:27.000000000 +0100
+++ rules.mk	2002-07-20 23:20:57.000000000 +0200
@@ -35,9 +35,9 @@
 #
 # C compilation flags (depends on DEBUG setting)
 #
-CPPFLAGS = $(CPPOPTS)
-CFLAGS = $(COPTS) -Wall -D_BSD_SOURCE -D_GNU_SOURCE
-CXXFLAGS = $(CXXOPTS)
+CPPFLAGS = $(CPPOPTS) $(AM_CPPFLAGS)
+CFLAGS = $(COPTS) $(AM_CFLAGS) -Wall -D_BSD_SOURCE -D_GNU_SOURCE
+CXXFLAGS = $(CXXOPTS) $(AM_CXXFLAGS)
 LDFLAGS = $(LDOPTS)
 
 ifeq ($(DEBUG),1)
@@ -45,10 +45,10 @@
 CXXFLAGS +=-fno-rtti -fno-exceptions
 LDFLAGS += -g
 else
-CFLAGS += -g -O6 -DDEBUG=0 -DNDEBUG
+CFLAGS += -g -O2 -DDEBUG=0 -DNDEBUG
 #CFLAGS += -fomit-frame-pointer  # really evil
 #CXXFLAGS += -fno-implement-inlines  # causes trouble with egcs 1.0
-CXXFLAGS += -fno-rtti -fno-exceptions
+CXXFLAGS += -fno-rtti -fno-exceptions -fno-implicit-templates
 LDFLAGS += -g
 endif