Changeset: 157a94a141ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=157a94a141ba
Modified Files:
configure.ag
Branch: default
Log Message:
Portability issues.
Do not use double quotes inside backquotes inside double quotes.
Also removed a bunch of other unnecessary double quotes.
diffs (truncated from 1085 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -105,23 +105,23 @@ AS_VAR_IF([prefix], [NONE],
[Qprefix="${ac_default_prefix}"].
[Qprefix="${prefix}"])
-Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`"
+Qprefix=`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`
AC_SUBST([Qprefix])
# exec_prefix is created very late, so let make do the expansion
AS_VAR_IF([exec_prefix], [NONE],
[Qexec_prefix='${prefix}'],
- [Qexec_prefix="`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"])
+ [Qexec_prefix=`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`])
AC_SUBST([Qexec_prefix])
# small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
# set GCC=yes if we use icc.
-AS_CASE(["$CC"],
+AS_CASE([$CC],
[*icc*-no-gcc*], [],
[*icc*], [
# Since version 8.0, ecc/ecpc are also called icc/icpc,
# and icc/icpc requires "-no-gcc" to avoid predefining
# __GNUC__, __GNUC_MINOR__, and __GNUC_PATCHLEVEL__ macros.
- icc_ver="`$CC -dumpversion 2>/dev/null`"
+ icc_ver=`$CC -dumpversion 2>/dev/null`
AS_CASE([$icc_ver],
[8.*], [CC="$CC -no-gcc"],
[9.*], [CC="$CC -no-gcc"],
@@ -192,7 +192,7 @@ AC_ARG_ENABLE([monetdb5],
[enable support for MonetDB5 (default=yes)])],
[enable_monetdb5=$enableval],
[enable_monetdb5=$dft_monetdb5])
-AS_CASE(["$enable_gdk-$enable_monetdb5"],
+AS_CASE([$enable_gdk-$enable_monetdb5],
[no-yes], [AC_MSG_ERROR([MonetDB5 requires GDK.])],
[no-auto], [
enable_monetdb5=no
@@ -204,7 +204,7 @@ AC_ARG_ENABLE([sql],
[enable support for MonetDB/SQL (default=yes)])],
[enable_sql=$enableval],
[enable_sql=$dft_sql])
-AS_CASE(["$enable_monetdb5-$enable_sql"],
+AS_CASE([$enable_monetdb5-$enable_sql],
[no-yes], [
AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.])],
[no-auto], [
@@ -217,7 +217,7 @@ AC_ARG_ENABLE([geom],
[enable support for geom module (default=auto)])],
[enable_geom=$enableval],
[enable_geom=$dft_geom])
-AS_CASE(["$enable_monetdb5-$enable_geom"],
+AS_CASE([$enable_monetdb5-$enable_geom],
[no-yes], [
AC_MSG_ERROR([geom module requires MonetDB5])],
[no-auto], [
@@ -251,7 +251,7 @@ AC_ARG_ENABLE([shp],
[enable support for ESRI Shapefiles (default=auto)])],
[have_shp=$enableval],
[have_shp=$dft_shp])
-AS_CASE(["$enable_geom-$have_shp"],
+AS_CASE([$enable_geom-$have_shp],
[no-yes], [
AC_MSG_ERROR([ESRI Shapefile vault requires the geom module])],
[no-auto], [
@@ -397,7 +397,7 @@ AC_ARG_WITH([password-backend],
[AS_HELP_STRING([--with-password-backend=HASHALG],
[password hash algorithm, one of MD5, SHA1, RIPEMD160, SHA224,
SHA256, SHA384, SHA512, defaults to SHA512])],
[password_backend="$withval"])
-AS_CASE(["$password_backend"],
+AS_CASE([$password_backend],
[yes|no|auto|""],
[],
[MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512],
@@ -416,7 +416,7 @@ logdir='${localstatedir}/log/monetdb'
AC_ARG_WITH([logdir],
[AS_HELP_STRING([--with-logdir=DIR],
[Where to put log files (LOCALSTATEDIR/log/monetdb/)])],
- [AS_CASE(["$withval"],
+ [AS_CASE([$withval],
[yes|no|auto],
[AC_MSG_WARN([--with-logdir called without argument - will use
default])],
[logdir="$withval"])])
@@ -426,7 +426,7 @@ rundir='${localstatedir}/run/monetdb'
AC_ARG_WITH([rundir],
[AS_HELP_STRING([--with-rundir=DIR],
[Where to put pid files (LOCALSTATEDIR/run/monetdb/)])],
- [AS_CASE(["$withval"],
+ [AS_CASE([$withval],
[yes|no|auto],
[AC_MSG_WARN([--with-rundir called without argument - will use
default])],
[rundir="$withval"])])
@@ -468,20 +468,20 @@ AC_MSG_CHECKING([compiler type & version
gcc_ver=""
icc_ver=""
CC_ver=""
-CC_version="`$CC --version 2>&1`"
-AS_CASE(["$CC_version"],
+CC_version=`$CC --version 2>&1`
+AS_CASE([$CC_version],
[*'(GCC)'*|*'Copyright (C) '*' Free Software Foundation, Inc.'*], [
- gcc_ver="`$CC -dumpversion 2>/dev/null`"
+ gcc_ver=`$CC -dumpversion 2>/dev/null`
CC_ver="gcc-$gcc_ver"],
[*'(ICC)'*|*'Copyright (C) '*' Intel Corporation. All rights
reserved.'*], [
- icc_ver="`$CC -dumpversion 2>/dev/null`"
+ icc_ver=`$CC -dumpversion 2>/dev/null`
CC_ver="icc-$icc_ver"],
[*clang*], [
# `clang -dumpversion` reports the original/old gcc version it is based
on
- gcc_ver="`$CC -v 2>&1 | grep -w '[[Vv]]ersion
[[0-9]]\+\.[[0-9]]\+' | sed 's|^.*[[Vv]]ersion
\([[0-9]][[0-9]]*\(\.[[0-9]][[0-9]]*\)\(\.[[0-9]][[0-9]]*\)*\).*$|\1|'`"
+ gcc_ver=`$CC -v 2>&1 | grep -w '[[Vv]]ersion
[[0-9]]\+\.[[0-9]]\+' | sed 's|^.*[[Vv]]ersion
\([[0-9]][[0-9]]*\(\.[[0-9]][[0-9]]*\)\(\.[[0-9]][[0-9]]*\)*\).*$|\1|'`
CC_ver="clang-$gcc_ver"],
- [CC_V="`$CC -V 2>&1`"
- AS_CASE(["$CC_V"],
+ [CC_V=`$CC -V 2>&1`
+ AS_CASE([$CC_V],
[*'Sun Ceres C '*|*'Sun C '*], [
# developer/sunstudioexpress and
# developer/sunstudio12u1 respectively
@@ -495,7 +495,7 @@ AS_CASE(["$CC_version"],
AC_MSG_RESULT([$CC_ver])
# sanity/consistency check
-AS_CASE(["$GCC!$CC!$CC_ver"],
+AS_CASE([$GCC!$CC!$CC_ver],
[yes!*clang*!clang-*], [],
[yes!*gcc*!clang-*], [],
[yes!*gcc*!gcc-*], [],
@@ -517,7 +517,7 @@ AM_CONDITIONAL([BITS64], [test x"$bits"
AC_C_BIGENDIAN()
LINUX_DIST=''
-AS_CASE(["$host_os"],
+AS_CASE([$host_os],
[linux*], [
# Please keep this aligned / in sync with testing/Mtest.py.in !
AC_MSG_CHECKING([which Linux distribution we're using])
@@ -526,35 +526,35 @@ AS_CASE(["$host_os"],
# works for Fedora >= 17, Ubuntu >= 12.04
(Precise Pangolin)
LINUX_DIST=`source /etc/os-release; echo
${ID}:${VERSION_ID}`],
[test -s /etc/fedora-release ], [
- LINUX_DIST="`cat /etc/fedora-release | head -n1
\
- | sed 's|^.*\(Fedora\).* release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ LINUX_DIST=`cat /etc/fedora-release | head -n1 \
+ | sed 's|^.*\(Fedora\).* release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/centos-release ], [
- LINUX_DIST="`cat /etc/centos-release | head -n1
\
- | sed 's|^\(CentOS\).* release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ LINUX_DIST=`cat /etc/centos-release | head -n1 \
+ | sed 's|^\(CentOS\).* release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/yellowdog-release ], [
- LINUX_DIST="`cat /etc/yellowdog-release | head
-n1 \
- | sed 's|^\(Yellow\) Dog Linux release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ LINUX_DIST=`cat /etc/yellowdog-release | head
-n1 \
+ | sed 's|^\(Yellow\) Dog Linux release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/redhat-release ], [
- LINUX_DIST="`cat /etc/redhat-release | head -n1
\
+ LINUX_DIST=`cat /etc/redhat-release | head -n1 \
| sed 's|^.*\(Red\) \(Hat\).* Linux
*\([[A-Z]]*\) release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1\2:\4\3|' \
| sed 's|^Red Hat Enterprise Linux
\([[AW]]S\) release \([[0-9]][[^ \n]]*\)\( .*\)*$|RHEL:\2\1|' \
| sed 's|^\(CentOS\).* release
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|' \
- | sed 's|^\(Scientific\) Linux.*
release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ | sed 's|^\(Scientific\) Linux.*
release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/SuSE-release ], [
- LINUX_DIST="`cat /etc/SuSE-release | head -n1
\
+ LINUX_DIST=`cat /etc/SuSE-release | head -n1 \
| sed 's|^.*\(S[[Uu]]SE\) LINUX
Enterprise \([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\3E\2|' \
| sed 's|^S[[Uu]]SE LINUX Enterprise
\([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|SLE\1:\2|' \
| sed 's|^.*\(S[[Uu]]SE\)
[[Ll]][[Ii]][[Nn]][[Uu]][[Xx]].* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|' \
- | sed 's|^open\(S[[Uu]]SE\)
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ | sed 's|^open\(S[[Uu]]SE\)
\([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/gentoo-release ], [
- LINUX_DIST="`cat /etc/gentoo-release | head -n1
\
- | sed 's|^.*\(Gentoo\) Base System.*
[[versionrelease]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"],
+ LINUX_DIST=`cat /etc/gentoo-release | head -n1 \
+ | sed 's|^.*\(Gentoo\) Base System.*
[[versionrelease]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`],
[test -s /etc/lsb-release ], [
- LINUX_DIST="`grep '^DISTRIB_ID='
/etc/lsb-release | cut -d'=' -f2`:`grep '^DISTRIB_RELEASE=' /etc/lsb-release |
cut -d'=' -f2`"],
+ LINUX_DIST=`grep '^DISTRIB_ID='
/etc/lsb-release | cut -d'=' -f2`:`grep '^DISTRIB_RELEASE=' /etc/lsb-release |
cut -d'=' -f2`],
[test -s /etc/debian_version ], [
- LINUX_DIST="Debian:`cat /etc/debian_version |
head -n1`"],
- [LINUX_DIST="`uname -s`:`uname -r | sed
's|^\([[0-9\.]]*\)\([[^0-9\.]].*\)$|\1|'`"])
- LINUX_DIST="`echo "$LINUX_DIST" | sed 's|:||'`"
+ LINUX_DIST=Debian:`cat /etc/debian_version |
head -n1`],
+ [LINUX_DIST=`uname -s`:`uname -r | sed
's|^\([[0-9\.]]*\)\([[^0-9\.]].*\)$|\1|'`])
+ LINUX_DIST=`echo "$LINUX_DIST" | sed 's|:||'`
AC_MSG_RESULT([$LINUX_DIST])])
AC_SUBST([LINUX_DIST])
@@ -607,7 +607,7 @@ AC_DEFUN([MCHECK_ADD_FLAG], [
# i.e., at the end of this configure[.ag] script.
# Only GNU (gcc) and Intel ([ie]cc/[ie]cpc on Linux) are done so far.
AS_VAR_IF([enable_strict], [yes], [
- AS_CASE(["$GCC-$CC-$host_os"],
+ AS_CASE([$GCC-$CC-$host_os],
[yes-*-*], [
# keep this one first
MCHECK_ADD_FLAG([-Werror])
@@ -648,7 +648,7 @@ AS_VAR_IF([enable_strict], [yes], [
# "-Wunreachable-code" with clang and gcc < 4.5 .
# At the same time, Apple deprecated OpenSSL in favour of
# their own CommonCrypto API. We don't mind about that.
- AS_CASE(["$CC_ver"],
+ AS_CASE([$CC_ver],
[clang-*|gcc-[[0-3]].*|gcc-4.[[0-4]].*],
[MCHECK_ADD_FLAG([-Wno-deprecated-declarations])],
[MCHECK_ADD_FLAG([-Wunreachable-code])])
@@ -744,7 +744,7 @@ AS_VAR_IF([enable_strict], [yes], [
])
])
AS_VAR_IF([enable_sanitizer], [no], [], [
- AS_CASE(["$GCC"],
+ AS_CASE([$GCC],
[yes], [
# if no specific sanitizer was specified, use
# address sanitizer
@@ -760,7 +760,7 @@ AC_SUBST([CFLAGS])
AC_SUBST([X_CFLAGS])
# icc needs -fPIC (but the current autoconf still uses -KPIC)
-AS_CASE(["$GCC-$CC-$host_os"],
+AS_CASE([$GCC-$CC-$host_os],
[-*icc*-linux*|-*ecc*-linux*], [
AS_CASE([$icc_ver],
[10.*], [CC="$CC -fPIC"],
@@ -769,14 +769,14 @@ AS_CASE(["$GCC-$CC-$host_os"],
# some dirty hacks
THREAD_SAVE_FLAGS="\$(thread_safe_flag_spec) -D_REENTRANT"
# only needed in monet
-AS_CASE(["$host_os"],
+AS_CASE([$host_os],
[solaris*], [
- AS_CASE(["$GCC"],
+ AS_CASE([$GCC],
[yes], [],
[THREAD_SAVE_FLAGS="$THREAD_SAVE_FLAGS -mt"])],
[aix*], [
THREAD_SAVE_FLAGS="$THREAD_SAVE_FLAGS -D_THREAD_SAFE"
- AS_CASE(["$GCC"],
+ AS_CASE([$GCC],
[yes], [THREAD_SAVE_FLAGS="$THREAD_SAVE_FLAGS
-mthreads"],
[THREAD_SAVE_FLAGS="$THREAD_SAVE_FLAGS -qthreaded"])])
AC_SUBST([thread_safe_flag_spec])
@@ -827,7 +827,7 @@ AC_SUBST([anttranslatepath])
# instrument C C X C \
# find conflicts
-AS_CASE(["x$enable_debug.$enable_optimize.$enable_profile.$enable_instrument"],
+AS_CASE([x$enable_debug.$enable_optimize.$enable_profile.$enable_instrument],
[xyes.yes.*.*],
[AC_MSG_ERROR([combining --enable-optimize and --enable-debug
is not possible])],
[x*.yes.yes.*],
@@ -840,30 +840,30 @@ AS_CASE(["x$enable_debug.$enable_optimiz
AS_VAR_IF([enable_optimize], [no], [],
[disable_optimize="(as debug is enabled)"])
enable_optimize=no
- enable_profile="`echo $enable_profile | sed 's:^def_::'`"
- enable_instrument="`echo $enable_instrument | sed 's:^def_::'`"
+ enable_profile=`echo $enable_profile | sed 's:^def_::'`
+ enable_instrument=`echo $enable_instrument | sed 's:^def_::'`
],
[x*.*.yes.*], [
- enable_debug="`echo $enable_debug | sed 's:^def_::'`"
+ enable_debug=`echo $enable_debug | sed 's:^def_::'`
AS_VAR_IF([enable_optimize], [no], [],
[disable_optimize="(as profile is enabled)"])
enable_optimize=no
enable_profile=yes
- enable_instrument="`echo $enable_instrument | sed 's:^def_::'`"
+ enable_instrument=`echo $enable_instrument | sed 's:^def_::'`
],
[x*.*.*.yes], [
- enable_debug="`echo $enable_debug | sed 's:^def_::'`"
+ enable_debug=`echo $enable_debug | sed 's:^def_::'`
AS_VAR_IF([enable_optimize], [no], [],
[disable_optimize="(as instrument is enabled)"])
enable_optimize=no
- enable_profile="`echo $enable_profile | sed 's:^def_::'`"
+ enable_profile=`echo $enable_profile | sed 's:^def_::'`
enable_instrument=yes
],
[x*.*no.*.*], [
- enable_debug="`echo $enable_debug | sed 's:^def_::'`"
+ enable_debug=`echo $enable_debug | sed 's:^def_::'`
enable_optimize=no
- enable_profile="`echo $enable_profile | sed 's:^def_::'`"
- enable_instrument="`echo $enable_instrument | sed 's:^def_::'`"
+ enable_profile=`echo $enable_profile | sed 's:^def_::'`
+ enable_instrument=`echo $enable_instrument | sed 's:^def_::'`
],
[x*.*yes.*.*], [
# enable-optimize overrules other defaults
@@ -881,20 +881,20 @@ AS_CASE(["x$enable_debug.$enable_optimiz
[x*],
[AC_MSG_WARN([unhandled configuration
$enable_debug.$enable_optimize.$enable_profile.$enable_instrument, please file
a bug on bugs.monetdb.org])])
# make defaults real for flags which don't conflict with anything
-enable_assert="`echo $enable_assert | sed 's:^def_::'`"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
