You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 06:54:57 UTC
svn commit: r1131664 - in /incubator/mesos/trunk: configure configure.ac
Author: benh
Date: Sun Jun 5 04:54:56 2011
New Revision: 1131664
URL: http://svn.apache.org/viewvc?rev=1131664&view=rev
Log:
Fixing bug with configure magic.
Modified:
incubator/mesos/trunk/configure
incubator/mesos/trunk/configure.ac
Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131664&r1=1131663&r2=1131664&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun 5 04:54:56 2011
@@ -1676,18 +1676,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Use explicit python version 2.6.
PYTHON=python2.6
-# Update CFLAGS and CXXFLAGS from configure args.
+# Update CFLAGS and CXXFLAGS with environment args.
CFLAGS="-O2 -fno-strict-aliasing -fPIC ${CFLAGS}"
CXXFLAGS="-O2 -fno-strict-aliasing -fPIC ${CXXFLAGS}"
export CFLAGS
export CXXFLAGS
-# Replace (remove and then add) CFLAGS and CXXFLAGS from configure args.
+# Update CFLAGS and CXXFLAGS in configure args.
ac_configure_args=`echo $ac_configure_args | \
sed -e "s/CFLAGS=/CFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
ac_configure_args=`echo $ac_configure_args | \
- sed -e "s/'CXXFLAGS=.*'/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
+ sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
ac_configure_args="$ac_configure_args --enable-shared=no"
ac_config_files="$ac_config_files Makefile src/Makefile src/config.hpp"
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131664&r1=1131663&r2=1131664&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun 5 04:54:56 2011
@@ -7,18 +7,18 @@ AC_INIT
# Use explicit python version 2.6.
PYTHON=python2.6
-# Update CFLAGS and CXXFLAGS from configure args.
+# Update CFLAGS and CXXFLAGS with environment args.
CFLAGS="-O2 -fno-strict-aliasing -fPIC ${CFLAGS}"
CXXFLAGS="-O2 -fno-strict-aliasing -fPIC ${CXXFLAGS}"
export CFLAGS
export CXXFLAGS
-# Replace (remove and then add) CFLAGS and CXXFLAGS from configure args.
+# Update CFLAGS and CXXFLAGS in configure args.
ac_configure_args=`echo $ac_configure_args | \
sed -e "s/CFLAGS=/CFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
ac_configure_args=`echo $ac_configure_args | \
- sed -e "s/'CXXFLAGS=.*'/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
+ sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
ac_configure_args="$ac_configure_args --enable-shared=no"
AC_CONFIG_FILES([Makefile src/Makefile src/config.hpp])