Changeset: f6d91ae9eaeb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6d91ae9eaeb
Modified Files:
clients/configure.ag
clients/src/mapiclient/Makefile.ag
clients/src/mapilib/Makefile.ag
clients/src/odbc/driver/Makefile.ag
Branch: default
Log Message:
use pkg-config to check for stream and mutils
diffs (112 lines):
diff -r 13751ce668dc -r f6d91ae9eaeb clients/configure.ag
--- a/clients/configure.ag Thu Sep 23 10:43:28 2010 +0200
+++ b/clients/configure.ag Thu Sep 23 11:29:45 2010 +0200
@@ -39,6 +39,10 @@
HOST=[$target]
AC_DEFINE_UNQUOTED(HOST, "$HOST", [Host identifier])
+PKG_PROG_PKG_CONFIG()
+# extend search path with current prefix
+PKG_CONFIG_PATH=${libdir}/pkgconfig:$PKG_CONFIG_PATH
+
if test x"$target_os" = xcygwin; then
AC_DEFINE(WIN32, 1, [Define on MS Windows (also under Cygwin)])
fi
@@ -66,14 +70,10 @@
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
-AM_MONETDB_COMMON($req_monetdb_ver)
-if test "x$have_monetdb" != xyes; then
- if test "x$MONETDB_VERSION" = "x"; then
- AC_MSG_ERROR([MonetDB was not found. Clients requires at least
version $req_monetdb_ver of MonetDB.])
- else
- AC_MSG_ERROR([Clients requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDB_VERSION was found.])
- fi
-fi
+
+PKG_CHECK_MODULES([monetdbtools], [monetdb-stream >= $req_monetdb_ver
+ monetdb-mutils >= $req_monetdb_ver])
+
AM_MONETDB_DEFAULTS()
AM_MONETDB_COMPILER()
AM_MONETDB_TOOLS()
diff -r 13751ce668dc -r f6d91ae9eaeb clients/src/mapiclient/Makefile.ag
--- a/clients/src/mapiclient/Makefile.ag Thu Sep 23 10:43:28 2010 +0200
+++ b/clients/src/mapiclient/Makefile.ag Thu Sep 23 11:29:45 2010 +0200
@@ -16,7 +16,7 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = -I.. $(MONETDB_INCS) $(READLINE_INCS) $(OPENSSL_INCS)
$(ICONV_CFLAGS)
+INCLUDES = -I.. $(monetdbtools_CFLAGS) $(READLINE_INCS) $(OPENSSL_INCS)
$(ICONV_CFLAGS)
MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS) $(ICONV_LIBS)
@@ -29,23 +29,20 @@
bin_mclient = {
SOURCES = mclient.c ReadlineTools.c ReadlineTools.h
LIBS = libmcutil ../mapilib/libMapi $(MAPI_LIBS) $(READLINE_LIBS) \
- $(MONETDB_LIBS) -lmutils -lstream \
- $(ICONV_LIBS)
+ $(monetdbtools_LIBS) $(ICONV_LIBS)
}
bin_msqldump = {
SOURCES = msqldump.c
LIBS = libmcutil ../mapilib/libMapi $(MAPI_LIBS) \
- $(MONETDB_LIBS) -lmutils -lstream \
- $(ICONV_LIBS)
+ $(monetdbtools_LIBS) $(ICONV_LIBS)
}
bin_stethoscope = {
SOURCES = stethoscope.c
LIBS = libmcutil \
../mapilib/libMapi $(MAPI_LIBS) \
- $(MONETDB_LIBS) -lmutils -lstream \
- $(MALLOC_LIBS) $(PTHREAD_LIBS)
+ $(monetdbtools_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS)
}
man_MANS = mclient.1
diff -r 13751ce668dc -r f6d91ae9eaeb clients/src/mapilib/Makefile.ag
--- a/clients/src/mapilib/Makefile.ag Thu Sep 23 10:43:28 2010 +0200
+++ b/clients/src/mapilib/Makefile.ag Thu Sep 23 11:29:45 2010 +0200
@@ -16,13 +16,13 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = $(MONETDB_INCS) $(OPENSSL_INCS)
+INCLUDES = $(monetdbtools_CFLAGS) $(OPENSSL_INCS)
MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS)
lib_Mapi = {
SOURCES = Mapi.mx Mapi.rc
- LIBS = $(MAPI_LIBS) $(MONETDB_LIBS) -lmutils -lstream
+ LIBS = $(MAPI_LIBS) $(monetdbtools_LIBS)
}
headers_mapi = {
diff -r 13751ce668dc -r f6d91ae9eaeb clients/src/odbc/driver/Makefile.ag
--- a/clients/src/odbc/driver/Makefile.ag Thu Sep 23 10:43:28 2010 +0200
+++ b/clients/src/odbc/driver/Makefile.ag Thu Sep 23 11:29:45 2010 +0200
@@ -17,7 +17,7 @@
INCLUDES = \
../.. \
- $(MONETDB_INCS) \
+ $(monetdbtools_CFLAGS) \
$(ODBC_INCS)
DEFS = @DEFS@
@@ -116,7 +116,7 @@
SQLTransact.c \
driver.rc \
ODBC.syms
- LIBS = ../../mapilib/libMapi $(MONETDB_LIBS) -lstream $(ICONV_LIBS)
$(ODBC_LIBS) $(SOCKET_LIBS)
+ LIBS = ../../mapilib/libMapi $(monetdbtools_LIBS) $(ICONV_LIBS)
$(ODBC_LIBS) $(SOCKET_LIBS)
}
headers_pc = {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
