From 6fbc8e85ce7a3cfc98a2468fdd09657e7c917ec7 Mon Sep 17 00:00:00 2001 From: Hiroshi Inoue Date: Wed, 22 Mar 2017 19:12:21 +0900 Subject: [PATCH] Generate psqlodbca.so(ANSI version of driver) as well as psqlodbca.so at once. --- Makefile.am | 10 ++++------ configure.ac | 11 ----------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index f484ba2..4358b34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,14 +8,12 @@ AUTOMAKE_OPTIONS = 1.8 foreign ACLOCAL_AMFLAGS = -I config -if enable_unicode -lib_LTLIBRARIES = psqlodbcw.la -else -lib_LTLIBRARIES = psqlodbca.la -endif +lib_LTLIBRARIES = psqlodbcw.la psqlodbca.la AM_LDFLAGS = -module -no-undefined -avoid-version -export-symbols-regex '^SQL' +psqlodbcw_la_CFLAGS = -DUNICODE_SUPPORT # -DUNICODE_SUPPORTXX + psqlodbca_la_SOURCES = \ info.c bind.c columninfo.c connection.c convert.c drvconn.c \ environ.c execute.c lobj.c misc.c options.c \ @@ -100,7 +98,7 @@ EXTRA_DIST = license.txt readme.txt readme_winbuild.txt \ test/win.mak \ test/Makefile \ test/expected \ - test/src + test/src MAINTAINERCLEANFILES = \ Makefile.in config/config.guess config.h.in config/config.sub configure \ diff --git a/configure.ac b/configure.ac index 95dc800..3c7e61b 100644 --- a/configure.ac +++ b/configure.ac @@ -150,17 +150,6 @@ if test "$with_libpq" != yes; then fi fi -# -# Unicode support -# - -PGAC_ARG_BOOL(enable, unicode, yes, - [ --disable-unicode do not build Unicode support], - [AC_DEFINE(UNICODE_SUPPORT, 1, - [Define to 1 to build with Unicode support (--enable-unicode)])]) - -AM_CONDITIONAL(enable_unicode, [test x"$enable_unicode" = xyes]) - # # Pthreads # -- 2.39.5