Changeset: 0fc26464e724 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0fc26464e724
Modified Files:
buildtools/conf/Makefile.ag
buildtools/conf/MonetDB.m4
configure.ag
vertoo.config
Branch: default
Log Message:
Incorporated MonetDB.m4 into configure.ag.
We need to clean up configure.ag later. I now just copied the bodies
of the functions that were defined in MonetDB.m4 verbatim into
configure.ag.
diffs (truncated from 4870 to 300 lines):
diff --git a/buildtools/conf/Makefile.ag b/buildtools/conf/Makefile.ag
--- a/buildtools/conf/Makefile.ag
+++ b/buildtools/conf/Makefile.ag
@@ -50,6 +50,6 @@
SOURCES = website.html
}
-EXTRA_DIST = rules.mk MonetDB.m4
+EXTRA_DIST = rules.mk
EXTRA_DIST_DIR = mock
diff --git a/buildtools/conf/MonetDB.m4 b/buildtools/conf/MonetDB.m4
deleted file mode 100644
--- a/buildtools/conf/MonetDB.m4
+++ /dev/null
@@ -1,2890 +0,0 @@
-dnl The contents of this file are subject to the MonetDB Public License
-dnl Version 1.1 (the "License"); you may not use this file except in
-dnl compliance with the License. You may obtain a copy of the License at
-dnl http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-dnl License for the specific language governing rights and limitations
-dnl under the License.
-dnl
-dnl The Original Code is the MonetDB Database System.
-dnl
-dnl The Initial Developer of the Original Code is CWI.
-dnl Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-dnl Copyright August 2008-2011 MonetDB B.V.
-dnl All Rights Reserved.
-
-dnl Defaults that differ between development trunk and release branch:
-AC_DEFUN([AM_MONETDB_DEFAULTS],
-[
-if test -f "$srcdir"/vertoo.data; then
- dnl Developers compiling from Mercurial:
- dnl default is --enable-strict --enable-assert --enable-debug
--disable-optimize
- dft_strict=yes
- dft_assert=yes
- dft_debug=yes
- dft_optimi=no
- dft_develop=yes
-else
- dnl Users compiling from source tarball(s):
- dnl default is --disable-strict --disable-assert --disable-debug
--disable-optimize
- dft_strict=no
- dft_assert=no
- dft_debug=no
- dft_optimi=no
- dft_develop=no
-fi
-dft_warning=no
-dft_netcdf=auto
-
-dnl small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
-dnl set GCC=yes if we use icc.
-case "$CC" in
-*icc*-no-gcc*) ;;
-*icc*)
- dnl Since version 8.0, ecc/ecpc are also called icc/icpc,
- dnl and icc/icpc requires "-no-gcc" to avoid predefining
- dnl __GNUC__, __GNUC_MINOR__, and __GNUC_PATCHLEVEL__ macros.
- icc_ver="`$CC -dumpversion 2>/dev/null`"
- case $icc_ver in
- 8.*) CC="$CC -no-gcc";;
- 9.*) CC="$CC -no-gcc";;
- 10.*) CC="$CC -no-gcc";;
- 11.*) CC="$CC -no-gcc";;
- esac
- ;;
-esac
-
-AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"])
-])
-
-
-dnl setting various path-variables; part 1
-AC_DEFUN([AM_MONETDB_XQ_VARS_1],
-[
-# 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
-# wasn't set by --prefix
-if test "${prefix}x" = "NONEx"; then
- Qprefix="${ac_default_prefix}"
-else
- Qprefix="${prefix}"
-fi
-Qprefix="`echo "$Qprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-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)
-])
-
-dnl setting various path-variables; part 2
-AC_DEFUN([AM_MONETDB_XQ_VARS_2],
-[
-dnl provide different versions of the paths derived above
-if test "${prefix}x" = "NONEx"; then
- Xprefix="`$translatepath "$Qprefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xprefix="`$translatepath "$prefix"`"
- QXprefix="`echo "$Xprefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-if test "${exec_prefix}x" = "NONEx"; then
- Xexec_prefix="`$translatepath "$Qexec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-else
- Xexec_prefix="`$translatepath "$exec_prefix"`"
- QXexec_prefix="`echo "$Xexec_prefix" | sed 's/\\\\/\\\\\\\\/g'`"
-fi
-AC_SUBST(Xprefix)
-AC_SUBST(QXprefix)
-AC_SUBST(Xexec_prefix)
-AC_SUBST(QXexec_prefix)
-Qsrcdir="$srcdir"
-Xsrcdir="`$translatepath "$srcdir"`"
-QXsrcdir="`echo "$Xsrcdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qsrcdir)
-AC_SUBST(Xsrcdir)
-AC_SUBST(QXsrcdir)
-Qlocalstatedir="$localstatedir"
-Xlocalstatedir="`$translatepath "$localstatedir"`"
-QXlocalstatedir="`echo "$Xlocalstatedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlocalstatedir)
-AC_SUBST(Xlocalstatedir)
-AC_SUBST(QXlocalstatedir)
-Qlibdir="$libdir"
-Xlibdir="`$translatepath "$libdir"`"
-QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibdir)
-AC_SUBST(Xlibdir)
-AC_SUBST(QXlibdir)
-Qsysconfdir="$sysconfdir"
-Xsysconfdir="`$translatepath "$sysconfdir"`"
-QXsysconfdir="`echo "$Xsysconfdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qsysconfdir)
-AC_SUBST(Xsysconfdir)
-AC_SUBST(QXsysconfdir)
-Qbindir="$bindir"
-Xbindir="`$translatepath "$bindir"`"
-QXbindir="`echo "$Xbindir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qbindir)
-AC_SUBST(Xbindir)
-AC_SUBST(QXbindir)
-Qlibexecdir="$libexecdir"
-Xlibexecdir="`$translatepath "$libexecdir"`"
-QXlibexecdir="`echo "$Xlibexecdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qlibexecdir)
-AC_SUBST(Xlibexecdir)
-AC_SUBST(QXlibexecdir)
-Qdatarootdir="$datarootdir"
-Xdatarootdir="`$translatepath "$datarootdir"`"
-QXdatarootdir="`echo "$Xdatarootdir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatarootdir)
-AC_SUBST(Xdatarootdir)
-AC_SUBST(QXdatarootdir)
-if test "${datadir}" = '${datarootdir}'; then
- datadir="${datarootdir}"
-fi
-Qdatadir="$datadir"
-Xdatadir="`$translatepath "$datadir"`"
-QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qdatadir)
-AC_SUBST(Xdatadir)
-AC_SUBST(QXdatadir)
-Qmandir="$mandir"
-Xmandir="`$translatepath "$mandir"`"
-QXmandir="`echo "$Xmandir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qmandir)
-AC_SUBST(Xmandir)
-AC_SUBST(QXmandir)
-Qincludedir="$includedir"
-Xincludedir="`$translatepath "$includedir"`"
-QXincludedir="`echo "$Xincludedir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qincludedir)
-AC_SUBST(Xincludedir)
-AC_SUBST(QXincludedir)
-Qinfodir="$infodir"
-Xinfodir="`$translatepath "$infodir"`"
-QXinfodir="`echo "$Xinfodir" | sed 's/\\\\/\\\\\\\\/g'`"
-AC_SUBST(Qinfodir)
-AC_SUBST(Xinfodir)
-AC_SUBST(QXinfodir)
-])
-
-
-dnl VERSION_TO_NUMBER macro (copied from libxslt)
-AC_DEFUN([MONETDB_VERSION_TO_NUMBER],
-[`$1 | sed 's|[[_\-]][[a-zA-Z0-9]]*$||' | awk 'BEGIN { FS = "."; } { printf
"%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`])
-
-
-AC_DEFUN([AM_MONETDB_COMMON],
-[
-
-dnl check for MonetDB Common Libraries
-have_monetdb=auto
-MONETDB_LIBS=""
-MONETDB_MODS=""
-MONETDB_MOD_PATH=""
-MONETDB_PREFIX="."
-if test "x$1" = "x"; then
- MONETDB_REQUIRED_VERSION="11.0.0"
- # ^^^^^^
- # Maintained via vertoo. Please don't modify by hand!
- # Contact [email protected] for details and/or
assistance.
-else
- MONETDB_REQUIRED_VERSION="$1"
-fi
-AC_SUBST(MONETDB_REQUIRED_VERSION)
-AC_ARG_WITH(monetdb,
- AS_HELP_STRING([--with-monetdb=DIR], [MonetDB Common is installed in
DIR]),
- have_monetdb="$withval")
-if test "x$have_monetdb" != xno; then
- case "$have_monetdb" in
- yes|auto) MPATH="${MONETDB_PREFIX+$MONETDB_PREFIX/bin:}$PATH:$prefix/bin";;
- included) MPATH="/hopefully-not-there";;
- "") MPATH="$PATH" ;;
- *) MPATH="$withval/bin:$PATH";;
- esac
- AC_PATH_PROG(MONETDB_CONFIG,monetdb-config,,$MPATH)
-
- if test "x$MONETDB_CONFIG" != x; then
- AC_MSG_CHECKING(whether MonetDB Common version $MONETDB_REQUIRED_VERSION
or newer is installed)
- MONETDB_VERSION=`$MONETDB_CONFIG --version`
- if test MONETDB_VERSION_TO_NUMBER(echo $MONETDB_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo $MONETDB_REQUIRED_VERSION); then
- have_monetdb=yes
- AC_MSG_RESULT($have_monetdb: found version $MONETDB_VERSION)
- else
- have_monetdb=no
- AC_MSG_RESULT($have_monetdb: found only version $MONETDB_VERSION)
- fi
- fi
-
- if test "x$have_monetdb" = "xincluded"; then
- have_monetdb=yes
- MONETDB_INCLUDEDIR="\$(top_srcdir)/../../MonetDB/MonetDB/src"
- MONETDB_INCS="-I${MONETDB_INCLUDEDIR}/common -I${MONETDB_INCLUDEDIR}/gdk"
- MONETDB_LIBS="-L${MONETDB_INCLUDEDIR}/common -L${MONETDB_INCLUDEDIR}/gdk"
- MONETDB_PREFIX="${prefix}"
- MONETDB_CONFDIR="${pkgdatadir}/conf"
- elif test "x$have_monetdb" != xyes; then
- MONETDB_INCS=""
- MONETDB_INCLUDEDIR=""
- MONETDB_LIBS=""
- MONETDB_PREFIX=""
- MONETDB_CONFDIR=""
- else
- MONETDB_INCS=`$MONETDB_CONFIG --includes`
- MONETDB_INCLUDEDIR=`$MONETDB_CONFIG --pkgincludedir`
- MONETDB_LIBS=`$MONETDB_CONFIG --libs`
- MONETDB_PREFIX=`$MONETDB_CONFIG --prefix`
- MONETDB_CONFDIR=`$MONETDB_CONFIG --pkgdatadir`/conf
- fi
-fi
-AC_SUBST(MONETDB_INCS)
-AC_SUBST(MONETDB_INCLUDEDIR)
-AC_SUBST(MONETDB_LIBS)
-AC_SUBST(MONETDB_PREFIX)
-AC_SUBST(MONETDB_CONFDIR)
-AC_SUBST(MONETDB_VERSION)
-AM_CONDITIONAL(HAVE_MONETDB,test x$have_monetdb = xyes)
-]) dnl AC_DEFUN AM_MONETDB_COMMON
-
-AC_DEFUN([AM_MONETDB_CLIENTS],
-[
-
-dnl check for MonetDB Client Libraries
-have_clients=auto
-CLIENTS_CFLAGS=""
-CLIENTS_LIBS=""
-CLIENTS_MODS=""
-CLIENTS_MOD_PATH=""
-CLIENTS_PREFIX="."
-if test "x$1" = "x"; then
- CLIENTS_REQUIRED_VERSION="11.0.0"
- # ^^^^^^
- # Maintained via vertoo. Please don't modify by hand!
- # Contact [email protected] for details and/or
assistance.
-else
- CLIENTS_REQUIRED_VERSION="$1"
-fi
-AC_SUBST(CLIENTS_REQUIRED_VERSION)
-AC_ARG_WITH(clients,
- AS_HELP_STRING([--with-clients=DIR], [MonetDB Clients is installed in
DIR]),
- have_clients="$withval")
-if test "x$have_clients" != xno; then
- case "$have_clients" in
- yes|auto) MPATH="${CLIENTS_PREFIX+$CLIENTS_PREFIX/bin:}$PATH:$prefix/bin";;
- included) MPATH="/hopefully-not-there";;
- "") MPATH="$PATH" ;;
- *) MPATH="$withval/bin:$PATH";;
- esac
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
