Changeset: a64440dcd8bf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a64440dcd8bf Modified Files: configure.ag Branch: default Log Message:
We were severely underquoting according to the autoconf documentation. diffs (truncated from 2554 to 300 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -9,7 +9,7 @@ dnl Copyright 1997 - July 2008 CWI, Augu # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.60) +AC_PREREQ([2.60]) AC_INIT([MonetDB], [11.24.0], [[email protected]], [MonetDB], [http://www.monetdb.org/]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) @@ -22,13 +22,13 @@ AC_CONFIG_HEADERS([monetdb_config.h]) AC_SUBST([CONFIG_H], [monetdb_config.h]) HOST=[$target] -AC_DEFINE_UNQUOTED(HOST, "$HOST", [Host identifier]) +AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier]) if test x"$target_os" = xcygwin; then - AC_DEFINE(WIN32, 1, [Define on Microsoft Windows (also under Cygwin)]) + AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under Cygwin)]) fi -AM_CONDITIONAL(NOT_WIN32, test x"$target_os" != xcygwin) -AM_CONDITIONAL(NATIVE_WIN32, false) +AM_CONDITIONAL([NOT_WIN32], [test x"$target_os" != xcygwin]) +AM_CONDITIONAL([NATIVE_WIN32], [false]) m4_ifndef([PKG_PROG_PKG_CONFIG], [m4_fatal([Could not locate the pkg-config autoconf @@ -57,16 +57,16 @@ AC_DEFUN([MONETDB_VERSION_TO_NUMBER], # except set the variables. The command to set them in case we do # need to escape the \'s is Qvar=`echo "$var" | sed 's/\\\\/\\\\\\\\/g'` BUILD=[`pwd`] -AC_SUBST(BUILD) +AC_SUBST([BUILD]) SOURCE=[`(cd $srcdir && pwd)`] -AC_SUBST(SOURCE) +AC_SUBST([SOURCE]) . $srcdir/libversions -AC_SUBST(GDK_VERSION) -AC_SUBST(MAPI_VERSION) -AC_SUBST(MONETDB5_VERSION) -AC_SUBST(STREAM_VERSION) +AC_SUBST([GDK_VERSION]) +AC_SUBST([MAPI_VERSION]) +AC_SUBST([MONETDB5_VERSION]) +AC_SUBST([STREAM_VERSION]) # if no --prefix option, we must set Qprefix to the default value # the problem is that prefix is set very late in the process if it @@ -77,14 +77,14 @@ else Qprefix="${prefix}" fi Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`" -AC_SUBST(Qprefix) +AC_SUBST([Qprefix]) # exec_prefix is created very late, so let make do the expansion if test "${exec_prefix}x" = "NONEx"; then Qexec_prefix='${prefix}' else Qexec_prefix="`echo "$exec_prefix" | sed 's/\\\\/\\\\\\\\/g'`" fi -AC_SUBST(Qexec_prefix) +AC_SUBST([Qexec_prefix]) if test -f "$srcdir"/vertoo.data; then dnl Developers compiling from Mercurial: @@ -124,21 +124,21 @@ case "$CC" in ;; esac -AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"]) +AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"]) dft_gdk=yes -AC_ARG_ENABLE(gdk, - AS_HELP_STRING([--enable-gdk], - [enable support for GDK (default=yes)]), - enable_gdk=$enableval, - enable_gdk=$dft_gdk) +AC_ARG_ENABLE([gdk], + [AS_HELP_STRING([--enable-gdk], + [enable support for GDK (default=yes)])], + [enable_gdk=$enableval], + [enable_gdk=$dft_gdk]) dft_monetdb5=yes -AC_ARG_ENABLE(monetdb5, - AS_HELP_STRING([--enable-monetdb5], - [enable support for MonetDB5 (default=yes)]), - enable_monetdb5=$enableval, - enable_monetdb5=$dft_monetdb5) +AC_ARG_ENABLE([monetdb5], + [AS_HELP_STRING([--enable-monetdb5], + [enable support for MonetDB5 (default=yes)])], + [enable_monetdb5=$enableval], + [enable_monetdb5=$dft_monetdb5]) case "$enable_gdk-$enable_monetdb5" in no-yes) AC_MSG_ERROR([MonetDB5 requires GDK.]) @@ -150,32 +150,32 @@ no-auto) esac dft_fits=auto -AC_ARG_ENABLE(fits, - AS_HELP_STRING([--enable-fits], - [enable support for FITS (default=auto)]), - enable_fits=$enableval, - enable_fits=$dft_fits) +AC_ARG_ENABLE([fits], + [AS_HELP_STRING([--enable-fits], + [enable support for FITS (default=auto)])], + [enable_fits=$enableval], + [enable_fits=$dft_fits]) dft_netcdf=auto -AC_ARG_ENABLE(netcdf, - AS_HELP_STRING([--enable-netcdf], - [enable support for netcdf (default=auto)]), - enable_netcdf=$enableval, - enable_netcdf=$dft_netcdf) +AC_ARG_ENABLE([netcdf], + [AS_HELP_STRING([--enable-netcdf], + [enable support for netcdf (default=auto)])], + [enable_netcdf=$enableval], + [enable_netcdf=$dft_netcdf]) dft_lidar=auto -AC_ARG_ENABLE(lidar, - AS_HELP_STRING([--enable-lidar], - [enable support for LiDAR data (default=auto)]), - have_lidar=$enableval, - have_lidar=$dft_lidar) +AC_ARG_ENABLE([lidar], + [AS_HELP_STRING([--enable-lidar], + [enable support for LiDAR data (default=auto)])], + [have_lidar=$enableval], + [have_lidar=$dft_lidar]) dft_sql=yes -AC_ARG_ENABLE(sql, - AS_HELP_STRING([--enable-sql], - [enable support for MonetDB/SQL (default=yes)]), - enable_sql=$enableval, - enable_sql=$dft_sql) +AC_ARG_ENABLE([sql], + [AS_HELP_STRING([--enable-sql], + [enable support for MonetDB/SQL (default=yes)])], + [enable_sql=$enableval], + [enable_sql=$dft_sql]) case "$enable_monetdb5-$enable_sql" in no-yes) AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.]) @@ -187,11 +187,11 @@ no-auto) esac dft_geom=auto -AC_ARG_ENABLE(geom, - AS_HELP_STRING([--enable-geom], - [enable support for geom module (default=auto)]), - enable_geom=$enableval, - enable_geom=$dft_geom) +AC_ARG_ENABLE([geom], + [AS_HELP_STRING([--enable-geom], + [enable support for geom module (default=auto)])], + [enable_geom=$enableval], + [enable_geom=$dft_geom]) case "$enable_monetdb5-$enable_geom" in no-yes) AC_MSG_ERROR([geom module requires MonetDB5]) @@ -203,11 +203,11 @@ no-auto) esac dft_shp=auto -AC_ARG_ENABLE(shp, - AS_HELP_STRING([--enable-shp], - [enable support for ESRI Shapefiles (default=auto)]), - have_shp=$enableval, - have_shp=$dft_shp) +AC_ARG_ENABLE([shp], + [AS_HELP_STRING([--enable-shp], + [enable support for ESRI Shapefiles (default=auto)])], + [have_shp=$enableval], + [have_shp=$dft_shp]) case "$enable_geom-$have_shp" in no-yes) AC_MSG_ERROR([ESRI Shapefile vault requires the geom module]) @@ -219,85 +219,85 @@ no-auto) esac dft_mapi=yes -AC_ARG_ENABLE(mapi, - AS_HELP_STRING([--enable-mapi], - [Enable MAPI (default=yes)]), - enable_mapi=$enableval, - enable_mapi=$dft_mapi) -AM_CONDITIONAL(HAVE_MAPI, test x$enable_mapi != xno) +AC_ARG_ENABLE([mapi], + [AS_HELP_STRING([--enable-mapi], + [Enable MAPI (default=yes)])], + [enable_mapi=$enableval], + [enable_mapi=$dft_mapi]) +AM_CONDITIONAL([HAVE_MAPI], [test x$enable_mapi != xno]) if test "x$enable_mapi" != xno; then - AC_DEFINE(HAVE_MAPI, 1, [Enable MAPI]) + AC_DEFINE([HAVE_MAPI], 1, [Enable MAPI]) fi dft_embedded=no -AC_ARG_ENABLE(embedded, - AS_HELP_STRING([--enable-embedded], - [enable support for running MonetDB as a library (default=no)]), - enable_embedded=$enableval, - enable_embedded=$dft_embedded) -AM_CONDITIONAL(HAVE_EMBEDDED, test x$enable_embedded != xno) +AC_ARG_ENABLE([embedded], + [AS_HELP_STRING([--enable-embedded], + [enable support for running MonetDB as a library (default=no)])], + [enable_embedded=$enableval], + [enable_embedded=$dft_embedded]) +AM_CONDITIONAL([HAVE_EMBEDDED], [test x$enable_embedded != xno]) if test "x$enable_embedded" != xno; then - AC_DEFINE(HAVE_EMBEDDED, 1, [Support for MonetDB as a library]) + AC_DEFINE([HAVE_EMBEDDED], 1, [Support for MonetDB as a library]) fi dft_embedded_r=no -AC_ARG_ENABLE(embedded-r, - AS_HELP_STRING([--enable-embedded-r], - [enable support for running MonetDB as a library for R (default=no)]), - enable_embedded_r=$enableval, - enable_embedded_r=$dft_embedded_r) -AM_CONDITIONAL(HAVE_EMBEDDED_R, test x$enable_embedded_r != xno) +AC_ARG_ENABLE([embedded-r], + [AS_HELP_STRING([--enable-embedded-r], + [enable support for running MonetDB as a library for R (default=no)])], + [enable_embedded_r=$enableval], + [enable_embedded_r=$dft_embedded_r]) +AM_CONDITIONAL([HAVE_EMBEDDED_R], [test x$enable_embedded_r != xno]) if test "x$enable_embedded_r" != xno; then - AC_DEFINE(HAVE_EMBEDDED_R, 1, [Support for MonetDB as a library for R]) + AC_DEFINE([HAVE_EMBEDDED_R], 1, [Support for MonetDB as a library for R]) fi dft_gsl=auto -AC_ARG_ENABLE(gsl, - AS_HELP_STRING([--enable-gsl], - [enable support for GSL (default=auto)]), - enable_gsl=$enableval, - enable_gsl=$dft_gsl) +AC_ARG_ENABLE([gsl], + [AS_HELP_STRING([--enable-gsl], + [enable support for GSL (default=auto)])], + [enable_gsl=$enableval], + [enable_gsl=$dft_gsl]) dft_rintegration=auto -AC_ARG_ENABLE(rintegration, - AS_HELP_STRING([--enable-rintegration], - [enable support for R integration into MonetDB (default=auto)]), - enable_rintegration=$enableval, - enable_rintegration=$dft_rintegration) +AC_ARG_ENABLE([rintegration], + [AS_HELP_STRING([--enable-rintegration], + [enable support for R integration into MonetDB (default=auto)])], + [enable_rintegration=$enableval], + [enable_rintegration=$dft_rintegration]) dft_pyintegration=auto -AC_ARG_ENABLE(pyintegration, - AS_HELP_STRING([--enable-pyintegration], - [enable support for Python integration into MonetDB (default=auto)]), - enable_pyintegration=$enableval, - enable_pyintegration=$dft_pyintegration) +AC_ARG_ENABLE([pyintegration], + [AS_HELP_STRING([--enable-pyintegration], + [enable support for Python integration into MonetDB (default=auto)])], + [enable_pyintegration=$enableval], + [enable_pyintegration=$dft_pyintegration]) dft_odbc=auto -AC_ARG_ENABLE(odbc, - AS_HELP_STRING([--enable-odbc], - [compile the MonetDB ODBC driver (default=auto)]), - enable_odbc=$enableval, - enable_odbc=$dft_odbc) +AC_ARG_ENABLE([odbc], + [AS_HELP_STRING([--enable-odbc], + [compile the MonetDB ODBC driver (default=auto)])], + [enable_odbc=$enableval], + [enable_odbc=$dft_odbc]) dft_testing=auto -AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], - [enable support for testing (default=auto)]), - enable_testing=$enableval, _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
