Make it possible to install just OpenSRF Python with ./configure --disable-core ...

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1951 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/configure.ac b/configure.ac
index c7ad418..1a57438 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Copyright (C) 2008 Equinox Software, Inc.
 # Kevin Beswick <kevinbeswick00@gmail.com>
-# Copyright (C) 2009 Dan Scott <dscott@laurentian.ca>
+# Copyright (C) 2009-2010 Dan Scott <dscott@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 @@ AC_DEFUN([AC_PYTHON_MOD],[
         fi
 ])
 
-
-
 #-------------------------------
 # Installation options
 #-------------------------------
@@ -146,6 +144,7 @@ AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
 # 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 @@ IFS=${IFSBAK}
 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 @@ if test "x$OSRF_INSTALL_CORE" = "xtrue"; then
        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 @@ if test "x$OSRF_INSTALL_CORE" = "xtrue"; then
        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