Changeset: 074baff20a55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=074baff20a55
Modified Files:
buildtools/ChangeLog.Jul2012
configure.ag
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (115 lines):
diff --git a/buildtools/ChangeLog.Jul2012 b/buildtools/ChangeLog.Jul2012
--- a/buildtools/ChangeLog.Jul2012
+++ b/buildtools/ChangeLog.Jul2012
@@ -1,6 +1,9 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Jun 5 2012 Sjoerd Mullender <sjo...@acm.org>
+- Removed --enable-bits option from configure.
+
* Thu Apr 19 2012 Sjoerd Mullender <sjo...@acm.org>
- Split the MonetDB-client-ruby RPM package into two and named them in
accordance with the Fedora packaging guidelines as rubygem-<gem-name>.
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -383,80 +383,20 @@ esac
AC_ARG_WITH(bits,
AS_HELP_STRING([--with-bits=BITS],
- [obsolete: use --enable-bits instead]),
- AC_MSG_ERROR([argument --with-bits is obsolete: use --enable-bits
instead]))
+ [obsolete: specify by setting CC in the environment]),
+ AC_MSG_ERROR([argument --with-bits is obsolete: specify by setting CC
in the environment]))
AC_CHECK_SIZEOF(long)
native_bits=`expr $ac_cv_sizeof_long \* 8`
bits=$native_bits
AC_ARG_ENABLE(bits,
- AS_HELP_STRING([--enable-bits=BITS],
- [specify number of bits (32 or 64)]), [
-case "$GCC-$CC-$enableval" in
-*-*-$native_bits)
- ;;
--*icc*-*)
- AC_MSG_ERROR([icc does not support a command line option to switch
between 32- & 64-bit compilation; please use CC & PATH (instead of
--enable-bits=$enableval) to point to the $enableval-bit version of icc])
- ;;
-*-*-32|*-*-64)
- ;;
-*)
- AC_MSG_ERROR(--enable-bits argument must be either 32 or 64)
- ;;
-esac
-bits=$enableval
-])
-case "$GCC-$CC-$host_os-$host-$bits" in
-*-*-*-*-$native_bits)
- ;;
-yes-*-solaris*-*-*)
- case "$bits-`$CC -v 2>&1`" in
- 32-*|*-*'gcc version '[[34]]'.'*) ;;
- *) AC_MSG_ERROR([need GCC version >=3.X for 64 bits]);;
- esac
- CC="$CC -m$bits"
- ;;
--*-solaris*-*-*)
- CC="$CC -m$bits"
- ;;
-yes-*-irix*-*-*)
- CC="$CC -mabi=$bits"
- ;;
--*-irix*-*-*)
- CC="$CC -$bits"
- ;;
-yes-*-aix*-*-64)
- CC="$CC -maix$bits"
- AR="ar -X64"
- NM="nm -X64 -B"
- ;;
--*-aix*-*-64)
- CC="$CC -q$bits"
- AR="ar -X64"
- NM="nm -X64 -B"
- ;;
-yes-*-linux*-x86_64*-*)
- CC="$CC -m$bits"
- ;;
--*pgcc*-linux*-x86_64*-*)
- CC="$CC -tp=k8-$bits"
- ;;
-yes-*-darwin[[89]]*-powerpc*-*|yes-*-darwin[[89]]*-i?86*-*|yes-*-darwin[[89]]*-x86_64*-*)
- # Darwin/OSX cases
- CC="$CC -m$bits"
- ;;
-*)
- AC_MSG_ERROR([case "$GCC-$CC-$host_os-$host-$bits" not handled with
--enable-bits, yet; please use CC, CFLAGS and/or LDFLAGS (instead of
--enable-bits=$bits) to make "$CC" produce $bits-bit code])
- ;;
-esac
-if test x"$bits" != x"$native_bits"; then
- unset ac_cv_sizeof_long
- AC_CHECK_SIZEOF(long)
- alien_bits=`expr $ac_cv_sizeof_long \* 8`
- if test x"$alien_bits" != x"$bits"; then
- AC_MSG_ERROR([CC="$CC" seems to produce $alien_bits-bit code,
not matching the "--enable-bits=$bits" request])
- fi
-fi
+ AS_HELP_STRING([--enable-bits],
+ [obsolete: specify by setting CC in the environment]),
+ if test x$enableval = x$bits; then
+ AC_MSG_WARN([argument --enable-bits is obsolete: specify by
setting CC in the environment])
+ else
+ AC_MSG_ERROR([argument --enable-bits is obsolete: specify by
setting CC in the environment])
+ fi)
AC_SUBST(bits)
AM_CONDITIONAL(BITS32, test x"$bits" = x32)
AM_CONDITIONAL(BITS64, test x"$bits" = x64)
@@ -533,7 +473,7 @@ AC_DEFUN([MCHECK_ADD_FLAG],
dnl do not use AC_LANG_PROGRAM here, because it generates a program
dnl with "int main() {" function, which triggers
dnl old-style-definition warnings
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_STRING_H
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
