[libgda] Removed old and unmaintained FreeTDS code



commit 6c9b6a9516e92803017beb6dd0eb6af0e3ea09a2
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Oct 2 15:09:55 2010 +0200

    Removed old and unmaintained FreeTDS code

 configure.ac                               |   68 --
 po/POTFILES.skip                           |    5 -
 providers/Makefile.am                      |    5 -
 providers/freetds/Makefile.am              |   44 -
 providers/freetds/config.sample            |    7 -
 providers/freetds/freetds_specs_dsn.xml.in |   17 -
 providers/freetds/gda-freetds-defs.h       |   43 -
 providers/freetds/gda-freetds-message.c    |  111 ---
 providers/freetds/gda-freetds-message.h    |   57 --
 providers/freetds/gda-freetds-provider.c   | 1284 ----------------------------
 providers/freetds/gda-freetds-provider.h   |   92 --
 providers/freetds/gda-freetds-recordset.c  |  419 ---------
 providers/freetds/gda-freetds-recordset.h  |   75 --
 providers/freetds/gda-freetds-types.c      |  359 --------
 providers/freetds/gda-freetds-types.h      |   45 -
 providers/freetds/gda-freetds.h            |   52 --
 providers/freetds/gda-tds-schemas.h        |  211 -----
 providers/freetds/libgda-freetds-4.0.pc.in |    9 -
 providers/freetds/libmain.c                |   72 --
 providers/freetds/utils.c                  |   97 ---
 tests/providers/.gitignore                 |    1 -
 tests/providers/Makefile.am                |   12 -
 tests/providers/check_freetds.c            |   38 -
 23 files changed, 0 insertions(+), 3123 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 46855ef..3d0fc7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,71 +560,6 @@ else
 fi
 AM_CONDITIONAL(POSTGRES, test x$postgresdir != x)
 
