Name libraries psqlodbca or psqlodbcw, depending on whether Unicode is

enabled.

diff --git a/Makefile.am b/Makefile.am
index 12444099b09fa70d96c228159c73faa0e5b15577..53e9593c537160c178ba6bed211115f304a809a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,22 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.30 2005/12/08 08:57:42 dpage Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.31 2006/01/14 18:12:00 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 AUTOMAKE_OPTIONS = 1.6 foreign
 
-lib_LTLIBRARIES = psqlodbc.la
-
-psqlodbc_la_LDFLAGS = -module -no-undefined -avoid-version
+if enable_unicode
+lib_LTLIBRARIES = psqlodbcw.la
+else
+lib_LTLIBRARIES = psqlodbca.la
+endif
 
-psqlodbc_la_LIBADD = -lpq
+AM_LDFLAGS = -module -no-undefined -avoid-version
+LIBS += -lpq
 
-psqlodbc_la_SOURCES = \
+psqlodbca_la_SOURCES = \
    info.c bind.c columninfo.c connection.c convert.c drvconn.c \
    environ.c execute.c win_md5.c misc.c options.c \
    pgtypes.c psqlodbc.c qresult.c results.c parse.c \
@@ -22,19 +25,18 @@ psqlodbc_la_SOURCES = \
    multibyte.c \
    odbcapi30.c pgapi30.c info30.c descriptor.c
 
-psqlodbc_la_SOURCES += \
+psqlodbca_la_SOURCES += \
    bind.h columninfo.h connection.h convert.h descriptor.h \
    dlg_specific.h environ.h \
    connection.h md5.h misc.h multibyte.h pgapifunc.h pgtypes.h \
    psqlodbc.h qresult.h resource.h statement.h tuple.h \
    tuplelist.h version.h
 
-if enable_unicode   
-psqlodbc_la_SOURCES += \
-odbcapi30w.c odbcapiw.c win_unicode.c   
-endif
+psqlodbcw_la_SOURCES = $(psqlodbca_la_SOURCES) \
+   odbcapi30w.c odbcapiw.c win_unicode.c    
 
-EXTRA_psqlodbc_la_SOURCES = md5.c
+EXTRA_psqlodbca_la_SOURCES = md5.c
+EXTRA_psqlodbcw_la_SOURCES = md5.c
 
 EXTRA_DIST = license.txt readme.txt odbcinst.ini \
    libtool.m4 psqlodbca.def psqlodbcw.def win32.mak \
@@ -58,4 +60,3 @@ MAINTAINERCLEANFILES = \
    Makefile.in config.guess config.h.in config.sub configure \
    install-sh missing mkinstalldirs aclocal.m4 ltmain.sh \
    libtool.m4 depcomp
-

diff --git a/configure.ac b/configure.ac
index 15ad9fab62a0ef46fb64662f25a0b7408c5156fa..93662e075e2b413782383c5cea42282c557c8648 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED(ODBCVER, [$with_odbcver], [Define to ODBC version (--with-odb
 \r
 # to implement the Unicode driver   \r
 PGAC_ARG_BOOL(enable, unicode, yes,     \r
-   [  --enable-unicode        build ODBC driver for Unicode [[yes]]],   \r
+   [  --disable-unicode       build non-Unicode driver],    \r
    [AC_DEFINE(UNICODE_SUPPORT, 1,   \r
        [Define to 1 to build with Unicode support (--enable-unicode)])      \r
     AC_DEFINE(UNICODE, [],      \r

diff --git a/docs/unix-compilation.html b/docs/unix-compilation.html
index 5aa067ab4f7325bcd9326e24dda7e96c88219878..670d318bf83503b5dbe8add553e78bc76a7d6090 100644 (file)
--- a/docs/unix-compilation.html
+++ b/docs/unix-compilation.html
@@ -32,10 +32,8 @@ provide a build environment for us which is now included in psqlODBC tarballs.</
 <li>--with-iodbc</li>\r
 <li>--with-unixodbc</li>\r
 <li>--with-odbcinst=DIR</li>\r
-<li>--with-libpq   (build a libpq enabled version of psqlodbc. default = yes)</li>\r
-<li>--with-pgsql-include=DIR  (Look for postgreSQL include files in DIR if libpq is enabled)</li>\r
-<li>--with-pgsql=DIR        (look for PostgreSQL libraries and headers in DIR if libpq is enabled)</li>\r
 <li>--enable-pthreads (thread-safe driver on some platforms)</li>\r
+<li>--disable-unicode (build non-Unicode driver)</li>
 <li>--help</li>\r
 </ul>\r
 \r