Mercurial > mxe-octave
view src/libodbc++-1-libtool.patch @ 3721:933b99febcf1
Expand options to support 3 possible sources of octave
* configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default)
* Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure.
* index.html: added master-octave information.
* src/default-octave.mk: new file.
* src/default-octave-1-docinstall.patch
* dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk
* binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 19 Oct 2014 22:58:20 -0400 |
| 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)