1b03749
--- a/configure	2010-07-04 10:04:47.000000000 +0530
1b03749
+++ b/configure	2010-07-04 10:04:41.000000000 +0530
1b03749
@@ -5,7 +5,8 @@
1b03749
 CXX="g++"
1b03749
 enable_lcms="no"
1b03749
 enable_openmp="no"
1b03749
-CFLAGS="-O4 -I. -w $CFLAGS"
1b03749
+CFLAGS_DEFAULT="-O4 -w"
1b03749
+CFLAGS_ADD="-I."
1b03749
 LDFLAGS=
1b03749
 DESTDIR=""
1b03749
 PREFIX="/usr/local"
1b03749
@@ -121,14 +122,14 @@
1b03749
 if [ "$enable_lcms" = "yes" ]; then
1b03749
 	echo "yes"
1b03749
 	check_lib lcms cmsErrorAction $lcms_libs
1b03749
-	CFLAGS="$CFLAGS -DUSE_LCMS -I$lcms_headers"
1b03749
+	CFLAGS_DEFAULT="$CFLAGS_DEFAULT -DUSE_LCMS -I$lcms_headers"
1b03749
 else
1b03749
 	echo "no"
1b03749
 fi
1b03749
 
1b03749
 printf "Enable openmp support... "
1b03749
 if [ "$enable_openmp" = "yes" ]; then
1b03749
-	CFLAGS="$CFLAGS -fopenmp"
1b03749
+	CFLAGS_DEFAULT="$CFLAGS_DEFAULT -fopenmp"
1b03749
 	echo "yes"
1b03749
 else
1b03749
 	echo "no"
1b03749
@@ -141,7 +142,11 @@
1b03749
 
1b03749
 echo "CC = $CC" >> Makefile
1b03749
 echo "CXX = $CXX" >> Makefile
1b03749
-echo "CFLAGS = $CFLAGS" >> Makefile
1b03749
+if [ -z "$CFLAGS" ]; then
1b03749
+	echo "CFLAGS = $CFLAGS_ADD $CFLAGS_DEFAULT" >> Makefile
1b03749
+else
1b03749
+	echo "CFLAGS = $CFLAGS_ADD $CFLAGS" >> Makefile
1b03749
+fi
1b03749
 echo "CXXFLAGS = \$(CFLAGS)" >> Makefile
1b03749
 echo "LDFLAGS = $LDFLAGS" >> Makefile
1b03749
 echo "DESTDIR = $DESTDIR" >> Makefile