Changeset: 2749e030c420 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2749e030c420 Modified Files: configure.ag Branch: default Log Message:
Update bug report address (use URL); minor rearrangements of code. diffs (82 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -10,7 +10,7 @@ dnl Copyright 1997 - July 2008 CWI, Augu # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([MonetDB], [11.24.0], [[email protected]], [MonetDB], [http://www.monetdb.org/]) +AC_INIT([MonetDB], [11.24.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) AC_CANONICAL_HOST @@ -24,6 +24,8 @@ AC_SUBST([CONFIG_H], [monetdb_config.h]) HOST=[$target] AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier]) +AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"]) + if test x"$target_os" = xcygwin; then AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under Cygwin)]) fi @@ -47,9 +49,7 @@ dnl VERSION_TO_NUMBER macro (copied from AC_DEFUN([MONETDB_VERSION_TO_NUMBER], [`$1 | sed 's|[[_\-]][[a-zA-Z0-9]]*$||' | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`]) -# BUILD and SOURCE are *only* used for monetdb-config and RunMserver -# SOURCE is the absolute path name of the source directory -# (srcdir can be relative) +# BUILD and SOURCE are *only* used for testing. # The Q versions of various variables are used in places where \'s # need to be escapes with an extra \. Configure does not support \'s @@ -86,24 +86,6 @@ else fi AC_SUBST([Qexec_prefix]) -if test -f "$srcdir"/vertoo.data; then - dnl Developers compiling from Mercurial: - dnl default is --enable-strict --enable-assert --enable-debug --disable-optimize --enable-developer - dft_strict=yes - dft_assert=yes - dft_debug=yes - dft_optimize=no - dft_developer=yes -else - dnl Users compiling from source tarball(s): - dnl default is --disable-strict --disable-assert --disable-debug --disable-optimize --disable-developer - dft_strict=no - dft_assert=no - dft_debug=no - dft_optimize=no - dft_developer=no -fi - 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 @@ -124,7 +106,23 @@ case "$CC" in ;; esac -AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"]) +if test -f "$srcdir"/vertoo.data; then + dnl Developers compiling from Mercurial: + dnl default is --enable-strict --enable-assert --enable-debug --disable-optimize --enable-developer + dft_strict=yes + dft_assert=yes + dft_debug=yes + dft_optimize=no + dft_developer=yes +else + dnl Users compiling from source tarball(s): + dnl default is --disable-strict --disable-assert --disable-debug --disable-optimize --disable-developer + dft_strict=no + dft_assert=no + dft_debug=no + dft_optimize=no + dft_developer=no +fi dft_gdk=yes AC_ARG_ENABLE([gdk], _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
