python directory moved into bindings dir

Makefile.am

@@ -1,7 +1,3 @@
-if BUILD_PYTHON
-DIR_P = python
-endif
-
 if BUILD_RUBY
 DIR_R = ruby
 endif
@@ -10,8 +6,8 @@ if BUILD_PERF
 DIR_PERF = perf
 endif
 
-SUBDIRS = src $(DIR_P) $(DIR_R) $(DIR_PERF) devices bindings
+SUBDIRS = src $(DIR_R) $(DIR_PERF) devices bindings
-DIST_SUBDIRS = src python ruby perf devices bindings
+DIST_SUBDIRS = src ruby perf devices bindings
 
 EXTRA_DIST =  $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2
 

bindings/Makefile.am

@@ -0,0 +1,11 @@
+if BUILD_JAVA
+DIR_J = java
+endif
+
+if BUILD_PYTHON
+DIR_P = python
+endif
+
+SUBDIRS = $(DIR_J) $(DIR_P)
+DIST_SUBDIRS = java python
+

configure.in

@@ -488,7 +488,8 @@ AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
 
-AC_OUTPUT(Makefile src/Makefile python/Makefile python/setup.py ruby/Makefile \
+AC_OUTPUT(Makefile src/Makefile bindings/python/Makefile \
+    bindings/python/setup.py ruby/Makefile \
     bindings/java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
     perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \
     devices/Makefile devices/zmq_forwarder/Makefile bindings/Makefile)