From fa7a37365106f53b8e161896317021b4f0b14bbb Mon Sep 17 00:00:00 2001
From: Frederic Peters <fpeters@entrouvert.com>
Date: Tue, 29 Apr 2008 12:24:18 +0000
Subject: [PATCH] use new bindings

---
 Makefile.am  | 14 ++------------
 configure.ac |  8 ++++++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 10bea975..eee2cba2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,6 @@
-if PYTHON_ENABLED
-    PYTHON_SD = python
-endif
-if JAVA_ENABLED
-    JAVA_SD = java
-endif
 if PHP4_ENABLED
     PHP4_SD = php
 endif
-if PHP5_ENABLED
-    PHP5_SD = php5
-endif
 if CSHARP_ENABLED
     CSHARP_SD = csharp
 endif
@@ -19,13 +10,12 @@ endif
 
 SUBDIRS		= lasso \
 		  swig \
-		  $(PHP4_SD) $(PHP5_SD) $(PYTHON_SD) $(JAVA_SD) $(PERL_SD) \
+		  $(PHP4_SD) $(PERL_SD) \
 		  tests \
 		  win32 \
+		  bindings \
 		  docs
 
-ABS_BUILDDIR	= $(shell pwd)
-
 EXTRA_DIST	= COPYING lasso.pc.in lasso-src-config.in
 
 pkgconfig_DATA	= lasso.pc
diff --git a/configure.ac b/configure.ac
index 9ffc7be8..bf3d79c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -923,7 +923,6 @@ docs/lasso-book/Makefile
 docs/lasso-book/figures/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
-java/Makefile
 lasso/Makefile
 lasso/id-ff/Makefile
 lasso/id-wsf/Makefile
@@ -935,7 +934,6 @@ lasso/xml/id-wsf-2.0/Makefile
 lasso/xml/ws/Makefile
 perl/Makefile
 php/Makefile
-python/Makefile
 swig/Makefile
 swig/wsf-support.i
 swig/saml-2.0/Makefile
@@ -966,6 +964,12 @@ win32/nsis/lasso-deps.nsi
 win32/nsis/lasso-full.nsi
 win32/nsis/lasso-lite.nsi
 win32/nsis/python.nsi
+bindings/Makefile
+bindings/java/Makefile
+bindings/python/Makefile
+bindings/python/tests/Makefile
+bindings/php5/Makefile
+bindings/php5/examples/Makefile
 ])
 
 languages_available=`echo $languages_available | sed -e "s/^ //" `