[Phission-cvs] phission/m4 java.m4,1.6,1.7 swig.m4,1.7,1.8

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

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

Modified Files:
	java.m4 swig.m4 
Log Message:

Added swig_version output from swig.m4

Made the real SUN java programs a priority in the java.m4 detection...
need to make sure the real java/javac/etc are in your path ahead of the GNU Java tools



Index: swig.m4
===================================================================
RCS file: /cvsroot/phission/phission/m4/swig.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** swig.m4	27 Apr 2005 16:42:28 -0000	1.7
--- swig.m4	26 May 2005 21:40:47 -0000	1.8
***************
*** 35,38 ****
--- 35,39 ----
                    [])
                    
+     swig_version="0.0.0"
  	if test -z "$SWIG" ; then
  		AC_MSG_WARN([cannot find 'swig' program, you may have a look at http://www.swig.org])
***************
*** 111,114 ****
--- 112,116 ----
  		AC_MSG_NOTICE([SWIG runtime library directory is '$SWIG_RUNTIME_LIBS_DIR'])
  	fi
+     AC_SUBST([swig_version])
      AC_SUBST([SWIG_LIBSWIG_DIR])
      AC_SUBST([SWIG_SUITABLE])

Index: java.m4
===================================================================
RCS file: /cvsroot/phission/phission/m4/java.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** java.m4	2 May 2005 19:28:41 -0000	1.6
--- java.m4	26 May 2005 21:40:47 -0000	1.7
***************
*** 412,419 ****
  AC_REQUIRE([AC_EXEEXT])dnl
  if test "x$JAVAPREFIX" = x; then
!         test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, gij$EXEEXT kaffe$EXEEXT java$EXEEXT)
  #        test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT)
  else
!         test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, gij$EXEEXT kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX)
  #        test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX)
  fi
--- 412,419 ----
  AC_REQUIRE([AC_EXEEXT])dnl
  if test "x$JAVAPREFIX" = x; then
!         test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, java$EXEEXT gij$EXEEXT kaffe$EXEEXT )
  #        test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT)
  else
!         test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, java$EXEEXT gij$EXEEXT kaffe$EXEEXT, $JAVAPREFIX)
  #        test "x$JAVA" = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX)
  fi
***************
*** 476,482 ****
        [AC_CHECK_TOOLS(JAVA_CC, [$1])],
  [
! AC_CHECK_TOOL(JAVA_CC, gcj)
  if test -z "$JAVA_CC"; then
!   AC_CHECK_TOOL(JAVA_CC, javac)
  fi
  if test -z "$JAVA_CC"; then
--- 476,482 ----
        [AC_CHECK_TOOLS(JAVA_CC, [$1])],
  [
! AC_CHECK_TOOL(JAVA_CC, javac)
  if test -z "$JAVA_CC"; then
!   AC_CHECK_TOOL(JAVA_CC, gcj)
  fi
  if test -z "$JAVA_CC"; then
***************
*** 632,639 ****
  AC_REQUIRE([AC_EXEEXT])dnl
  if test "x$JAVAPREFIX" = x; then
!         test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT )
  #        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, guavac$EXEEXT jikes$EXEEXT javac$EXEEXT )
  else
!         test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX)
  #        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX)
  fi
--- 632,639 ----
  AC_REQUIRE([AC_EXEEXT])dnl
  if test "x$JAVAPREFIX" = x; then
!         test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT )
  #        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, guavac$EXEEXT jikes$EXEEXT javac$EXEEXT )
  else
!         test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT, $JAVAPREFIX)
  #        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX)
  fi