Changeset: 02d41779b83b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02d41779b83b Modified Files: sql/configure.ag sql/src/backends/monet5/merovingian/utils/utils.c Branch: default Log Message:
Merged from Oct2010 diffs (48 lines): diff -r 434898c64e6c -r 02d41779b83b sql/ChangeLog.Oct2010 --- a/sql/ChangeLog.Oct2010 Wed Sep 22 17:14:13 2010 +0200 +++ b/sql/ChangeLog.Oct2010 Wed Sep 22 17:38:05 2010 +0200 @@ -1,5 +1,8 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Wed Sep 22 2010 Fabian Groffen <[email protected]> +- Improved uuid detection, to solve problems like bug #2675 + * Wed Jun 23 2010 Niels Nes <[email protected]> - make it possible to use '?' in offset and limit diff -r 434898c64e6c -r 02d41779b83b sql/configure.ag --- a/sql/configure.ag Wed Sep 22 17:14:13 2010 +0200 +++ b/sql/configure.ag Wed Sep 22 17:38:05 2010 +0200 @@ -208,8 +208,9 @@ dnl stuff required for merovingian and monetdb AC_CHECK_HEADERS([fcntl.h stropts.h sys/ioctl.h sys/un.h termios.h]) -AC_CHECK_HEADERS([uuid/uuid.h]) -AC_SEARCH_LIBS([uuid_generate], [uuid]) +AC_CHECK_HEADERS([uuid/uuid.h], + AC_SEARCH_LIBS([uuid_generate], [uuid], + [AC_DEFINE([HAVE_UUID], 1, [Define when uuid_* is available and linkable on this system])])) AC_SUBST([MONETDB5_CONFFILE]) AC_SUBST([MERO_LOG], [$MONETDB5_LOGDIR/merovingian.log]) AC_DEFINE_UNQUOTED([MERO_LOG], ["$MONETDB5_LOGDIR/merovingian.log"], [where Merovingian will store its logs by default]) diff -r 434898c64e6c -r 02d41779b83b sql/src/backends/monet5/merovingian/utils/utils.c --- a/sql/src/backends/monet5/merovingian/utils/utils.c Wed Sep 22 17:14:13 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/utils/utils.c Wed Sep 22 17:38:05 2010 +0200 @@ -33,7 +33,7 @@ #include <string.h> /* memcpy */ #include <strings.h> /* strcasecmp */ #include <gdk.h> /* GDKmalloc */ -#ifdef HAVE_UUID_UUID_H +#ifdef HAVE_UUID #include <uuid/uuid.h> #endif @@ -345,7 +345,7 @@ char * generateUUID(void) { -#ifdef HAVE_UUID_UUID_H +#ifdef HAVE_UUID # ifdef UUID_PRINTABLE_STRING_LENGTH /* Solaris */ char out[UUID_PRINTABLE_STRING_LENGTH]; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
