Changeset: 53908138778d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53908138778d
Modified Files:
MonetDB.spec
configure.ag
debian/rules
Branch: Oct2012
Log Message:
configuration fixes.
noexpand option is gone; do testing correctly in configure.
diffs (51 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -633,7 +633,6 @@ developer, but if you do want to test, t
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
- --enable-noexpand=no \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1141,7 +1141,7 @@ if test "x$have_python2" != xno; then
if test x$cross_compiling != xyes; then
AC_PATH_PROG(PYTHON2,$PYTHON2,no,$PATH)
if test "x$PYTHON2" = xno; then
- if ( test "x$have_python2" = xyes || test
"x$have_python2" = xauto ) && test "x$PYTHON_MAJ" = 2; then
+ if ( test "x$have_python2" = xyes || test
"x$have_python2" = xauto ) && test "x$PYTHON_MAJ" = x2; then
PYTHON2="$PYTHON"
have_python2=yes
elif test "x$have_python2" != xauto; then
@@ -1211,7 +1211,7 @@ if test "x$have_python3" != xno; then
if test x$cross_compiling != xyes; then
AC_PATH_PROG(PYTHON3,$PYTHON3,no,$PATH)
if test "x$PYTHON3" = xno; then
- if ( test "x$have_python3" = xyes || test
"x$have_python3" = xauto ) && test "x$PYTHON_MAJ" = 3; then
+ if ( test "x$have_python3" = xyes || test
"x$have_python3" = xauto ) && test "x$PYTHON_MAJ" = x3; then
PYTHON3="$PYTHON"
have_python3=yes
elif test "x$have_python3" != xauto; then
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ override_dh_auto_configure:
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
- --enable-noexpand=no \
--enable-odbc=yes \
--enable-oid32=no \
--enable-optimize=yes \
@@ -38,6 +37,7 @@ override_dh_auto_configure:
--with-perl=yes \
--with-pthread=yes \
--with-python2=yes \
+ --with-python3=yes \
--with-readline=yes \
--with-rubygem=yes \
--with-rubygem-dir=lib/ruby/gems/1.8 \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
