[libgda] Removed old and unmaintained MSQL code
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Removed old and unmaintained MSQL code
- Date: Sat, 2 Oct 2010 14:12:18 +0000 (UTC)
commit d6a188b760f2e8e173632acd0a54ef9bf6432904
Author: Vivien Malerba <malerba gnome-db org>
Date: Sat Oct 2 14:48:02 2010 +0200
Removed old and unmaintained MSQL code
configure.ac | 66 ----
po/POTFILES.skip | 4 -
providers/Makefile.am | 5 -
providers/msql/Makefile.am | 38 ---
providers/msql/gda-msql-provider.c | 603 ----------------------------------
providers/msql/gda-msql-provider.h | 59 ----
providers/msql/gda-msql-recordset.c | 400 ----------------------
providers/msql/gda-msql-recordset.h | 69 ----
providers/msql/gda-msql-utils.c | 92 -----
providers/msql/gda-msql.h | 42 ---
providers/msql/libgda-msql-4.0.pc.in | 9 -
providers/msql/libmain.c | 72 ----
providers/msql/msql_specs_dsn.xml.in | 7 -
tests/providers/.gitignore | 1 -
tests/providers/Makefile.am | 12 -
tests/providers/check_msql.c | 38 ---
16 files changed, 0 insertions(+), 1517 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4638af9..d6335df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,68 +500,6 @@ BDB_CHECK($lib)
dnl Test for MySQL
MYSQL_CHECK($lib)
-dnl Test for mSQL
-try_msql=true
-AC_ARG_WITH(msql,
-[ --with-mSQL=<directory> use mSQL backend in <directory>],[
-if test $withval = no
-then
- try_msql=false
-elif test $withval = yes
-then
- dir="/usr/local"
-else
- dir=$withval
-fi
-])
-msqldir=""
-if test $try_msql = true
-then
- AC_MSG_CHECKING(for mSQL files)
- for d in $dir /usr /usr/local /usr/local/msql /opt/msql /opt/packages/msql
- do
- if test -f $d/include/msql/msql.h
- then
- msqldir_suffix=/msql
- else
- msqldir_suffix=
- fi
- if test -f $d/$lib/msql/libmsql.a -o -f $d/$lib/msql/libmsql$linklibext
- then
- AC_MSG_RESULT(found mSQL in $d)
- msqldir=$d
- msqllibdir_suffix=/msql
- break
- fi
- if test -f $d/$lib/libmsql.a -o -f $d/$lib/libmsql$linklibext
- then
- AC_MSG_RESULT(found mSQL in $d)
- msqldir=$d
- msqllibdir_suffix=
- break
- fi
- done
- if test x$msqldir = x
- then
- AC_MSG_WARN(mSQL backend not used)
- else
- AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
- MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
- MSQL_LIBS="-L${msqldir}/lib${msqllibdir_suffix} -lmsql"
- AC_MSG_CHECKING(for mSQL 3.x API)
- AC_TRY_RUN([
- #include "${msqldir}/include${msqldir_suffix}/msql.h"
- int main() {
- int rc = INT64_TYPE;
- return (rc>0) ? 0 : -1;
- }
- ], AC_DEFINE(HAVE_MSQL3, 1, [Have mSQL 3.x API]) AC_MSG_RESULT(found),
- AC_MSG_RESULT(not found))
- fi
-fi
-
-AM_CONDITIONAL(MSQL, test x$msqldir != x)
-
dnl Test for PostgreSQL
postgres_req=auto
AC_ARG_WITH(postgres,
@@ -1430,9 +1368,6 @@ AC_SUBST(LIBGDA_DTDDIR)
dnl ******************************
dnl Variables
dnl ******************************
-AC_SUBST(MSQL_LIBS)
-AC_SUBST(HAVE_MSQL3)
-AC_SUBST(MSQL_CFLAGS)
AC_SUBST(POSTGRES_LIBS)
AC_SUBST(POSTGRES_CFLAGS)
AC_SUBST(PRIMEBASE_LIBS)
@@ -1621,7 +1556,6 @@ dnl echo " FreeTDS = `if test x$freetdsdir != x; then echo yes; else echo n
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"
-dnl echo " mSQL = `if test x$msqldir != x; then echo yes; else echo no; fi`"
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`"
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 20b1dff..e54bfa2 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -22,10 +22,6 @@ providers/ldap/gda-ldap-provider.c
providers/ldap/gda-ldap-recordset.c
providers/ldap/ldap_specs_dsn.xml.in
providers/ldap/libmain.c
-providers/msql/gda-msql-provider.c
-providers/msql/gda-msql-recordset.c
-providers/msql/libmain.c
-providers/msql/msql_specs_dsn.xml.in
providers/oracle/gda-oracle-blob-op.c
providers/oracle/gda-oracle-provider.c
providers/oracle/gda-oracle-recordset.c
diff --git a/providers/Makefile.am b/providers/Makefile.am
index 0a378fd..730103b 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -22,10 +22,6 @@ if MYSQL
GDA_MYSQL_SERVER=mysql
endif
-if MSQL
-GDA_MSQL_SERVER=msql
-endif
-
if ORACLE
GDA_ORACLE_SERVER=oracle
endif
@@ -78,7 +74,6 @@ SUBDIRS = \
# $(GDA_FREETDS_SERVER) \
# $(GDA_IBMDB2_SERVER) \
# $(GDA_FIREBIRD_SERVER) \
-# $(GDA_MSQL_SERVER) \
# $(GDA_SYBASE_SERVER) \
# $(GDA_XBASE_SERVER) \
# $(GDA_LDAP_SERVER)
diff --git a/tests/providers/.gitignore b/tests/providers/.gitignore
index 096d85c..98c7793 100644
--- a/tests/providers/.gitignore
+++ b/tests/providers/.gitignore
@@ -3,7 +3,6 @@ check_postgres
check_firebird
check_mdb
check_freetds
-check_msql
check_sybase
check_bdb
check_xbase
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 53133ec..31426cc 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -34,11 +34,6 @@ check_PROGRAMS += check_mysql
TESTS += check_mysql
endif
-if MSQL
-check_PROGRAMS += check_msql
-TESTS += check_msql
-endif
-
if ORACLE
check_PROGRAMS += check_oracle
TESTS += check_oracle
@@ -117,13 +112,6 @@ check_mysql_LDADD = \
$(top_builddir)/tests/libgda-test-4.0.la \
$(LIBGDA_LIBS)
-check_msql_SOURCES = $(common_sources) check_msql.c
-check_msql_CFLAGS =
-check_msql_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
- $(LIBGDA_LIBS)
-
check_oracle_SOURCES = $(common_sources) check_oracle.c
check_oracle_CFLAGS =
check_oracle_LDADD = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]