From 80f34dd5545c659f135182cf6d87664ad0e979d9 Mon Sep 17 00:00:00 2001 From: prabatuty Date: Mon, 14 Mar 2011 16:05:54 +0000 Subject: [PATCH] windows porting fixes for -ldl --- include/NanoTimer.h | 1 + src/tools/Makefile.am | 30 +++++++++++++++--------------- src/tools/Makefile.am.full | 30 +++++++++++++++--------------- src/tools/Makefile.am.mmdb | 16 ++++++++-------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/include/NanoTimer.h b/include/NanoTimer.h index 1cebec79..22f89c4b 100644 --- a/include/NanoTimer.h +++ b/include/NanoTimer.h @@ -6,6 +6,7 @@ #ifndef NANO_TIMER_H #define NANO_TIMER_H +#include #include #include class DllExport NanoTimer diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 120c1ef6..1e0e22bc 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -11,7 +11,7 @@ csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses +csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl redo_SOURCES = redo.cxx redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -22,7 +22,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses +redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl applyofflinelogs_SOURCES = applyofflinelogs.cxx applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -33,7 +33,7 @@ applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl recover_SOURCES = recover.cxx recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -44,7 +44,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc +recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc -ldl checkpoint_SOURCES = checkpoint.cxx checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -55,7 +55,7 @@ checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc +checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc -ldl catalog_SOURCES = catalog.cxx catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -66,7 +66,7 @@ catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -catalog_LDFLAGS = -lcrypt -lrt +catalog_LDFLAGS = -lcrypt -lrt -ldl cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sql/libcsqlsql.la \ @@ -76,7 +76,7 @@ cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -cachetable_LDFLAGS = -lcrypt -lodbc -lrt +cachetable_LDFLAGS = -lcrypt -lodbc -lrt -ldl cachetable_SOURCES = cachetable.cxx cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -88,7 +88,7 @@ cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/storage/libcsql.la -cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl cacheverify_SOURCES = cacheverify.cxx csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -99,7 +99,7 @@ csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlserver_SOURCES = csqlserver.cxx csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -111,7 +111,7 @@ csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlasyncserver_SOURCES = csqlasyncserver.cxx csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -123,7 +123,7 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -135,7 +135,7 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqldump_SOURCES = csqldump.cxx csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -146,7 +146,7 @@ csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread +csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcacheserver_SOURCES = csqlcacheserver.cxx csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -157,11 +157,11 @@ csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread +csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcheckpointserver_SOURCES = csqlcheckpointserver.cxx csqlds_LDADD = $(top_builddir)/src/storage/libcsql.la -csqlds_LDFLAGS = -lcrypt +csqlds_LDFLAGS = -lcrypt -ldl csqlds_SOURCES = csqlds.cxx diff --git a/src/tools/Makefile.am.full b/src/tools/Makefile.am.full index 120c1ef6..1e0e22bc 100644 --- a/src/tools/Makefile.am.full +++ b/src/tools/Makefile.am.full @@ -11,7 +11,7 @@ csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses +csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl redo_SOURCES = redo.cxx redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -22,7 +22,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses +redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl applyofflinelogs_SOURCES = applyofflinelogs.cxx applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -33,7 +33,7 @@ applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl recover_SOURCES = recover.cxx recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -44,7 +44,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc +recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc -ldl checkpoint_SOURCES = checkpoint.cxx checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -55,7 +55,7 @@ checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc +checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc -ldl catalog_SOURCES = catalog.cxx catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -66,7 +66,7 @@ catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -catalog_LDFLAGS = -lcrypt -lrt +catalog_LDFLAGS = -lcrypt -lrt -ldl cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sql/libcsqlsql.la \ @@ -76,7 +76,7 @@ cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -cachetable_LDFLAGS = -lcrypt -lodbc -lrt +cachetable_LDFLAGS = -lcrypt -lodbc -lrt -ldl cachetable_SOURCES = cachetable.cxx cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -88,7 +88,7 @@ cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/storage/libcsql.la -cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl cacheverify_SOURCES = cacheverify.cxx csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -99,7 +99,7 @@ csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlserver_SOURCES = csqlserver.cxx csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -111,7 +111,7 @@ csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlasyncserver_SOURCES = csqlasyncserver.cxx csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -123,7 +123,7 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -135,7 +135,7 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc +csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqldump_SOURCES = csqldump.cxx csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -146,7 +146,7 @@ csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread +csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcacheserver_SOURCES = csqlcacheserver.cxx csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -157,11 +157,11 @@ csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread +csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcheckpointserver_SOURCES = csqlcheckpointserver.cxx csqlds_LDADD = $(top_builddir)/src/storage/libcsql.la -csqlds_LDFLAGS = -lcrypt +csqlds_LDFLAGS = -lcrypt -ldl csqlds_SOURCES = csqlds.cxx diff --git a/src/tools/Makefile.am.mmdb b/src/tools/Makefile.am.mmdb index bfe06f8a..10336980 100644 --- a/src/tools/Makefile.am.mmdb +++ b/src/tools/Makefile.am.mmdb @@ -7,7 +7,7 @@ csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csql_LDFLAGS = -lrt -lpthread -lcrypt -lreadline -lcurses +csql_LDFLAGS = -lrt -lpthread -lcrypt -lreadline -lcurses -ldl redo_SOURCES = redo.cxx redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -15,7 +15,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -redo_LDFLAGS = -lrt -lpthread -lcrypt +redo_LDFLAGS = -lrt -lpthread -lcrypt -ldl recover_SOURCES = recover.cxx recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -23,7 +23,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -recover_LDFLAGS = -lrt -lpthread -lcrypt +recover_LDFLAGS = -lrt -lpthread -lcrypt -ldl catalog_SOURCES = catalog.cxx catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -31,10 +31,10 @@ catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -catalog_LDFLAGS = -lcrypt +catalog_LDFLAGS = -lcrypt -ldl csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la -csqlserver_LDFLAGS = -lcrypt -lrt -lpthread +csqlserver_LDFLAGS = -lcrypt -lrt -lpthread -ldl csqlserver_SOURCES = csqlserver.cxx csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -42,7 +42,7 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/storage/libcsql.la -csqlsqlserver_LDFLAGS = -lcrypt -lrt -lpthread +csqlsqlserver_LDFLAGS = -lcrypt -lrt -lpthread -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ @@ -50,7 +50,7 @@ csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la -csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread +csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcheckpointserver_SOURCES = csqlcheckpointserver.cxx csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ @@ -58,5 +58,5 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/storage/libcsql.la -csqldump_LDFLAGS = -lrt -lpthread -lcrypt +csqldump_LDFLAGS = -lrt -lpthread -lcrypt -ldl csqldump_SOURCES = csqldump.cxx -- 2.11.4.GIT