This commit is contained in:
parent
f8278f85f2
commit
2f073e3267
@ -1,42 +0,0 @@
|
||||
--- a/configure 2010-07-04 10:04:47.000000000 +0530
|
||||
+++ b/configure 2010-07-04 10:04:41.000000000 +0530
|
||||
@@ -5,7 +5,8 @@
|
||||
CXX="g++"
|
||||
enable_lcms="no"
|
||||
enable_openmp="no"
|
||||
-CFLAGS="-O4 -I. -w"
|
||||
+CFLAGS_DEFAULT="-O4 -w"
|
||||
+CFLAGS_ADD="-I."
|
||||
LDFLAGS=
|
||||
DESTDIR=""
|
||||
PREFIX="/usr/local"
|
||||
@@ -121,14 +122,14 @@
|
||||
if [ "$enable_lcms" = "yes" ]; then
|
||||
echo "yes"
|
||||
check_lib lcms cmsErrorAction $lcms_libs
|
||||
- CFLAGS="$CFLAGS -DUSE_LCMS -I$lcms_headers"
|
||||
+ CFLAGS_DEFAULT="$CFLAGS_DEFAULT -DUSE_LCMS -I$lcms_headers"
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
|
||||
printf "Enable openmp support... "
|
||||
if [ "$enable_openmp" = "yes" ]; then
|
||||
- CFLAGS="$CFLAGS -fopenmp"
|
||||
+ CFLAGS_DEFAULT="$CFLAGS_DEFAULT -fopenmp"
|
||||
echo "yes"
|
||||
else
|
||||
echo "no"
|
||||
@@ -141,7 +142,11 @@
|
||||
|
||||
echo "CC = $CC" >> Makefile
|
||||
echo "CXX = $CXX" >> Makefile
|
||||
-echo "CFLAGS = $CFLAGS" >> Makefile
|
||||
+if [ -z "$CFLAGS" ]; then
|
||||
+ echo "CFLAGS = $CFLAGS_ADD $CFLAGS_DEFAULT" >> Makefile
|
||||
+else
|
||||
+ echo "CFLAGS = $CFLAGS_ADD $CFLAGS" >> Makefile
|
||||
+fi
|
||||
echo "CXXFLAGS = \$(CFLAGS)" >> Makefile
|
||||
echo "LDFLAGS = $LDFLAGS" >> Makefile
|
||||
echo "DESTDIR = $DESTDIR" >> Makefile
|
Loading…
Reference in New Issue
Block a user