Changeset: 9a00d72e654d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a00d72e654d
Modified Files:
configure.ag
Branch: iot
Log Message:
merge with default
diffs (truncated from 808 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -320,7 +320,7 @@ AC_ARG_ENABLE([jdbc],
[enable_jdbc=$dft_jdbc])
AS_CASE([$enable_jdbc],
[yes|auto], [],
- [ enable_jdbc=no])
+ [enable_jdbc=no])
dft_control=auto
AC_ARG_ENABLE([merocontrol],
@@ -1093,8 +1093,8 @@ AS_VAR_IF([enable_instrument], [yes], [
AS_VAR_IF([GCC], [yes], [
CFLAGS="$CFLAGS -finstrument-functions -g"
AC_MSG_RESULT([yes: -finstrument-functions -g])], [
- AC_MSG_RESULT([no])])], [
- AC_MSG_RESULT([no])])
+ AC_MSG_RESULT([no])])],
+ [AC_MSG_RESULT([no])])
AC_PATH_PROG([BASH], [bash], [/usr/bin/bash], [$PATH])
AC_CHECK_PROG([RM], [rm], [rm -f])
@@ -1127,14 +1127,16 @@ AS_VAR_IF([have_perl], [no], [], [
have_perl=no
why_have_perl="(no Perl executable found)"])])])
-AS_VAR_IF([have_perl], [no], [], [
- have_perl_libdir=auto
- AC_ARG_WITH([perl-libdir],
+AS_VAR_IF([have_perl], [no],
+ [dnl no Perl implies no interpreter
+ PERL=false],
+ [have_perl_libdir=auto
+ AC_ARG_WITH([perl-libdir],
[AS_HELP_STRING([--with-perl-libdir=DIR],
[relative path for Perl library directory (where Perl
modules should be installed)])],
[have_perl_libdir="$withval"])
- AS_CASE(["$have_perl_libdir"],
+ AS_CASE(["$have_perl_libdir"],
[yes|auto], [
AS_VAR_IF([cross_compiling], [yes], [
AC_MSG_ERROR([Must specify --with-perl-libdir
when cross compiling])])
@@ -1145,9 +1147,7 @@ AS_VAR_IF([have_perl], [no], [], [
[no], [],
[
PERL_LIBDIR="$have_perl_libdir"
- have_perl_libdir=yes])], [
- dnl no Perl implies no interpreter
- PERL=false])
+ have_perl_libdir=yes])])
AC_SUBST([PERL])
AM_CONDITIONAL([HAVE_PERL], [test x"$have_perl" != xno])
@@ -1224,18 +1224,21 @@ AS_VAR_IF([have_python2], [no], [], [
why_have_python2="(Python 2 executable
too old)"], [
AC_MSG_ERROR([Python 2 executable too
old])])])])])])
-AS_VAR_IF([have_python2], [no], [], [
- have_python2_libdir=auto
-
- AC_ARG_WITH([python2-libdir],
+AS_VAR_IF([have_python2], [no],
+ [dnl no Python 2 implies no Python 2 libraries
+ have_python2_libdir=no
+ PYTHON2_LIBDIR=""
+ dnl and no interpreter
+ PYTHON2=false],
+ [have_python2_libdir=auto
+ AC_ARG_WITH([python2-libdir],
[AS_HELP_STRING([--with-python2-libdir=DIR],
[relative path for Python 2 library directory (where
Python 2 modules should be installed)])],
[have_python2_libdir="$withval"])
-
- AS_CASE(["$have_python2_libdir"],
+ AS_CASE(["$have_python2_libdir"],
[yes|auto], [
- AS_VAR_IF([cross_compiling], [yes], [
- AC_MSG_ERROR([Must specify
--with-python2-libdir when cross compiling])])
+ AS_VAR_IF([cross_compiling], [yes],
+ [AC_MSG_ERROR([Must specify
--with-python2-libdir when cross compiling])])
AS_CASE(["$host_os-`"$PYTHON2" -V 2>&1`"],
[darwin9*-*2.5.1], [
dnl This is the Python installed on
OSX Leopard, in
@@ -1251,12 +1254,7 @@ AS_VAR_IF([have_python2], [no], [], [
PYTHON2_LIBDIR=`echo "$have_python2_libdir" | sed
"s|^$Qprefix/||"`
have_python2_libdir=yes],
[ PYTHON2_LIBDIR="$have_python2_libdir"
- have_python2_libdir=yes])], [
- dnl no Python 2 implies no Python 2 libraries
- have_python2_libdir=no
- PYTHON2_LIBDIR=""
- dnl and no interpreter
- PYTHON2=false])
+ have_python2_libdir=yes])])
AC_SUBST([PYTHON2])
QPYTHON2="$PYTHON2"
@@ -1281,18 +1279,23 @@ AS_VAR_IF([have_python3], [no], [], [
have_python3=no
why_have_python3="(Python 3 executable not
found)"])])])])
-AS_VAR_IF([have_python3], [no], [], [
- have_python3_libdir=auto
+AS_VAR_IF([have_python3], [no],
+ [dnl no Python 3 implies no Python 3 libraries
+ have_python3_libdir=no
+ PYTHON3_LIBDIR=""
+ dnl and no interpreter
+ PYTHON3=false],
+ [have_python3_libdir=auto
- AC_ARG_WITH([python3-libdir],
+ AC_ARG_WITH([python3-libdir],
[AS_HELP_STRING([--with-python3-libdir=DIR],
[relative path for Python 3 library directory (where
Python 3 modules should be installed)])],
[have_python3_libdir="$withval"])
- AS_CASE(["$have_python3_libdir"],
+ AS_CASE(["$have_python3_libdir"],
[yes|auto], [
- AS_VAR_IF([cross_compiling], [yes], [
- AC_MSG_ERROR([Must specify
--with-python3-libdir when cross compiling])])
+ AS_VAR_IF([cross_compiling], [yes],
+ [AC_MSG_ERROR([Must specify
--with-python3-libdir when cross compiling])])
dnl Use prefix field for Ubuntu Python, bug #3207
PYTHON3_LIBDIR="`"$PYTHON3" -c 'import
distutils.sysconfig;
print(distutils.sysconfig.get_python_lib(0,0,"'"$Qprefix"'"))' 2>/dev/null`"
PYTHON3_LIBDIR=`echo "$PYTHON3_LIBDIR" | sed
"s|^$Qprefix/||"`],
@@ -1301,12 +1304,7 @@ AS_VAR_IF([have_python3], [no], [], [
PYTHON3_LIBDIR=`echo "$have_python3_libdir" | sed
"s|^$Qprefix/||"`
have_python3_libdir=yes],
[ PYTHON3_LIBDIR="$have_python3_libdir"
- have_python3_libdir=yes])], [
- dnl no Python 3 implies no Python 3 libraries
- have_python3_libdir=no
- PYTHON3_LIBDIR=""
- dnl and no interpreter
- PYTHON3=false])
+ have_python3_libdir=yes])])
AC_SUBST([PYTHON3])
QPYTHON3="$PYTHON3"
@@ -1322,16 +1320,19 @@ AC_SUBST([QXPYTHON3_LIBDIR])
AM_CONDITIONAL([HAVE_PYTHON], [test x"$have_python2" != xno -o
x"$have_python3" != xno])
-AS_VAR_IF([PYTHON], [no], [
- AS_VAR_IF([PYTHON2], [no], [], [
- PYTHON="$PYTHON2"], [test "x$PYTHON3" != xno], [
- PYTHON="$PYTHON3"])])
+AS_VAR_IF([PYTHON], [no],
+ [AS_VAR_IF([PYTHON2], [no],
+ [AS_VAR_IF([PYTHON3], [no],
+ []
+ [PYTHON="$PYTHON3"])],
+ [PYTHON="$PYTHON2"])])
AC_SUBST([PYTHON])
dnl Mtest/Mfilter currently require Python 2
-AS_VAR_IF([enable_testing], [no], [], [
- AS_VAR_IF([PYTHON2], [false], [
- enable_testing=no])])
+AS_VAR_IF([enable_testing], [no],
+ [],
+ [AS_VAR_IF([PYTHON2], [false],
+ [enable_testing=no])])
AC_PROG_YACC
AS_CASE(["$YACC"],
@@ -1449,29 +1450,30 @@ AC_ARG_WITH([java],
[have_java=$org_have_java])
JPATH=$PATH
AS_CASE([$have_java],
-[yes|no|auto], [],
-[
- JPATH="$withval/bin:$JPATH"])
+ [yes|no|auto], [],
+ [JPATH="$withval/bin:$JPATH"])
AS_VAR_IF([have_java], [no], [], [
AC_PATH_PROG([JAVA], [java], [], [$JPATH])
- AS_VAR_IF([JAVA], [], [], [
- JAVA_VERSION=[`"$JAVA" -version 2>&1 | grep '[0-9]\.[0-9]' |
head -n1 | sed -e 's|^[^0-9]*||' -e 's|[^0-9]*$||'`]])
+ AS_VAR_IF([JAVA], [],
+ [],
+ [JAVA_VERSION=[`"$JAVA" -version 2>&1 | grep '[0-9]\.[0-9]' |
head -n1 | sed -e 's|^[^0-9]*||' -e 's|[^0-9]*$||'`]])
AC_PATH_PROG([JAVAC], [javac], [], [$JPATH])
AC_PATH_PROG([JAR], [jar], [], [$JPATH])
AC_PATH_PROG([JAVADOC], [javadoc], [], [$JPATH])
- AS_VAR_IF([have_java], [yes], [
- JAVA_HOME="`echo $JAVAC | sed 's:/bin/javac$::'`"])
+ AS_VAR_IF([have_java], [yes],
+ [JAVA_HOME="`echo $JAVAC | sed 's:/bin/javac$::'`"])
AS_VAR_IF([JAVAC], [], [
- AS_VAR_IF([have_java], [yes], [
- AC_MSG_ERROR([No javac found])])
+ AS_VAR_IF([have_java], [yes],
+ [AC_MSG_ERROR([No javac found])])
have_java=no
- why_have_java="(no javac found)"], [test "x$JAR" = "x"], [
- AS_VAR_IF([have_java], [yes], [
- AC_MSG_ERROR([No jar found])])
- have_java=no
- why_have_java="(no jar found)"], [
- have_java=yes])
+ why_have_java="(no javac found)"],
+ [AS_VAR_IF([JAR], [], [
+ AS_VAR_IF([have_java], [yes],
+ [AC_MSG_ERROR([No jar found])])
+ have_java=no
+ why_have_java="(no jar found)"],
+ [have_java=yes])])
AS_VAR_IF([have_java], [yes], [], [
JAVA_VERSION=""
@@ -1495,44 +1497,44 @@ AC_SUBST([JAVA_HOME])
org_have_java_jdbc=no
have_java_jdbc=$org_have_java_jdbc
AS_CASE([$have_java-$enable_jdbc],
-[*-no], [],
-[no-yes], [
- AC_MSG_ERROR([MonetDB JDBC requires ant and Java])],
-[no-*], [
- enable_jdbc=no
- AS_VAR_IF([ANT], [no], [
- disable_jdbc="(ant is required to build MonetDB JDBC)"], [
- disable_jdbc="(Java is required to build MonetDB JDBC)"])],
-[
- have_java_jdbc=yes
- AS_VERSION_COMPARE([$JAVA_VERSION], [1.7],
- [have_java_jdbc=no
- AS_VAR_IF([enable_jdbc], [yes],
- [AC_MSG_ERROR([MonetDB JDBC requires ant and Java 7 or
higher])],
- [enable_jdbc=no
- disable_jdbc="(MonetDB JDBC currently requires Java 7
or higher to build)"])])])
+ [*-no], [],
+ [no-yes], [AC_MSG_ERROR([MonetDB JDBC requires ant and Java])],
+ [no-*], [
+ enable_jdbc=no
+ AS_VAR_IF([ANT], [no],
+ [disable_jdbc="(ant is required to build MonetDB
JDBC)"],
+ [disable_jdbc="(Java is required to build MonetDB
JDBC)"])],
+ [
+ AS_VERSION_COMPARE([$JAVA_VERSION], [1.7],
+ AS_VAR_IF([have_java_jdbc], [yes],
+ [AS_VAR_IF([enable_jdbc], [yes],
+ [AC_MSG_ERROR([MonetDB JDBC requires
ant and Java 7 or higher])],
+ [enable_jdbc=no
+ disable_jdbc="(MonetDB JDBC currently
requires Java 7 or higher to build)"])]),
+ [have_java_jdbc=yes],
+ [have_java_jdbc=yes])
+ ])
AM_CONDITIONAL([HAVE_JAVAJDBC], [test x$have_java_jdbc != xno])
org_have_java_control=no
have_java_control=$org_have_java_control
AS_CASE([$have_java-$enable_control],
-[*-no], [],
-[no-yes], [
- AC_MSG_ERROR([Merovingian control requires ant and Java])],
-[no-*], [
- enable_control=no
- AS_VAR_IF([ANT], [no], [
- disable_control="(ant is required to build merovingian Java
control library)"], [
- disable_control="(Java is required to build merovingian Java
control library)"])],
-[
- req_java_ver_min=1.7 dnl >= $req_java_ver_min required
- have_java_control=yes
- AS_VERSION_COMPARE([$JAVA_VERSION], [$req_java_ver_min],
- [have_java_control=no
- AS_VAR_IF([enable_control], [yes],
- [AC_MSG_ERROR([Merovingian control requires ant and
Java >= $req_java_ver_min.])],
- [enable_control=no
- disable_control="(merovingian Java control library
requires Java >= $req_java_ver_min)"])])])
+ [*-no], [],
+ [no-yes], [AC_MSG_ERROR([Merovingian control requires ant and Java])],
+ [no-*], [
+ enable_control=no
+ AS_VAR_IF([ANT], [no],
+ [disable_control="(ant is required to build merovingian
Java control library)"],
+ [disable_control="(Java is required to build
merovingian Java control library)"])],
+ [
+ req_java_ver_min=1.7 dnl >= $req_java_ver_min required
+ AS_VERSION_COMPARE([$JAVA_VERSION], [$req_java_ver_min],
+ [AS_VAR_IF([enable_control], [yes],
+ [AC_MSG_ERROR([Merovingian control requires ant
and Java >= $req_java_ver_min.])],
+ [enable_control=no
+ disable_control="(merovingian Java control
library requires Java >= $req_java_ver_min)"])],
+ [have_java_control=yes],
+ [have_java_control=yes])])
AM_CONDITIONAL([HAVE_JAVAMEROCONTROL], [test x$have_java_control != xno])
AS_VAR_IF([have_java_jdbc], [no], [
@@ -1569,40 +1571,40 @@ AS_VAR_IF([have_bz2], [no], [], [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>
@%:@include <bzlib.h>]], [[(void)BZ2_bzopen("","");]])],
BZ_LIBS="$BZ_LIBS -lbz2",
- [ AS_VAR_IF([have_bz2], [auto], [], [
+ [AS_VAR_IF([have_bz2], [auto], [], [
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
