diff -Naur freetds-0.64RC2/include/tds_configs.h freetds-0.64RC2.oden/include/tds_configs.h
--- freetds-0.64RC2/include/tds_configs.h 2006-02-24 22:14:21.000000000 +0100
+++ freetds-0.64RC2.oden/include/tds_configs.h 2006-05-09 12:26:14.000000000 +0200
@@ -36,9 +36,9 @@
#endif
#endif
-#define FREETDS_SYSCONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "freetds.conf"
-#define FREETDS_POOLCONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "pool.conf"
-#define FREETDS_LOCALECONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "locales.conf"
+#define FREETDS_SYSCONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "freetds_mssql.conf"
+#define FREETDS_POOLCONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "pool_mssql.conf"
+#define FREETDS_LOCALECONFFILE FREETDS_SYSCONFDIR TDS_SDIR_SEPARATOR "locales_mssql.conf"
#ifdef __cplusplus
#if 0
diff -Naur freetds-0.64RC2/src/apps/Makefile.am freetds-0.64RC2.oden/src/apps/Makefile.am
--- freetds-0.64RC2/src/apps/Makefile.am 2006-02-24 22:14:22.000000000 +0100
+++ freetds-0.64RC2.oden/src/apps/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -2,18 +2,18 @@
bin_PROGRAMS = tsql freebcp bsqldb defncopy datacopy
INCLUDES = -I$(top_srcdir)/include
-freebcp_LDADD = ../dblib/libsybdb.la $(NETWORK_LIBS)
+freebcp_LDADD = ../dblib/libsybdb_mssql.la $(NETWORK_LIBS)
freebcp_SOURCES = freebcp.c freebcp.h
-tsql_LDADD = ../tds/libtds_objects.la \
- ../replacements/libreplacements.la \
+tsql_LDADD = ../tds/libtds_mssql_objects.la \
+ ../replacements/libreplacements_mssql.la \
$(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC) $(READLINE_LIBS)
-bsqldb_LDADD = ../dblib/libsybdb.la $(NETWORK_LIBS)
-defncopy_LDADD = ../dblib/libsybdb.la \
- ../replacements/libreplacements.la \
+bsqldb_LDADD = ../dblib/libsybdb_mssql.la $(NETWORK_LIBS)
+defncopy_LDADD = ../dblib/libsybdb_mssql.la \
+ ../replacements/libreplacements_mssql.la \
$(NETWORK_LIBS)
datacopy_SOURCES = datacopy.c
-datacopy_LDADD = ../dblib/libsybdb.la $(NETWORK_LIBS)
+datacopy_LDADD = ../dblib/libsybdb_mssql.la $(NETWORK_LIBS)
diff -Naur freetds-0.64RC2/src/ctlib/Makefile.am freetds-0.64RC2.oden/src/ctlib/Makefile.am
--- freetds-0.64RC2/src/ctlib/Makefile.am 2006-02-24 22:14:22.000000000 +0100
+++ freetds-0.64RC2.oden/src/ctlib/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -1,12 +1,12 @@
# $Id: Makefile.am,v 1.24 2005/07/26 09:34:25 freddy77 Exp $
SUBDIRS = unittests
-lib_LTLIBRARIES = libct.la
-libct_la_SOURCES= ct.c cs.c blk.c ctutil.c
+lib_LTLIBRARIES = libct_mssql.la
+libct_mssql_la_SOURCES= ct.c cs.c blk.c ctutil.c
# version bumped for 0.64, I hope we'll bump it less in the future -- freddy77
-libct_la_LDFLAGS= -version-info 4:0:0 -export-symbols-regex '^(cs_|ct_|blk_).*' $(FREETDS_SYMBOLIC)
+libct_mssql_la_LDFLAGS= -version-info 4:0:0 -export-symbols-regex '^(cs_|ct_|blk_).*' $(FREETDS_SYMBOLIC)
-libct_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libct_mssql_la_LIBADD = ../tds/libtds_mssql_objects.la ../replacements/libreplacements_mssql.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
INCLUDES = -I$(top_srcdir)/include
diff -Naur freetds-0.64RC2/src/ctlib/unittests/Makefile.am freetds-0.64RC2.oden/src/ctlib/unittests/Makefile.am
--- freetds-0.64RC2/src/ctlib/unittests/Makefile.am 2006-02-24 22:14:22.000000000 +0100
+++ freetds-0.64RC2.oden/src/ctlib/unittests/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -36,6 +36,6 @@
ct_dynamic_SOURCES = ct_dynamic.c common.c common.h
AM_LDFLAGS = -no-install
-LIBS = ../libct.la @NETWORK_LIBS@
+LIBS = ../libct_mssql.la @NETWORK_LIBS@
INCLUDES = -I$(top_srcdir)/include
CLEANFILES = tdsdump.out
diff -Naur freetds-0.64RC2/src/dblib/Makefile.am freetds-0.64RC2.oden/src/dblib/Makefile.am
--- freetds-0.64RC2/src/dblib/Makefile.am 2006-02-24 22:14:23.000000000 +0100
+++ freetds-0.64RC2.oden/src/dblib/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -1,14 +1,14 @@
# $Id: Makefile.am,v 1.32 2005/05/17 14:03:11 freddy77 Exp $
SUBDIRS = unittests
-lib_LTLIBRARIES = libsybdb.la
+lib_LTLIBRARIES = libsybdb_mssql.la
if SYBASE_COMPAT
DBOPEN=dbopen.c
endif
EXTRA_DIST = dbopen.c buffering.h
-libsybdb_la_SOURCES= dblib.c dbutil.c rpc.c bcp.c xact.c $(DBOPEN)
+libsybdb_mssql_la_SOURCES= dblib.c dbutil.c rpc.c bcp.c xact.c $(DBOPEN)
# version bumped for 0.63, I hope we'll bump it less in the future -- freddy77
-libsybdb_la_LDFLAGS= -version-info 5:0:0 -export-symbols-regex '^(db|bcp_|tdsdump_open|tdsdbopen|.*_xact|close_commit|open_commit|.?asprintf).*' $(FREETDS_SYMBOLIC)
-libsybdb_la_LIBADD= ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libsybdb_mssql_la_LDFLAGS= -version-info 5:0:0 -export-symbols-regex '^(db|bcp_|tdsdump_open|tdsdbopen|.*_xact|close_commit|open_commit|.?asprintf).*' $(FREETDS_SYMBOLIC)
+libsybdb_mssql_la_LIBADD= ../tds/libtds_mssql_objects.la ../replacements/libreplacements_mssql.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
INCLUDES = -I$(top_srcdir)/include
diff -Naur freetds-0.64RC2/src/dblib/unittests/Makefile.am freetds-0.64RC2.oden/src/dblib/unittests/Makefile.am
--- freetds-0.64RC2/src/dblib/unittests/Makefile.am 2006-02-24 22:14:23.000000000 +0100
+++ freetds-0.64RC2.oden/src/dblib/unittests/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -38,7 +38,7 @@
endif
AM_LDFLAGS = -no-install
-LIBS = ../libsybdb.la @NETWORK_LIBS@
+LIBS = ../libsybdb_mssql.la @NETWORK_LIBS@
INCLUDES = -I$(top_srcdir)/include
EXTRA_DIST = t0016.in t0017.in data.bin
CLEANFILES = tdsdump.out t0013.out t0014.out t0016.out \
diff -Naur freetds-0.64RC2/src/odbc/Makefile.am freetds-0.64RC2.oden/src/odbc/Makefile.am
--- freetds-0.64RC2/src/odbc/Makefile.am 2006-02-24 22:14:24.000000000 +0100
+++ freetds-0.64RC2.oden/src/odbc/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -1,15 +1,15 @@
# $Id: Makefile.am,v 1.38 2005/07/17 07:48:10 freddy77 Exp $
SUBDIRS = unittests
-lib_LTLIBRARIES = libtdsodbc.la
+lib_LTLIBRARIES = libtdsodbc_mssql.la
##EXTRA_LTLIBRARIES = libtdsodbc.la
-libtdsodbc_la_SOURCES= odbc.c connectparams.c convert_tds2sql.c \
+libtdsodbc_mssql_la_SOURCES= odbc.c connectparams.c convert_tds2sql.c \
descriptor.c prepare_query.c odbc_util.c \
native.c sql2tds.c error.c odbc_checks.c
-libtdsodbc_la_LIBADD= ../tds/libtds_objects.la ../replacements/libreplacements.la $(ODBCINSTLIB) $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libtdsodbc_mssql_la_LIBADD= ../tds/libtds_mssql_objects.la ../replacements/libreplacements_mssql.la $(ODBCINSTLIB) $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
INCLUDES = -I$(top_srcdir)/include $(ODBC_INC)
# -module is needed by Darwin (Mac OS X)
-libtdsodbc_la_LDFLAGS = -export-symbols-regex '^(SQL|ODBCINST).*' $(FREETDS_SYMBOLIC) -module
+libtdsodbc_mssql_la_LDFLAGS = -export-symbols-regex '^(SQL|ODBCINST).*' $(FREETDS_SYMBOLIC) -module
## Need blank statement to avoid compiling odbc.c
odbc: $(EXTRA_LTLIBRARIES)
diff -Naur freetds-0.64RC2/src/pool/Makefile.am freetds-0.64RC2.oden/src/pool/Makefile.am
--- freetds-0.64RC2/src/pool/Makefile.am 2006-02-24 22:14:26.000000000 +0100
+++ freetds-0.64RC2.oden/src/pool/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -3,7 +3,7 @@
tdspool_SOURCES = config.c main.c member.c user.c util.c pool.h
SERVERDIR = ../server
INCLUDES = -I$(top_srcdir)/include -I. -I$(SERVERDIR)
-LDADD = ../server/libtdssrv.la $(NETWORK_LIBS)
+LDADD = ../server/libtdssrv_mssql.la $(NETWORK_LIBS)
EXTRA_DIST = BUGS pool.conf
ETC = $(DESTDIR)$(sysconfdir)
diff -Naur freetds-0.64RC2/src/replacements/Makefile.am freetds-0.64RC2.oden/src/replacements/Makefile.am
--- freetds-0.64RC2/src/replacements/Makefile.am 2006-02-24 22:14:27.000000000 +0100
+++ freetds-0.64RC2.oden/src/replacements/Makefile.am 2006-05-09 12:27:08.000000000 +0200
@@ -1,8 +1,8 @@
# $Id: Makefile.am,v 1.11 2005/12/21 14:02:49 freddy77 Exp $
-noinst_LTLIBRARIES= libreplacements.la
-libreplacements_la_SOURCES= iconv.c
-libreplacements_la_LDFLAGS=
-libreplacements_la_LIBADD= @LTLIBOBJS@
+noinst_LTLIBRARIES= libreplacements_mssql.la
+libreplacements_mssql_la_SOURCES= iconv.c
+libreplacements_mssql_la_LDFLAGS=
+libreplacements_mssql_la_LIBADD= @LTLIBOBJS@
INCLUDES= -I$(top_srcdir)/include
EXTRA_DIST= asprintf.c vasprintf.c atoll.c strtok_r.c \
readpassphrase.c basename.c strlcpy.c strlcat.c
diff -Naur freetds-0.64RC2/src/server/Makefile.am freetds-0.64RC2.oden/src/server/Makefile.am
--- freetds-0.64RC2/src/server/Makefile.am 2006-02-24 22:14:28.000000000 +0100
+++ freetds-0.64RC2.oden/src/server/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -1,10 +1,10 @@
# $Id: Makefile.am,v 1.13 2004/12/13 10:59:59 freddy77 Exp $
-lib_LTLIBRARIES = libtdssrv.la
-libtdssrv_la_SOURCES= query.c server.c login.c
+lib_LTLIBRARIES = libtdssrv_mssql.la
+libtdssrv_mssql_la_SOURCES= query.c server.c login.c
# bump server version whenever bumping libtds version
-libtdssrv_la_LDFLAGS= -version-info 2:0:0
-libtdssrv_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libtdssrv_mssql_la_LDFLAGS= -version-info 2:0:0
+libtdssrv_mssql_la_LIBADD = ../tds/libtds_mssql_objects.la ../replacements/libreplacements_mssql.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
INCLUDES = -I$(top_srcdir)/include
noinst_PROGRAMS = tdssrv
-tdssrv_LDADD = libtdssrv.la $(NETWORK_LIBS)
+tdssrv_LDADD = libtdssrv_mssql.la $(NETWORK_LIBS)
tdssrv_SOURCES = unittest.c
diff -Naur freetds-0.64RC2/src/tds/Makefile.am freetds-0.64RC2.oden/src/tds/Makefile.am
--- freetds-0.64RC2/src/tds/Makefile.am 2006-02-24 22:14:28.000000000 +0100
+++ freetds-0.64RC2.oden/src/tds/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -3,23 +3,23 @@
SUBDIRS = unittests
INCLUDES = -I$(top_srcdir)/include
-noinst_LTLIBRARIES = libtds_objects.la
-libtds_objects_la_SOURCES= mem.c token.c util.c login.c read.c \
+noinst_LTLIBRARIES = libtds_mssql_objects.la
+libtds_mssql_objects_la_SOURCES= mem.c token.c util.c login.c read.c \
write.c convert.c numeric.c config.c query.c iconv.c \
locale.c challenge.c threadsafe.c vstrbuild.c md4.c \
des.c tdsstring.c getmac.c data.c net.c \
tds_checks.c tds_checks.h
-libtds_objects_la_LDFLAGS=
-libtds_objects_la_LIBADD=
+libtds_mssql_objects_la_LDFLAGS=
+libtds_mssql_objects_la_LIBADD=
-lib_LTLIBRARIES = libtds.la
-libtds_la_SOURCES =
+lib_LTLIBRARIES = libtds_mssql.la
+libtds_mssql_la_SOURCES =
# changed for 0.64
# bump server version whenever bumping libtds version
-libtds_la_LDFLAGS = -version-info 5:0:0 \
+libtds_mssql_la_LDFLAGS = -version-info 5:0:0 \
-export-symbols-regex '^(tds_|tdsdump_|tds5_|tds7_).*'
-libtds_la_LIBADD = libtds_objects.la ../replacements/libreplacements.la \
+libtds_mssql_la_LIBADD = libtds_mssql_objects.la ../replacements/libreplacements_mssql.la \
$(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
noinst_HEADERS = tds_willconvert.h encodings.h num_limits.h
diff -Naur freetds-0.64RC2/src/tds/config.c freetds-0.64RC2.oden/src/tds/config.c
--- freetds-0.64RC2/src/tds/config.c 2006-02-24 22:14:28.000000000 +0100
+++ freetds-0.64RC2.oden/src/tds/config.c 2006-05-09 12:26:14.000000000 +0200
@@ -265,10 +265,10 @@
eptr = getenv("FREETDS");
if (eptr) {
#if !defined(WIN32) && !defined(DOS32X)
- asprintf(&path, "%s/etc/freetds.conf", eptr);
+ asprintf(&path, "%s/etc/freetds_mssql.conf", eptr);
found = tds_try_conf_file(path, "(from $FREETDS/etc)", server, connection);
#else
- asprintf(&path, "%s\\freetds.conf", eptr);
+ asprintf(&path, "%s\\freetds_mssql.conf", eptr);
found = tds_try_conf_file(path, "(from $FREETDS)", server, connection);
#endif
} else {
@@ -277,12 +277,12 @@
}
if (!found) {
- path = tds_get_home_file(".freetds.conf");
+ path = tds_get_home_file(".freetds_mssql.conf");
if (path) {
- found = tds_try_conf_file(path, "(.freetds.conf)", server, connection);
+ found = tds_try_conf_file(path, "(.freetds_mssql.conf)", server, connection);
free(path);
} else {
- tdsdump_log(TDS_DBG_INFO2, "...Error getting ~/.freetds.conf. Trying %s.\n", FREETDS_SYSCONFFILE);
+ tdsdump_log(TDS_DBG_INFO2, "...Error getting ~/.freetds_mssql.conf. Trying %s.\n", FREETDS_SYSCONFFILE);
}
}
diff -Naur freetds-0.64RC2/src/tds/locale.c freetds-0.64RC2.oden/src/tds/locale.c
--- freetds-0.64RC2/src/tds/locale.c 2006-02-24 22:14:28.000000000 +0100
+++ freetds-0.64RC2.oden/src/tds/locale.c 2006-05-09 12:26:14.000000000 +0200
@@ -61,7 +61,7 @@
if (!locale)
return NULL;
- tdsdump_log(TDS_DBG_INFO1, "Attempting to read locales.conf file\n");
+ tdsdump_log(TDS_DBG_INFO1, "Attempting to read locales_mssql.conf file\n");
in = fopen(FREETDS_LOCALECONFFILE, "r");
if (in) {
diff -Naur freetds-0.64RC2/src/tds/unittests/Makefile.am freetds-0.64RC2.oden/src/tds/unittests/Makefile.am
--- freetds-0.64RC2/src/tds/unittests/Makefile.am 2006-02-24 22:14:30.000000000 +0100
+++ freetds-0.64RC2.oden/src/tds/unittests/Makefile.am 2006-05-09 12:26:14.000000000 +0200
@@ -28,6 +28,6 @@
numeric_SOURCES = numeric.c
AM_LDFLAGS = -no-install
-LIBS = ../libtds.la @NETWORK_LIBS@
+LIBS = ../libtds_mssql.la @NETWORK_LIBS@
INCLUDES = -I$(top_srcdir)/include -I$(srcdir)/..
CLEANFILES = tdsdump.out
