[Phission-cvs] phission configure.ac,1.27,1.28

[Philip T. <pt...@us...>]

Update of /cvsroot/phission/phission
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12960

Modified Files:
	configure.ac 
Log Message:

Added an enable-java option until the java tests and module output works somewhat relably across systems.
When the tests/output work, this will change to --disable-java instead of --enable-java
Do not use --enable-java yet



Index: configure.ac
===================================================================
RCS file: /cvsroot/phission/phission/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure.ac	28 Sep 2004 07:31:56 -0000	1.27
--- configure.ac	4 Oct 2004 19:39:12 -0000	1.28
***************
*** 321,332 ****
      # Defines: JAVA_CPPFLAGS, JAVA_LDFLAGS
      #-------------------------------------------------------------------------
-     AC_PROG_JAVAC
      # if we can't find JAVAC; then there's no use trying to work with JAVA
!     if test ! -z "$JAVAC"; then
!         AC_PROG_JAVA
!         AC_PROG_JAR
!         AC_JAVA_OPTIONS
!         AC_CHECK_CLASSPATH
!         AC_CHECK_JAVA_HOME
      fi
  
--- 321,339 ----
      # Defines: JAVA_CPPFLAGS, JAVA_LDFLAGS
      #-------------------------------------------------------------------------
      # if we can't find JAVAC; then there's no use trying to work with JAVA
!     enable_java=0
!     AC_ARG_ENABLE(java,
!         [  --enable-java       Compile JAVA modules; Still under development],
!         , enable_java=1)
!     if test "x$enable_java" != x0; then
!         AC_PROG_JAVAC
!         # Check to see if JAVAC was found
!         if test "x$JAVAC" != x; then
!             AC_PROG_JAVA
!             AC_PROG_JAR
!             AC_JAVA_OPTIONS
!             AC_CHECK_CLASSPATH
!             AC_CHECK_JAVA_HOME
!         fi
      fi
  
***************
*** 1080,1084 ****
  
  if test "x$USE_SWIG" = "xyes"; then
!     AC_CONFIG_FILES([swig/phission.i])
      AC_CONFIG_FILES([Makefile.swig])
  fi
--- 1087,1096 ----
  
  if test "x$USE_SWIG" = "xyes"; then
!     if test "x$USE_PYTHON" = "xyes"; then
!         AC_CONFIG_FILES([swig/phission_py.i])
!     fi
!     if test "x$USE_JAVA" = "xyes"; then
!         AC_CONFIG_FILES([swig/phission_java.i])
!     fi
      AC_CONFIG_FILES([Makefile.swig])
  fi