--- configure.orig	Sat Aug 16 01:54:31 2003
+++ configure	Fri Jul  4 22:09:43 2008
@@ -5515,9 +5515,9 @@ echo "${ECHO_T}libraries $x_libraries, headers $x_incl
 fi
 
 
-CFLAGS="-I $x_includes"
-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-CXXFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -I$x_includes"
+LDFLAGS="$LDFLAGS -L$x_libraries -L$libdir"
+CXXFLAGS="$CXXFLAGS -I$x_includes"
 
 
 echo "$as_me:$LINENO: checking for main in -lXmu" >&5
