Commit dc9dbe56 authored by miller86's avatar miller86
Browse files

fixing quoting of CFLAGS/CXXFLAGS

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12428 18c085ea-50e0-402c-830e-de6fd14e8384
parent e8d33438
......@@ -1571,7 +1571,7 @@ echo $ECHO_N "checking for custom CFLAGS... $ECHO_C" >&6
if test "$CFLAGS" != ""; then
echo "$as_me:$LINENO: result: CFLAGS=\"$CFLAGS\"" >&5
echo "${ECHO_T}CFLAGS=\"$CFLAGS\"" >&6
VCONF_CFLAGS="-DVISIT_C_FLAGS:STRING=\"$CFLAGS\""
VCONF_CFLAGS="-DVISIT_C_FLAGS:STRING=$CFLAGS"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
......@@ -1582,7 +1582,7 @@ echo $ECHO_N "checking for custom CXXFLAGS... $ECHO_C" >&6
if test "$CXXFLAGS" != ""; then
echo "$as_me:$LINENO: result: CXXFLAGS=\"$CXXFLAGS\"" >&5
echo "${ECHO_T}CXXFLAGS=\"$CXXFLAGS\"" >&6
VCONF_CXXFLAGS="-DVISIT_CXX_FLAGS:STRING=\"$CXXFLAGS\""
VCONF_CXXFLAGS="-DVISIT_CXX_FLAGS:STRING=$CXXFLAGS"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
......@@ -1609,17 +1609,10 @@ fi
echo "$as_me:$LINENO: result: -- INVOKING CMAKE --" >&5
echo "${ECHO_T}-- INVOKING CMAKE --" >&6
echo $CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
$VCONF_JAVA \
$VCONF_PARALLEL \
$VCONF_SLIVR \
$VCONF_TUVOK \
$VCONF_DBIO_ONLY \
$VCONF_VMODULE \
$VCONF_INSTALL_THIRD_PARTY \
$VCONF_BUILDALL
$CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
set -x
$CMAKE . $VCONF_PREFIX \
"$VCONF_CFLAGS" \
"$VCONF_CXXFLAGS" \
$VCONF_JAVA \
$VCONF_PARALLEL \
$VCONF_SLIVR \
......@@ -1628,3 +1621,4 @@ $CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
$VCONF_VMODULE \
$VCONF_INSTALL_THIRD_PARTY \
$VCONF_BUILDALL
set +x
......@@ -301,7 +301,7 @@ VCONF_CXXFLAGS=""
AC_MSG_CHECKING(for custom CFLAGS)
if test "$CFLAGS" != ""; then
AC_MSG_RESULT(CFLAGS="$CFLAGS")
VCONF_CFLAGS="-DVISIT_C_FLAGS:STRING=\"$CFLAGS\""
VCONF_CFLAGS="-DVISIT_C_FLAGS:STRING=$CFLAGS"
else
AC_MSG_RESULT(no)
fi
......@@ -309,7 +309,7 @@ fi
AC_MSG_CHECKING(for custom CXXFLAGS)
if test "$CXXFLAGS" != ""; then
AC_MSG_RESULT(CXXFLAGS="$CXXFLAGS")
VCONF_CXXFLAGS="-DVISIT_CXX_FLAGS:STRING=\"$CXXFLAGS\""
VCONF_CXXFLAGS="-DVISIT_CXX_FLAGS:STRING=$CXXFLAGS"
else
AC_MSG_RESULT(no)
fi
......@@ -331,17 +331,10 @@ fi
#
AC_MSG_RESULT(-- INVOKING CMAKE --)
echo $CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
$VCONF_JAVA \
$VCONF_PARALLEL \
$VCONF_SLIVR \
$VCONF_TUVOK \
$VCONF_DBIO_ONLY \
$VCONF_VMODULE \
$VCONF_INSTALL_THIRD_PARTY \
$VCONF_BUILDALL
$CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
set -x
$CMAKE . $VCONF_PREFIX \
"$VCONF_CFLAGS" \
"$VCONF_CXXFLAGS" \
$VCONF_JAVA \
$VCONF_PARALLEL \
$VCONF_SLIVR \
......@@ -350,3 +343,4 @@ $CMAKE . $VCONF_PREFIX $VCONF_CFLAGS $VCONF_CXXFLAGS \
$VCONF_VMODULE \
$VCONF_INSTALL_THIRD_PARTY \
$VCONF_BUILDALL
set +x
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment