summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-07-23 14:54:03 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-07-23 14:54:03 -0300
commitb425ec957a2dc92b872c26b80559bfaca625b121 (patch)
tree781d3033db9c0826a44d734000a3319a00fe5a17
parentcb10e929f20cfa2f971e2bee80e8b82b9989ad65 (diff)
cxx: Fixed --disable-c++11 option
The use of AM_CONDITIONAL for setting LDFLAGS and CXXFLAGS was wrong because it ends up setting HAVE_CXX11 unconditionally.
-rw-r--r--configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 5e6248e46..6188c0561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,13 +246,15 @@ if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
246 evas-cxx >= efl_version \ 246 evas-cxx >= efl_version \
247 " 247 "
248 have_cxx11="yes" 248 have_cxx11="yes"
249 LDFLAGS="${LDFLAGS} -shared -fPIC -DPIC"
250 CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"
249 ], 251 ],
250 [have_cxx11="no"] 252 [have_cxx11="no"]
251 ) 253 )
254else
255 have_cxx11="no"
252fi 256fi
253AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"]) 257AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"])
254AM_CONDITIONAL([HAVE_CXX11], [LDFLAGS="${LDFLAGS} -shared -fPIC -DPIC"])
255AM_CONDITIONAL([HAVE_CXX11], [CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"])
256 258
257have_elementary_x="no" 259have_elementary_x="no"
258want_elementary_x="auto" 260want_elementary_x="auto"
@@ -772,7 +774,9 @@ echo
772echo "Compilation................: make (or gmake)" 774echo "Compilation................: make (or gmake)"
773echo " CPPFLAGS.................: $CPPFLAGS" 775echo " CPPFLAGS.................: $CPPFLAGS"
774echo " CFLAGS...................: $CFLAGS" 776echo " CFLAGS...................: $CFLAGS"
777if test "x${have_cxx11}" = "xyes"; then
775echo " CXXFLAGS.................: $CXXFLAGS" 778echo " CXXFLAGS.................: $CXXFLAGS"
779fi
776echo " LDFLAGS..................: $LDFLAGS" 780echo " LDFLAGS..................: $LDFLAGS"
777echo 781echo
778if test "${build_tests}" = "none"; then 782if test "${build_tests}" = "none"; then