view src/libodbc++-1-libtool.patch @ 5531:eae508c12529

Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents 6e44b2527dbb
children
line wrap: on
line source

diff -uNr a/configure.ac b/configure.ac
--- a/configure.ac	2009-08-20 17:39:08.000000000 -0400
+++ b/configure.ac	2012-12-18 17:19:30.901179636 -0500
@@ -53,10 +53,11 @@
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_LANG_C
-AM_PROG_LIBTOOL
 AC_C_LONG_LONG
 AC_LANG_CPLUSPLUS
 
+LT_INIT([win32-dll])
+
 AC_PROG_INSTALL
 
 if test "x$GXX" = "xyes"
diff -uNr a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am	2005-08-25 09:52:07.000000000 -0400
+++ b/src/Makefile.am	2012-12-18 17:48:24.265430637 -0500
@@ -37,7 +37,7 @@
 datahandler.h \
 driverinfo.h
 
-ldflags=-version-info @lib_version@
+ldflags=-no-undefined -version-info @lib_version@
 
 # confusing conditionals follow
 
@@ -77,6 +77,7 @@
 
 libodbc___la_SOURCES=$(sources)
 libodbc___la_LDFLAGS=$(ldflags)
+libodbc___la_LIBADD=-lodbc32
 
 libodbc___qt_la_SOURCES=$(sources)
 libodbc___qt_la_LDFLAGS=$(ldflags)