diff -ur mead-2.2.5.orig/apps/libmso/Makefile.in mead-2.2.5/apps/libmso/Makefile.in
--- mead-2.2.5.orig/apps/libmso/Makefile.in	2004-12-10 12:33:49.000000000 -0800
+++ mead-2.2.5/apps/libmso/Makefile.in	2005-12-17 12:43:10.000000000 -0800
@@ -35,8 +35,8 @@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 
 ALL_CPPFLAGS	= -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS)
-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
+ALL_CXXFLAGS	= @CXXFLAGS@
+ALL_CFLAGS	= @CFLAGS@
 
 .SUFFIXES:
 .SUFFIXES: .cc .o
diff -ur mead-2.2.5.orig/apps/Makefile.common.in mead-2.2.5/apps/Makefile.common.in
--- mead-2.2.5.orig/apps/Makefile.common.in	2004-11-19 14:49:56.000000000 -0800
+++ mead-2.2.5/apps/Makefile.common.in	2005-12-17 12:38:33.000000000 -0800
@@ -36,10 +36,10 @@
 LIBS		= @LIBS@ -lm
 
 ALL_CPPFLAGS	= -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS)
-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
+ALL_CXXFLAGS	= @CXXFLAGS@
+ALL_CFLAGS	= @CFLAGS@
 
-CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \
+CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \
            $(LDFLAGS)
 
 .SUFFIXES: .cc .o
diff -ur mead-2.2.5.orig/libmead/Makefile.in mead-2.2.5/libmead/Makefile.in
--- mead-2.2.5.orig/libmead/Makefile.in	2004-12-10 13:14:40.000000000 -0800
+++ mead-2.2.5/libmead/Makefile.in	2005-12-17 12:40:12.000000000 -0800
@@ -99,8 +99,8 @@
 INCLUDES	= -I$(top_srcdir)
 
 ALL_CPPFLAGS	= $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS)
-ALL_CXXFLAGS	= $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS)
-ALL_CFLAGS	= $(CC_DEBUGFLAGS) $(CC_OPTFLAGS)
+ALL_CXXFLAGS	= @CXXFLAGS@
+ALL_CFLAGS	= @CFLAGS@
 
 
 
diff -ur mead-2.2.5.orig/swig/Makefile.in mead-2.2.5/swig/Makefile.in
--- mead-2.2.5.orig/swig/Makefile.in	2004-12-09 10:37:41.000000000 -0800
+++ mead-2.2.5/swig/Makefile.in	2005-12-17 12:51:47.000000000 -0800
@@ -58,7 +58,7 @@
 CXX_FLAGS	= @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@
 CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@
 
-ALL_CXXFLAGS	= $(CPP_FLAGS) $(CXX_FLAGS)
+ALL_CXXFLAGS	= $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@
 
 MEADINC		= -I$(top_srcdir) -I$(srcdir)
 MEADLIBS	= -L../libmead -lmead