Changeset: e5d5736b5ebf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5d5736b5ebf
Modified Files:
configure.ag
gdk/Makefile.ag
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (92 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -50,6 +50,10 @@
PKG_PROG_PKG_CONFIG
+if test x"$PKG_CONFIG" = x ; then
+ AC_MSG_ERROR([pkg-config is required to configure MonetDB])
+fi
+
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;}'`])
@@ -2049,11 +2053,6 @@
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(PTHREAD_INCS)
-dnl sysctl is in libc on FreeBSD and NetBSD according to their manpages
-C_LIBS=""
-AC_CHECK_LIB(c, sysctl, [ C_LIBS="-lc" ] )
-AC_SUBST(C_LIBS)
-
dnl libreadline
have_readline=auto
READLINE_LIBS=""
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -50,5 +50,5 @@
../common/stream/libstream \
../common/utils/libmutils \
$(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) \
- $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) $(C_LIBS)
+ $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
diff --git a/monetdb5/ChangeLog.Apr2011 b/monetdb5/ChangeLog.Apr2011
--- a/monetdb5/ChangeLog.Apr2011
+++ b/monetdb5/ChangeLog.Apr2011
@@ -1,3 +1,7 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed May 11 2011 Sjoerd Mullender <sjo...@acm.org>
+- Fixed a bug in conversion from string to the URL type. The bug was
+ an incorrect call to free().
+
diff --git a/monetdb5/modules/atoms/url.mx b/monetdb5/modules/atoms/url.mx
--- a/monetdb5/modules/atoms/url.mx
+++ b/monetdb5/modules/atoms/url.mx
@@ -931,7 +931,7 @@
{
/* actually parse the message for valid url */
if (*url !=0)
- GDKfree(url);
+ GDKfree(*url);
*len = (int) strlen(src);
*url = GDKstrdup(src);
diff --git a/tools/merovingian/client/Makefile.ag
b/tools/merovingian/client/Makefile.ag
--- a/tools/merovingian/client/Makefile.ag
+++ b/tools/merovingian/client/Makefile.ag
@@ -36,6 +36,5 @@
$(UUID_LIBS) \
$(curl_LIBS) \
$(SOCKET_LIBS) \
- $(MALLOC_LIBS) \
- $(C_LIBS)
+ $(MALLOC_LIBS)
}
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -69,6 +69,5 @@
$(curl_LIBS) \
$(SOCKET_LIBS) \
$(MALLOC_LIBS) \
- $(PTHREAD_LIBS) \
- $(C_LIBS)
+ $(PTHREAD_LIBS)
}
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -33,6 +33,6 @@
SOURCES = mserver5.c monet_version.h monet_version.c.in
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
- $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
$(C_LIBS) \
+ $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) \
$(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB)
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
