[libgda] Removed old and unmaintained Sybase code
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Removed old and unmaintained Sybase code
- Date: Sat, 2 Oct 2010 14:12:28 +0000 (UTC)
commit 57950896aae3ee66bf121815258130f212512eba
Author: Vivien Malerba <malerba gnome-db org>
Date: Sat Oct 2 15:02:14 2010 +0200
Removed old and unmaintained Sybase code
configure.ac | 111 ---
po/POTFILES.skip | 7 -
providers/Makefile.am | 5 -
providers/sybase/Makefile.am | 42 -
providers/sybase/gda-sybase-provider.c | 1326 ------------------------------
providers/sybase/gda-sybase-provider.h | 96 ---
providers/sybase/gda-sybase-recordset.c | 585 -------------
providers/sybase/gda-sybase-recordset.h | 89 --
providers/sybase/gda-sybase-schemas.h | 238 ------
providers/sybase/gda-sybase-types.c | 400 ---------
providers/sybase/gda-sybase-types.h | 71 --
providers/sybase/gda-sybase.h | 73 --
providers/sybase/libgda-sybase-4.0.pc.in | 9 -
providers/sybase/libmain.c | 73 --
providers/sybase/main.c | 77 --
providers/sybase/sybase_specs_dsn.xml.in | 13 -
providers/sybase/utils.c | 562 -------------
tests/providers/.gitignore | 1 -
tests/providers/Makefile.am | 11 -
tests/providers/check_sybase.c | 38 -
20 files changed, 0 insertions(+), 3827 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0ae1886..7efeff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -625,113 +625,6 @@ fi
AM_CONDITIONAL(FREETDS, test x$freetdsdir != x)
-dnl Test for Sybase
-try_sybase=true
-dir=""
-AC_ARG_WITH(sybase,
-[ --with-sybase=<directory> use Sybase backend in <directory>],[
-AC_MSG_CHECKING(for Sybase files)
-if test $withval = no
-then
- try_sybase=false
-elif test $withval = yes
-then
- dir="/opt2/sybase"
-else
- dir=$withval
-fi
-])
-sybasedir=""
-if test $try_sybase = true
-then
- AC_MSG_CHECKING(for Sybase files)
- for d in $dir /usr/local/sybase /opt/sybase /opt/packages/sybase
- do
- if test -f "$d/include/ctpublic.h"
- then
- AC_MSG_RESULT(found Sybase in $d)
- sybasedir="$d"
- break
- fi
- for v in 11.9.2 12.5 11.0.3.3
- do
- if test -f "$d-$v/include/ctpublic.h"
- then
- AC_MSG_RESULT(found Sybase in $d-$v)
- sybasedir="$d-$v"
- break
- elif test -f "$d-$v/OCS/include/ctpublic.h"
- then
- AC_MSG_RESULT(found Sybase in $d-$v)
- sybasedir="$d-$v/OCS"
- break
- fi
- done
- done
- if test x$sybasedir = x
- then
- AC_MSG_WARN(Sybase backend not used)
- else
- SYBASE_DIR=${sybasedir}
- SYBASE_CFLAGS="-I${sybasedir}/include"
- SYBASE_LIBS="-lnsl -ldl -lm"
- AC_MSG_CHECKING(for Sybase host system type)
- AC_MSG_RESULT($host)
- case "$host" in
- *linux*) sybase_ctlibs="-L${sybasedir}/lib -lct -lcs -lsybtcl -lcomn -lintl"
- sybase_blklibs="-L${sybasedir}/lib -lblk ${sybase_ctlibs}"
- SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
- AC_CHECK_LIB(ct,tdsdump_on,[
- AC_MSG_WARN(linking against freetds libct)
- AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase])
- ], AC_DEFINE(HAVE_SYBASE, 1, [Have Sybase]))
- ;;
- *) AC_MSG_WARN(this host type is unsupported; sybase backend not used)
- sybasedir=""
- ;;
- esac
- fi
-fi
-
-AM_CONDITIONAL(SYBASE, test x$sybasedir != x)
-
-dnl Link gda-sybase-srv against debugable libs
-AC_ARG_ENABLE(sybase-debug,
- [ --enable-sybase-debug=[no/min/max] no=none, min=debug msgs, max=min and link against sybase devlibs (which are static!).],,enable_sybase_debug=no)
-if test "x$sybasedir" != "x"
-then
- AC_MSG_CHECKING(for Sybase debugging level)
- if test "x$enable_sybase_debug" = "xmax"
- then
- AC_DEFINE(SYBASE_DEBUG, 1, [Enable Sybase debugging level])
- if test -f $sybasedir/devlib/libct.a
- then
- AC_MSG_RESULT(max)
- AC_MSG_WARN(erase passwords in bug-buddy debug output before sending bugreports)
- SYBASE_LIBS=${sybasedir}/devlib
- else
- AC_MSG_RESULT(min)
- AC_MSG_WARN(no debug libraries found, using --enable-sybase-debug=min)
- enable_sybase_debug=min
- fi
- else
- AC_MSG_RESULT($enable_sybase_debug)
- if test "x$enable_sybase_debug" != "x"
- then
- if test "x$enable_sybase_debug" != "xno"
- then
- AC_DEFINE(SYBASE_DEBUG)
- fi
- fi
- fi
-else
- if test "x$enable_sybase_debug" != "xno"
- then
- AC_MSG_WARN(you applied sybase debugging options, but sybase has not been found or is unsupported, disabling debug options)
- fi
- enable_sybase_debug=no
-fi
-
dnl test for ORACLE
try_oracle=true
AC_ARG_WITH(oracle,
@@ -1305,9 +1198,6 @@ AC_SUBST(PRIMEBASE_LIBS)
AC_SUBST(PRIMEBASE_CFLAGS)
AC_SUBST(FREETDS_LIBS)
AC_SUBST(FREETDS_CFLAGS)
-AC_SUBST(SYBASE_DIR)
-AC_SUBST(SYBASE_LIBS)
-AC_SUBST(SYBASE_CFLAGS)
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAP_CFLAGS)
AC_SUBST(ORACLE_LIBS)
@@ -1488,7 +1378,6 @@ echo " Oracle = `if test x$oracledir != x; then echo yes; else echo no; fi`
echo " PostgreSQL = `if test x$postgresdir != x; then echo yes; else echo no; fi`"
echo " SQLite = yes `if test x$have_sqlite = xyes; then echo '(from system installation)'; else echo '(embedded)'; fi`"
echo " SQLCipher = `if test x$have_crypto != xyes; then echo no; else echo yes; fi`"
-dnl echo " Sybase = `if test x$sybasedir != x; then echo yes; else echo no; fi`"
dnl echo " xBase (dBase, Clipper, FoxPro) = `if test x$xbasedir != x; then echo yes; else echo no; fi`"
dnl echo " LDAP = `if test x$ldapdir != x; then echo yes; else echo no; fi`"
echo " JDBC = `if test x$have_java = xyes; then echo "yes (using $JTYPE)"; else echo no; fi`"
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index da8dbb9..c5d1b25 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -39,13 +39,6 @@ providers/skel-implementation/models/gda-models-provider.c
providers/skel-implementation/models/libmain.c
providers/skel-implementation/models/models_specs_dsn.xml.in
providers/sqlcipher/sqlite3.c
-providers/sybase/gda-sybase-provider.c
-providers/sybase/gda-sybase-recordset.c
-providers/sybase/gda-sybase-types.c
-providers/sybase/libmain.c
-providers/sybase/main.c
-providers/sybase/sybase_specs_dsn.xml.in
-providers/sybase/utils.c
providers/xbase/gda-xbase-provider.c
providers/xbase/libmain.c
providers/xbase/xbase_specs_dsn.xml.in
diff --git a/providers/Makefile.am b/providers/Makefile.am
index e14f4d2..6a815c9 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -26,10 +26,6 @@ if POSTGRES
GDA_POSTGRES_SERVER=postgres
endif
-if SYBASE
-GDA_SYBASE_SERVER=sybase
-endif
-
if FREETDS
GDA_FREETDS_SERVER=freetds
endif
@@ -69,6 +65,5 @@ SUBDIRS = \
$(GDA_SQLCIPHER_SERVER)
# $(GDA_FREETDS_SERVER) \
# $(GDA_FIREBIRD_SERVER) \
-# $(GDA_SYBASE_SERVER) \
# $(GDA_XBASE_SERVER) \
# $(GDA_LDAP_SERVER)
diff --git a/tests/providers/.gitignore b/tests/providers/.gitignore
index 676caf8..391f970 100644
--- a/tests/providers/.gitignore
+++ b/tests/providers/.gitignore
@@ -3,7 +3,6 @@ check_postgres
check_firebird
check_mdb
check_freetds
-check_sybase
check_bdb
check_xbase
check_mysql
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 567c0d1..fd99cf1 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -39,11 +39,6 @@ check_PROGRAMS += check_postgres
TESTS += check_postgres
endif
-if SYBASE
-check_PROGRAMS += check_sybase
-TESTS += check_sybase
-endif
-
if FREETDS
check_PROGRAMS += check_freetds
TESTS += check_freetds
@@ -114,12 +109,6 @@ check_postgres_LDADD = \
$(top_builddir)/tests/libgda-test-4.0.la \
$(LIBGDA_LIBS)
-check_sybase_SOURCES = $(common_sources) check_sybase.c
-check_sybase_CFLAGS =
-check_sybase_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(LIBGDA_LIBS)
-
check_freetds_SOURCES = $(common_sources) check_freetds.c
check_freetds_CFLAGS =
check_freetds_LDADD = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]