[Opensrf-commits] r1951 - trunk (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-04-24 09:34:17 -0400 (Sat, 24 Apr 2010)
New Revision: 1951

Modified:
   trunk/configure.ac
Log:
Make it possible to install just OpenSRF Python with ./configure --disable-core --enable-python


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-04-24 13:33:14 UTC (rev 1950)
+++ trunk/configure.ac	2010-04-24 13:34:17 UTC (rev 1951)
@@ -1,6 +1,6 @@
 # Copyright (C) 2008 Equinox Software, Inc.
 # Kevin Beswick <kevinbeswick00 at gmail.com>
-# Copyright (C) 2009 Dan Scott <dscott at laurentian.ca>
+# Copyright (C) 2009-2010 Dan Scott <dscott at laurentian.ca>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -59,8 +59,6 @@
         fi
 ])
 
-
-
 #-------------------------------
 # Installation options
 #-------------------------------
@@ -146,6 +144,7 @@
 # path to the directory containing the java dependency jar files (included if java installs)
 if test $OSRF_INSTALL_JAVA; then
 	AC_SUBST([OSRF_JAVA_DEPSDIR], [/opt/java])
+    AC_CONFIG_FILES([src/java/Makefile])
 fi
 
 #--------------------------------
@@ -227,6 +226,19 @@
 AC_CONFIG_FILES([Makefile
 	src/Makefile])
 
+#PYTHON TESTS
+if test x$OSRF_INSTALL_PYTHON = xtrue; then
+    AC_CHECK_PROG([HAVE_PYTHON],python,yes,no)
+    if test $HAVE_PYTHON = "no"; then
+        AC_MSG_ERROR([*** python not found, aborting])
+    fi
+    AC_PYTHON_MOD([setuptools])
+    AC_CONFIG_FILES([
+        examples/math_client.py
+        src/python/Makefile
+    ])
+fi
+
 if test "x$OSRF_INSTALL_CORE" = "xtrue"; then
 	#--------------------------------
 	# Check for dependencies.
@@ -240,16 +252,6 @@
 	AC_MSG_ERROR([*** apxs not found, aborting])
 	fi  
 
-	#PYTHON TESTS
-	if test x$OSRF_INSTALL_PYTHON = xtrue; then
-		AC_CHECK_PROG([HAVE_PYTHON],python,yes,no)
-		if test $HAVE_PYTHON = "no"; then
-			AC_MSG_ERROR([*** python not found, aborting])
-		fi
-		AC_PYTHON_MOD([setuptools])
-	fi
-
-
 	#-----------------------------
 	# Checks for libraries.
 	#-----------------------------
@@ -302,16 +304,13 @@
 	AC_CONFIG_FILES([doc/dokuwiki-doc-stubber.pl
 			 examples/math_xul_client/Makefile
 			 examples/math_bench.pl
-			 examples/math_client.py
 			 examples/multisession-test.pl
 			 src/c-apps/Makefile
 			 src/gateway/Makefile
-			 src/java/Makefile
 			 src/jserver/Makefile
 			 src/libopensrf/Makefile
 			 src/perl/Makefile
 			 src/ports/strn_compat/Makefile
-			 src/python/Makefile
 			 src/router/Makefile
 			 src/srfsh/Makefile
 			 bin/opensrf-perl.pl