From 422946df59a013e2d5512137497c0648575f1828 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 24 Apr 2011 12:20:21 +0200 Subject: Fix dynamic library support in autotools build --- configure.ac | 5 +++++ odb/qt/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 94e07cd..f256cb1 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,11 @@ LIBQTCORE([],[AC_MSG_ERROR([QtCore is not found; consider using CPPFLAGS/LDFLAGS # LIBODB([], [AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])]) +# Define LIBODB_QT_STATIC_LIB if we are build static library on certain +# platforms. +# +STATIC_LIB([LIBODB_QT_STATIC_LIB], [Static library interface.]) + # Allow the user to specify the pkgconfig directory. # PKGCONFIG diff --git a/odb/qt/Makefile.am b/odb/qt/Makefile.am index a923820..2c29ab2 100644 --- a/odb/qt/Makefile.am +++ b/odb/qt/Makefile.am @@ -12,5 +12,5 @@ nobase_nodist_odbqtinclude_HEADERS = details/config.h EXTRA_DIST = __file__(extra_dist) -AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' +AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' -DLIBODB_QT_DYNAMIC_LIB AM_LDFLAGS = -release __value__(interface_version) -no-undefined -- cgit v1.1