commit f3f428df
Problems linking with libdbixx. Will now try to link directly to the default location if the file exists there.
An alternative solution is to install libdbixx corectly. This should still be allowed
Changed files
| M | src/Makefile before |
diff --git a/src/Makefile b/src/Makefile
index b50cb08..b86edf5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,9 +22,13 @@ ifeq ($(USEPOSTGRESQL),1)
endif
ifeq ($(USEDBIXX),1)
- BASE_LIBS+= -ldbixx
- O_FILES+= build/db2dbixx.o
- BASE_CFLAGS+= -DUSEDBIXX=1
+ifeq ($(wildcard /usr/local/lib/libdbixx.so),)
+ BASE_LIBS+= -ldbixx
+else
+ BASE_LIBS+= /usr/local/lib/libdbixx.so # -ldbixx
+endif
+ O_FILES+= build/db2dbixx.o
+ BASE_CFLAGS+= -DUSEDBIXX=1
endif
O_FILES+= build/db2xml.o
@@ -105,4 +109,5 @@ build/warmup2db.o: oss2db/Warmup2Db.cpp oss2db/Warmup2Db.hpp $(H_FILES)
g++ $(BASE_CFLAGS) oss2db/Warmup2Db.cpp -o build/warmup2db.o
build/accuracy2db.o: oss2db/Accuracy2Db.cpp oss2db/Accuracy2Db.hpp $(H_FILES)
- g++ $(BASE_CFLAGS) oss2db/Accuracy2Db.cpp -o build/accuracy2db.o
\ No newline at end of file
+ g++ $(BASE_CFLAGS) oss2db/Accuracy2Db.cpp -o build/accuracy2db.o
+