[libgda] Removed old and unmaintained IBMDB2 code



commit 564714737c4434a394599bd908c86e0a85aea879
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sat Oct 2 14:53:00 2010 +0200

    Removed old and unmaintained IBMDB2 code

 configure.ac                             |   72 --
 po/POTFILES.skip                         |    4 -
 providers/Makefile.am                    |    5 -
 providers/ibmdb2/Makefile.am             |   42 -
 providers/ibmdb2/gda-ibmdb2-provider.c   | 1204 ------------------------------
 providers/ibmdb2/gda-ibmdb2-provider.h   |   74 --
 providers/ibmdb2/gda-ibmdb2-recordset.c  |  390 ----------
 providers/ibmdb2/gda-ibmdb2-recordset.h  |   89 ---
 providers/ibmdb2/gda-ibmdb2-types.c      |  203 -----
 providers/ibmdb2/gda-ibmdb2-types.h      |   46 --
 providers/ibmdb2/gda-ibmdb2.h            |   49 --
 providers/ibmdb2/ibmdb2_specs_dsn.xml.in |    7 -
 providers/ibmdb2/libgda-ibmdb2-4.0.pc.in |    9 -
 providers/ibmdb2/libmain.c               |   72 --
 providers/ibmdb2/utils.c                 |   83 --
 tests/providers/.gitignore               |    1 -
 tests/providers/Makefile.am              |   12 -
 tests/providers/check_ibmdb2.c           |   38 -
 18 files changed, 0 insertions(+), 2400 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d6335df..0ae1886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -625,75 +625,6 @@ fi
 
 AM_CONDITIONAL(FREETDS, test x$freetdsdir != x)
 
-dnl Test for IBM DB2
-try_ibmdb2=true
-AC_ARG_WITH(ibmdb2,
-[  --with-ibmdb2=<directory>	use IBM DB2 backend in <directory>],[
-if test $withval = no
-then
-	try_ibmdb2=false
-elif test $withval = yes
-then
-	if test -z "$DB2DIR"
-	then
-		dir="/usr/IBMdb2/V7.1"
-	else
-		dir="$DB2DIR"
-	fi
-else
-	dir=$withval
-fi
-])
-if test $try_ibmdb2 = true
-then
-	AC_MSG_CHECKING(for IBM DB2 files)
-	if test -f "$dir/include/sqlcli1.h"
-	then
-		if test -e "$dir/lib/libdb2.so"
-		then
-			ibmdb2dir="$dir"
-			ibmdb2libdir="lib"
-			break
-		fi
-		if test -e "$dir/lib32/libdb2.so"
-		then
-			ibmdb2dir="$dir"
-                        ibmdb2libdir="lib32"
-                        break
-		fi
-	else
-		for d in /usr/IBMdb2 /usr/local/IBMdb2 /opt/IBMdb2 /opt/packages/IBMdb2 /opt/ibm/db2
-		do
-			for v in V5.0 V.6.1 V7.1 V9.1
-			do
-				if test -f "$d/$v/include/sqlcli1.h" -a -e "$d/$v/lib/libdb2.so"
-				then
-					ibmdb2dir="$d/$v"
-					ibmdb2libdir="lib"
-					break
-				fi
-				if test -f "$d/$v/include/sqlcli1.h" -a -e "$d/$v/lib32/libdb2.so"
-                                then
-                                        ibmdb2dir="$d/$v"
-                                        ibmdb2libdir="lib32"
-                                        break
-                                fi
-			done
-		done
-	fi
-	if test x$ibmdb2dir = x
-	then
-		AC_MSG_WARN(IBM DB2 backend not used)
-	else
-		AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
-		AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
-		IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\" -I${ibmdb2dir}/include"
-		IBMDB2_LIBS="-L${ibmdb2dir}/${ibmdb2libdir} -Wl,-rpath,${ibmdb2dir}/${ibmdb2libdir} -ldb2"
-	fi
-fi
-
-AM_CONDITIONAL(IBMDB2, test x$ibmdb2dir != x)
-
 dnl Test for Sybase
 try_sybase=true
 dir=""
@@ -1374,8 +1305,6 @@ AC_SUBST(PRIMEBASE_LIBS)
 AC_SUBST(PRIMEBASE_CFLAGS)
 AC_SUBST(FREETDS_LIBS)
 AC_SUBST(FREETDS_CFLAGS)
-AC_SUBST(IBMDB2_LIBS)
-AC_SUBST(IBMDB2_CFLAGS)
 AC_SUBST(SYBASE_DIR)
 AC_SUBST(SYBASE_LIBS)
 AC_SUBST(SYBASE_CFLAGS)
@@ -1553,7 +1482,6 @@ 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`"
-dnl echo "      IBM DB2 = `if test x$ibmdb2dir != 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 e54bfa2..da8dbb9 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -14,10 +14,6 @@ providers/freetds/gda-freetds-provider.c
 providers/freetds/gda-freetds-recordset.c
 providers/freetds/libmain.c
 providers/freetds/utils.c
-providers/ibmdb2/gda-ibmdb2-provider.c
-providers/ibmdb2/gda-ibmdb2-types.c
-providers/ibmdb2/ibmdb2_specs_dsn.xml.in
-providers/ibmdb2/libmain.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 730103b..e14f4d2 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -6,10 +6,6 @@ if BDBSQL
 GDA_BDBSQL_SERVER=bdbsql
 endif
 
-if IBMDB2
-GDA_IBMDB2_SERVER=ibmdb2
-endif
-
 if FIREBIRD
 GDA_FIREBIRD_SERVER=firebird
 endif
@@ -72,7 +68,6 @@ SUBDIRS = \
 	$(GDA_WEB_SERVER) \
 	$(GDA_SQLCIPHER_SERVER)
 #	$(GDA_FREETDS_SERVER) \
-#	$(GDA_IBMDB2_SERVER) \
 #	$(GDA_FIREBIRD_SERVER) \
 #	$(GDA_SYBASE_SERVER) \
 #	$(GDA_XBASE_SERVER) \
diff --git a/tests/providers/.gitignore b/tests/providers/.gitignore
index 98c7793..676caf8 100644
--- a/tests/providers/.gitignore
+++ b/tests/providers/.gitignore
@@ -7,6 +7,5 @@ check_sybase
 check_bdb
 check_xbase
 check_mysql
-check_ibmdb2
 check_oracle
 check_ldap
\ No newline at end of file
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 31426cc..567c0d1 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -14,11 +14,6 @@ check_PROGRAMS += check_bdb
 TESTS += check_bdb
 endif
 
-if IBMDB2
-check_PROGRAMS += check_ibmdb2
-TESTS += check_ibmdb2
-endif
-
 if FIREBIRD
 check_PROGRAMS += check_firebird
 TESTS += check_firebird
@@ -84,13 +79,6 @@ check_bdb_LDADD =  \
 	$(top_builddir)/tests/libgda-test-4.0.la \
 	$(LIBGDA_LIBS)
 
-check_ibmdb2_SOURCES = $(common_sources) check_ibmdb2.c
-check_ibmdb2_CFLAGS = 
-check_ibmdb2_LDADD =  \
-	$(top_builddir)/libgda/libgda-4.0.la \
-	$(top_builddir)/tests/libgda-test-4.0.la \
-	$(LIBGDA_LIBS)
-
 check_firebird_SOURCES = $(common_sources) check_firebird.c
 check_firebird_CFLAGS = 
 check_firebird_LDADD =  \



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