commit c35790331b9951b7bfb1f51e83fecd8906600e1c
Author: Vivien Malerba <malerba gnome-db org>
Date: Sat Oct 2 15:18:17 2010 +0200
Removed old and unmaintained LDAP code
configure.ac | 42 --
po/POTFILES.skip | 4 -
providers/Makefile.am | 8 +-
providers/ldap/Makefile.am | 38 --
providers/ldap/gda-ldap-provider.c | 762 ----------------------------------
providers/ldap/gda-ldap-provider.h | 60 ---
providers/ldap/gda-ldap-recordset.c | 453 --------------------
providers/ldap/gda-ldap-recordset.h | 60 ---
providers/ldap/gda-ldap.h | 55 ---
providers/ldap/ldap_specs_dsn.xml.in | 10 -
providers/ldap/libgda-ldap-4.0.pc.in | 9 -
providers/ldap/libmain.c | 75 ----
providers/ldap/utils.c | 120 ------
tests/providers/.gitignore | 3 +-
tests/providers/Makefile.am | 12 -
tests/providers/check_ldap.c | 38 --
16 files changed, 3 insertions(+), 1746 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3d0fc7e..0b06949 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,45 +658,6 @@ AM_CONDITIONAL(FIREBIRD, test x$firebirddir != x)
dnl Test for MDB Tools (for MS Access files)
MDBTOOLS_CHECK([$lib])
-dnl Test for LDAP
-try_ldap=true
-AC_ARG_WITH(ldap,
-[ --with-ldap=<directory> use LDAP library in <directory>],[
-if test $withval = no
-then
- try_ldap=false
-elif test $withval = yes
-then
- dir="/usr/local"
-else
- dir=$withval
-fi
-])
-if test $try_ldap = true
-then
- AC_MSG_CHECKING(for LDAP files)
- ldapdir=""
- for d in $dir /usr /usr/local /opt/openldap
- do
- if test -f $d/include/ldap.h -a -f $d/include/lber.h
- then
- AC_MSG_RESULT(found LDAP in $d)
- ldapdir=$d
- break
- fi
- done
- if test x$ldapdir = x
- then
- AC_MSG_WARN(LDAP backend not used)
- else
- LDAP_CFLAGS="-I${ldapdir}/include"
- LDAP_LIBS="-L${ldapdir}/lib -lldap -llber"
- AC_DEFINE(HAVE_LDAP, 1, [Have LDAP])
- fi
-fi
-
-AM_CONDITIONAL(LDAP, test x$ldapdir != x)
-
dnl test for system-installed SQLite
dnl If no SQLite is found or if the SQLite found does not have the sqlite3_table_column_metadata()
dnl function call, then use the embedded version
@@ -1092,8 +1053,6 @@ AC_SUBST(POSTGRES_LIBS)
AC_SUBST(POSTGRES_CFLAGS)
AC_SUBST(PRIMEBASE_LIBS)
AC_SUBST(PRIMEBASE_CFLAGS)
-AC_SUBST(LDAP_LIBS)
-AC_SUBST(LDAP_CFLAGS)
AC_SUBST(ORACLE_LIBS)
AC_SUBST(ORACLE_CFLAGS)
AC_SUBST(FIREBIRD_LIBS)
@@ -1269,7 +1228,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 " 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`"
echo " WEB = `if test x$have_libsoup = xyes; then echo yes; else echo no; fi`"
if test x"$br_cv_binreloc" != "xyes" -a x"$platform_win32" != "xyes"
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9278707..de79439 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -9,10 +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/ldap/gda-ldap-provider.c
-providers/ldap/gda-ldap-recordset.c
-providers/ldap/ldap_specs_dsn.xml.in
-providers/ldap/libmain.c
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 7630c6c..80aa813 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -26,10 +26,6 @@ if POSTGRES
GDA_POSTGRES_SERVER=postgres
endif
-if LDAP
-GDA_LDAP_SERVER=ldap
-endif
-
if JAVA
GDA_JAVA_SERVER=jdbc
endif
@@ -55,5 +51,5 @@ SUBDIRS = \
$(GDA_ORACLE_SERVER) \
$(GDA_WEB_SERVER) \
$(GDA_SQLCIPHER_SERVER)
-# $(GDA_FIREBIRD_SERVER) \
-# $(GDA_LDAP_SERVER)
+# $(GDA_FIREBIRD_SERVER)
+
diff --git a/tests/providers/.gitignore b/tests/providers/.gitignore
index 9910b2d..68ce3a8 100644
--- a/tests/providers/.gitignore
+++ b/tests/providers/.gitignore
@@ -4,5 +4,4 @@ check_firebird
check_mdb
check_bdb
check_mysql
-check_oracle
-check_ldap
\ No newline at end of file
+check_oracle
\ No newline at end of file
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 559e72b..11a8313 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -39,11 +39,6 @@ check_PROGRAMS += check_postgres
TESTS += check_postgres
endif
-if LDAP
-check_PROGRAMS += check_ldap
-TESTS += check_ldap
-endif
-
common_sources = \
prov-test-common.h \
prov-test-common.c \
@@ -99,13 +94,6 @@ check_postgres_LDADD = \
$(top_builddir)/tests/libgda-test-4.0.la \
$(LIBGDA_LIBS)
-check_ldap_SOURCES = $(common_sources) check_ldap.c
-check_ldap_CFLAGS =
-check_ldap_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
- $(LIBGDA_LIBS)
-
EXTRA_DIST = \
README \
gda_check_db.mdb \