-dnl Test for freetds provider
-dnl
-try_freetds=true
-AC_ARG_WITH(tds,
-[  --with-tds=<directory>	use freetds library in <directory>],[
-if test $withval = no
-then
-	try_freetds=false
-elif test $withval = yes
-then
-	dir="/usr/local/freetds"
-else
-	dir=$withval
-fi
-])
-freetdsdir=""
-freetds_incdir=""
-freetdsvercheck=""
-if test $try_freetds = true
-then
-	AC_MSG_CHECKING(for freetds files)
-	for d in $dir /usr/local/freetds /usr /opt/freetds /opt/packages/freetds /opt/freetds-0.50
-	do
-		if test -f "$d/include/tds.h" -a -e "$d/$lib/libtds$linklibext" -a -f "$d/include/tdsver.h"
-		then
-			AC_MSG_RESULT(found freetds in $d)
-			freetdsdir="$d"
-			freetds_incdir="$d/include"
-			break
-		elif test -f "$d/include/freetds/tds.h" -a -e "$d/$lib/libtds$linklibext" -a -f "$d/include/freetds/tdsver.h"
-		then
-			AC_MSG_RESULT(found freetds in $d and includes in $d/include/freetds)
-			freetdsdir="$d"
-			freetds_incdir="$d/include/freetds"
-			break
-		fi
-	done
-	if test "x$freetdsdir" = "x"
-	then
-		AC_MSG_WARN(tds backend not used)
-	else
-		AC_MSG_CHECKING(for freetds version)
-		freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO \)\" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|'`"
-		if test "x$freetdsvercheck" = "x"
-		then
-			AC_MSG_WARN(freetds version check failed - backend not used)
-			freetdsdir=""
-			freetds_incdir=""
-		else
-			AC_MSG_RESULT($freetdsvercheck)
-			FREETDS_CFLAGS="-I${freetds_incdir}"
-			FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-			AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
-
-			freetds_version_major="`echo $freetdsvercheck|sed 's:^\([[^.]]*\).*:\1:'`"
-			freetds_version_minor="`echo $freetdsvercheck|sed 's:^[[^.]]*\.\([[^.]]*\).*:\1:'`"
-
-			AC_DEFINE_UNQUOTED(FREETDS_VERSION_MAJOR, [$freetds_version_major])
-			AC_DEFINE_UNQUOTED(FREETDS_VERSION_MINOR, [$freetds_version_minor])
-		fi	
-	fi
-fi
-
-AM_CONDITIONAL(FREETDS, test x$freetdsdir != x)
-
 dnl test for ORACLE
 try_oracle=true
 AC_ARG_WITH(oracle,
@@ -1157,8 +1092,6 @@ AC_SUBST(POSTGRES_LIBS)
 AC_SUBST(POSTGRES_CFLAGS)
 AC_SUBST(PRIMEBASE_LIBS)
 AC_SUBST(PRIMEBASE_CFLAGS)
-AC_SUBST(FREETDS_LIBS)
-AC_SUBST(FREETDS_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(ORACLE_LIBS)
@@ -1330,7 +1263,6 @@ echo "   Compiled providers:"
 echo "      Berkeley DB = $bdb_found"
 echo "      Berkeley DB SQL = $bdbsql_found"
 dnl echo "      FireBird = `if test x$firebirddir != x; then echo yes; else echo no; fi`"
-dnl echo "      FreeTDS = `if test x$freetdsdir != x; then echo yes; else echo no; fi`"
 echo "      MDB (MS Access) = $mdbtools_found"
 echo "      MySQL = $mysql_found"
 echo "      Oracle = `if test x$oracledir != x; then echo yes; else echo no; fi`"
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index f029922..9278707 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -9,11 +9,6 @@ providers/firebird/gda-firebird-ddl.c
 providers/firebird/gda-firebird-provider.c
 providers/firebird/gda-firebird-recordset.c
 providers/firebird/libmain.c
-providers/freetds/freetds_specs_dsn.xml.in
-providers/freetds/gda-freetds-provider.c
-providers/freetds/gda-freetds-recordset.c
-providers/freetds/libmain.c
-providers/freetds/utils.c
 providers/ldap/gda-ldap-provider.c
 providers/ldap/gda-ldap-recordset.c
 providers/ldap/ldap_specs_dsn.xml.in
diff --git a/providers/Makefile.am b/providers/Makefile.am
index 9be0540..7630c6c 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -26,10 +26,6 @@ if POSTGRES
 GDA_POSTGRES_SERVER=postgres
 endif
 
-if FREETDS
-GDA_FREETDS_SERVER=freetds
-endif
-
 if LDAP
 GDA_LDAP_SERVER=ldap
 endif
@@ -59,6 +55,5 @@ SUBDIRS = \
 	$(GDA_ORACLE_SERVER) \
 	$(GDA_WEB_SERVER) \
 	$(GDA_SQLCIPHER_SERVER)
-#	$(GDA_FREETDS_SERVER) \
 #	$(GDA_FIREBIRD_SERVER) \
 #	$(GDA_LDAP_SERVER) 
diff --git a/tests/providers/.gitignore b/tests/providers/.gitignore
index 671625a..9910b2d 100644
--- a/tests/providers/.gitignore
+++ b/tests/providers/.gitignore
@@ -2,7 +2,6 @@ check_sqlite
 check_postgres
 check_firebird
 check_mdb
-check_freetds
 check_bdb
 check_mysql
 check_oracle
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 02f5e92..559e72b 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -39,11 +39,6 @@ check_PROGRAMS += check_postgres
 TESTS += check_postgres
 endif
 
-if FREETDS
-check_PROGRAMS += check_freetds
-TESTS += check_freetds
-endif
-
 if LDAP
 check_PROGRAMS += check_ldap
 TESTS += check_ldap
@@ -104,13 +99,6 @@ check_postgres_LDADD =  \
 	$(top_builddir)/tests/libgda-test-4.0.la \
 	$(LIBGDA_LIBS)
 
-check_freetds_SOURCES = $(common_sources) check_freetds.c
-check_freetds_CFLAGS = 
-check_freetds_LDADD =  \
-	$(top_builddir)/libgda/libgda-4.0.la \
-	$(top_builddir)/tests/libgda-test-4.0.la \
-	$(LIBGDA_LIBS)
-
 check_ldap_SOURCES = $(common_sources) check_ldap.c
 check_ldap_CFLAGS = 
 check_ldap_LDADD =  \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]