Changeset: a17328e35566 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a17328e35566
Modified Files:
buildtools/conf/MonetDB.m4
clients/src/mapiclient/mclient.c
Branch: default
Log Message:
Backed out changeset 4fc48af8a959
it's more accidential commit than the actual undo
diffs (47 lines):
diff -r 4fc48af8a959 -r a17328e35566 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Thu Nov 25 13:14:45 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Thu Nov 25 13:24:47 2010 +0100
@@ -2447,10 +2447,10 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $OPENSSL_INCS"
if test "x$have_openssl" != xno; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
<openssl/ssl.h>]],[[]])], , [
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include
<openssl/ssl.h>],[]), , [
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_KRB5"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include
<openssl/ssl.h>]],[[]])],
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include
<openssl/ssl.h>],[]),
AC_DEFINE(OPENSSL_NO_KRB5, 1, [Define if
OpenSSL should not use Kerberos 5]),
[ why_no_openssl="OpenSSL library not usable";
if test "x$have_openssl" != xauto; then AC_MSG_ERROR([$why_no_openssl]); fi;
have_openssl=no ])
CPPFLAGS="$save_CPPFLAGS"])
@@ -2647,7 +2647,7 @@
CPPFLAGS="$CPPFLAGS $Z_CFLAGS"
save_LIBS="$LIBS"
LIBS="$LIBS $Z_LIBS -lz"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <zlib.h>]], [[(void)
gzopen("","");]])],
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <zlib.h>], [(void)
gzopen("","");]),
Z_LIBS="$Z_LIBS -lz",
[ if test "x$have_z" != xauto; then AC_MSG_ERROR([z
library not found]); fi; have_z=no ])
LIBS="$save_LIBS"
@@ -2694,8 +2694,8 @@
CPPFLAGS="$CPPFLAGS $BZ_CFLAGS"
save_LIBS="$LIBS"
LIBS="$LIBS $BZ_LIBS -lbz2"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <bzlib.h>]], [[(void)BZ2_bzopen("","");]])],
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <stdio.h>
+#include <bzlib.h>], [(void)BZ2_bzopen("","");]),
BZ_LIBS="$BZ_LIBS -lbz2",
[ if test "x$have_bz2" != xauto; then AC_MSG_ERROR([bz2
library not found]); fi; have_bz2=no ])
LIBS="$save_LIBS"
diff -r 4fc48af8a959 -r a17328e35566 clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c Thu Nov 25 13:14:45 2010 +0100
+++ b/clients/src/mapiclient/mclient.c Thu Nov 25 13:24:47 2010 +0100
@@ -2124,6 +2124,7 @@
MD_SEQ,
nameq,
x);
+ printf("%s\n", q);
hdl = mapi_query(mid, q);
CHECK_RESULT(mid, hdl, buf,
continue);
while (fetch_row(hdl) == 5) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
