Mercurial > mxe-octave

annotate src/libodbc++-1-libtool.patch @ 3721:933b99febcf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2926
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/configure.ac b/configure.ac
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/configure.ac 2009-08-20 17:39:08.000000000 -0400
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/configure.ac 2012-12-18 17:19:30.901179636 -0500
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -53,10 +53,11 @@
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 AC_PROG_CXX
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 AC_PROG_CXXCPP
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 AC_LANG_C
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -AM_PROG_LIBTOOL
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 AC_C_LONG_LONG
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 AC_LANG_CPLUSPLUS
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 +LT_INIT([win32-dll])
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 +
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 AC_PROG_INSTALL
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 if test "x$GXX" = "xyes"
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 diff -uNr a/src/Makefile.am b/src/Makefile.am
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 --- a/src/Makefile.am 2005-08-25 09:52:07.000000000 -0400
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 +++ b/src/Makefile.am 2012-12-18 17:48:24.265430637 -0500
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 @@ -37,7 +37,7 @@
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 datahandler.h \
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 driverinfo.h
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 -ldflags=-version-info @lib_version@
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 +ldflags=-no-undefined -version-info @lib_version@
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 # confusing conditionals follow
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 @@ -77,6 +77,7 @@
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 libodbc___la_SOURCES=$(sources)
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 libodbc___la_LDFLAGS=$(ldflags)
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 +libodbc___la_LIBADD=-lodbc32
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 libodbc___qt_la_SOURCES=$(sources)
6e44b2527dbb shared libraries for libodbc++
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 libodbc___qt_la_LDFLAGS=$(ldflags)