summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--plugins/omlibdbi/omlibdbi.c12
2 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index ca07be34..6bae1c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,7 +398,7 @@ if test "x$enable_libdbi" = "xyes"; then
[dbi],
[dbi_initialize],
[libdbi_cflags=""
- libdbi_libs="-lm -ldl -ldbi"
+ libdbi_libs="-ldbi"
],
[AC_MSG_FAILURE([libdbi library is missing])]
)
diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c
index 02b56b51..0b0f4abf 100644
--- a/plugins/omlibdbi/omlibdbi.c
+++ b/plugins/omlibdbi/omlibdbi.c
@@ -153,23 +153,13 @@ static rsRetVal initConn(instanceData *pData, int bSilent)
ASSERT(pData != NULL);
ASSERT(pData->conn == NULL);
+ // TODO: add config setting for driver directory
iDrvrsLoaded = dbi_initialize(NULL);
- //iDrvrsLoaded = dbi_initialize("/usr/lib64/dbd/");
-RUNLOG_VAR("%d", iDrvrsLoaded);
if(iDrvrsLoaded == 0) {
logerror("libdbi error: no dbi drivers present on this system - suspending. Install drivers!");
ABORT_FINALIZE(RS_RET_SUSPENDED);
}
- // debug drivers
- dbi_driver drvr;
- drvr = NULL;
- do {
-RUNLOG;
- drvr = dbi_driver_list(drvr);
- dbgprintf("driver: '%s'\n", dbi_driver_get_name(drvr));
- } while(drvr != NULL);
-
RUNLOG_VAR("%s", pData->drvrName);
pData->conn = dbi_conn_new((char*)pData->drvrName);
if(pData->conn == NULL) {