| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | Subject: [PATCH] do not use libltdl source directory |
| 2 | |
| 3 | Don't use the included libltdl, use the one provided |
| 4 | by our libtool instead. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | Signed-off-by: Song.Li <Song.Li@windriver.com> |
| 9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 10 | --- |
| 11 | Makefile.am | 1 - |
| 12 | configure.ac | 2 -- |
| 13 | 2 files changed, 3 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile.am b/Makefile.am |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 16 | index 4628401..e8989bf 100644 |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 17 | --- a/Makefile.am |
| 18 | +++ b/Makefile.am |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 19 | @@ -11,7 +11,6 @@ SUBDIRS = \ |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 20 | log \ |
| 21 | lst \ |
| 22 | ini \ |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 23 | - libltdl \ |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 24 | odbcinst \ |
| 25 | DriverManager \ |
| 26 | exe \ |
| 27 | diff --git a/configure.ac b/configure.ac |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 28 | index e4bcdaf..58aa5c5 100644 |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 29 | --- a/configure.ac |
| 30 | +++ b/configure.ac |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 31 | @@ -144,9 +144,7 @@ dnl AC_CONFIG_MACRO_DIR([libltdl/m4]) |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 32 | dnl LT_CONFIG_LTDL_DIR([libltdl]) |
| 33 | dnl LTDL_INIT |
| 34 | |
| 35 | -LT_CONFIG_LTDL_DIR([libltdl]) |
| 36 | LT_INIT([dlopen]) |
| 37 | -LTDL_INIT([convenience]) |
| 38 | |
| 39 | dnl Substitute INCLTDL and LIBLTDL in the Makefiles |
| 40 | AC_SUBST(LTDLINCL) |
| 41 | -- |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 42 | 2.12.3 |
| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 43 | |