Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17789/conf
Modified Files:
MonetDB.m4
Log Message:
propagated changes of Tuesday Jan 1 2008 - Tuesday Jan 22 2008
from the MonetDB_1-20 branch to the development trunk
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- MonetDB.m4 11 Jan 2008 10:33:51 -0000 1.61
+++ MonetDB.m4 22 Jan 2008 10:00:38 -0000 1.62
@@ -641,8 +641,8 @@
;;
yes-*-solaris*-*-*)
case `$bits-$CC -v 2>&1` in
- 32-*|*-*'gcc version 3.'*) ;;
- *) AC_MSG_ERROR([need GCC version 3.X for 64 bits]);;
+ 32-*|*-*'gcc version '[34]'.'*) ;;
+ *) AC_MSG_ERROR([need GCC version >=3.X for 64 bits]);;
esac
CC="$CC -m$bits"
;;
@@ -671,7 +671,8 @@
-*pgcc*-linux*-x86_64*-*)
CC="$CC -tp=k8-$bits"
;;
-yes-*-darwin8*-powerpc*-*)
+yes-*-darwin[[89]]*-powerpc*-*|yes-*-darwin[[89]]*-i?86*-*|yes-*-darwin[[89]]*-x86_64*-*)
+ # Darwin/OSX cases
CC="$CC -m$bits"
;;
*)
@@ -696,8 +697,8 @@
[use 32 bits vor OIDs on a 64-bit architecture]),
enable_oid32=$enableval,
enable_oid32=no)
-case $enable_oid32 in
-yes) AC_DEFINE(MONET_OID32, 1, [Define if the oid type should use 32 bits on
a 64-bit architecture])
+case $bits-$enable_oid32 in
+64-yes) AC_DEFINE(MONET_OID32, 1, [Define if the oid type should use 32
bits on a 64-bit architecture])
oids=32
;;
esac
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
