Mercurial > hg > octave-nkf

comparison configure.ac @ 15625:acf0addfc610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include Octave Forge java package in core Octave * scripts/java: New directory tree. * scripts/Makefile.am: Include java/module.mk. (JAR_FILES): New variable. (nobase_fcnfile_DATA): Include $(JAR_FILES) in the list. (all-local): Depend on $(JAR_FILES). (java/PKG_ADD, java_GEN_FCN_FILES, java/$(octave_dirstamp)): New rules. * libinterp/link-deps (LIBOCTINTERP_LINK_DEP): Include $(JAVA_LIBS) in the list. * dldfcn/__java__.h, dldfcn/__java__.cc: New files. * dldfcn/module-files (__java__.cc): New file description. * doc/interpreter/java.txi: New file. * doc/interpreter/octave.texi: Include java.texi. * doc/interpreter/java-images: New directory. * doc/interpreter/Makefile.am (JAVA_IMAGES): New variable. (IMAGES): Include $(JAVA_IMAGSES) in the list. (MUNGED_TEXI_SRC): Include java.texi in the list. * configure.ac: Check for Java libraries and tools. Include Java info in the summary message. * build-aux/common.mk (JAVA_CPPFLAGS, JAVA_LIBS): New variables. * NEWS: Update. * contributors.in: Include Martin Hepperle in the list.
author John W. Eaton <jwe@octave.org>
date Fri, 23 Nov 2012 15:29:13 -0500
parents fcdc284f96ef
children e88b31c485c0
comparison
equal deleted inserted replaced
15624:550147454137 15625:acf0addfc610
735 735
736 AC_SUBST(LLVM_CPPFLAGS) 736 AC_SUBST(LLVM_CPPFLAGS)
737 AC_SUBST(LLVM_CXXFLAGS) 737 AC_SUBST(LLVM_CXXFLAGS)
738 AC_SUBST(LLVM_LDFLAGS) 738 AC_SUBST(LLVM_LDFLAGS)
739 AC_SUBST(LLVM_LIBS) 739 AC_SUBST(LLVM_LIBS)
740
741 ### Check for Java.
742
743 warn_java=
744
745 if test -z "$JAVA_HOME"; then
746 AC_CHECK_PROG(JAVA, java, java)
747 AC_CHECK_PROG(JAVAC, javac, javac)
748 AC_CHECK_PROG(JAR, jar, jar)
749 else
750 AC_PATH_PROG(JAVA, java, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
751 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
752 AC_PATH_PROG(JAR, jar, [], [$JAVA_HOME/bin$PATH_SEPARATOR$PATH])
753 fi
754 HAVE_JAVA=no
755 if test -n "$JAVAC" -a -n "$JAR"; then
756 AC_MSG_CHECKING([for Java version])
757 java_version=[`$JAVA -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`]
758 AC_MSG_RESULT($java_version)
759 java_major=[`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`]
760 java_minor=[`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
761 if test $java_major -ge 1 -a $java_minor -ge 5; then
762 case "$canonical_host_type" in
763 *-msdosmsvc*)
764 HAVE_JAVA=yes
765 JAVA_LIBS=-ladvapi32
766 ;;
767 *)
768 if test -z "$JAVA_HOME"; then
769 # This is the location of Java on an OS X box. In this
770 # directory we can find the various versions of a
771 # JavaVMs. Check for the newest version set the JAVA_HOME
772 # variable.
773 if test -d "/System/Library/Frameworks/JavaVM.framework"; then
774 # Sneak the -framework flag into mkoctfile via LFLAGS
775 LFLAGS="$LFLAGS -framework JavaVM"
776 JAVA_TEMP="/System/Library/Frameworks/JavaVM.framework"
777 JAVA_HOME="${JAVA_TEMP}/Home"
778 JAVA_ARCH="${JAVA_TEMP}/Libraries/libjvm_compat.dylib"
779 # According to:
780 # http://developer.apple.com/unix/crossplatform.html
781 # you need to explicitely set the include path
782 JAVA_CPPFLAGS="-I${JAVA_HOME}/include"
783 HAVE_JAVA=yes
784 # This is the Debian default path
785 elif test -d "/usr/lib/jvm/default-java"; then
786 JAVA_HOME=/usr/lib/jvm/default-java
787 # This is the path of java 6 on debian
788 elif test -d "/usr/lib/jvm/java-6-sun"; then
789 JAVA_HOME=//usr/lib/jvm/java-6-sun
790 else
791 JAVA_HOME=/usr/lib/jvm
792 fi
793 fi
794 JAVA_HOME=[`echo -n $JAVA_HOME | sed -e 's|/$||'`]
795 if test -z "$JAVA_ARCH"; then
796 if test -d "${JAVA_HOME}/jre/lib/i386"; then
797 JAVA_ARCH="i386";
798 elif test -d "${JAVA_HOME}/jre/lib/amd64"; then
799 JAVA_ARCH="amd64"
800 elif test -d "${JAVA_HOME}/jre/lib/mac"; then
801 JAVA_ARCH="mac"
802 elif test -d "${JAVA_HOME}/jre/lib/maci"; then
803 JAVA_ARCH="maci"
804 elif test -d "${JAVA_HOME}/jre/lib/solaris"; then
805 JAVA_ARCH="solaris"
806 elif test -d "${JAVA_HOME}/jre/lib/solarisv9"; then
807 JAVA_ARCH="solarisv9"
808 fi
809 fi
810 if test -n "$JAVA_ARCH"; then
811 HAVE_JAVA=yes
812 case "$canonical_host_type" in
813 *-mingw* | *-cygwin*)
814 JAVA_LIBS=-ladvapi32
815 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
816 ;;
817 *)
818 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
819 ;;
820 esac
821 fi
822 ;;
823 esac
824 if test "$HAVE_JAVA" = "yes"; then
825 AC_DEFINE(HAVE_JAVA, 1,
826 [Define to 1 if Java is available and is at least version 1.5])
827 fi
828 else
829 warn_java="Java 1.5 or later not found. Octave will not be able to call Java methods."
830 fi
831 fi
832
833 AC_SUBST(JAVAC)
834 AC_SUBST(JAR)
835 AC_SUBST(JAVA_CPPFLAGS)
836 AC_SUBST(JAVA_LIBS)
837 AC_DEFINE_UNQUOTED([JAVA_HOME], ["$JAVA_HOME"], [Java home.])
838 AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"], [Java arch.])
740 839
741 ### Check for HDF5 library. 840 ### Check for HDF5 library.
742 841
743 save_CPPFLAGS="$CPPFLAGS" 842 save_CPPFLAGS="$CPPFLAGS"
744 save_LIBS="$LIBS" 843 save_LIBS="$LIBS"
2533 graphics CFLAGS: $GRAPHICS_CFLAGS 2632 graphics CFLAGS: $GRAPHICS_CFLAGS
2534 graphics libraries: $GRAPHICS_LIBS 2633 graphics libraries: $GRAPHICS_LIBS
2535 HDF5 CPPFLAGS: $HDF5_CPPFLAGS 2634 HDF5 CPPFLAGS: $HDF5_CPPFLAGS
2536 HDF5 LDFLAGS: $HDF5_LDFLAGS 2635 HDF5 LDFLAGS: $HDF5_LDFLAGS
2537 HDF5 libraries: $HDF5_LIBS 2636 HDF5 libraries: $HDF5_LIBS
2637 Java arch: $JAVA_ARCH
2638 Java home: $JAVA_HOME
2639 Java CPPFLAGS: $JAVA_CPPFLAGS
2640 Java libraries: $JAVA_LIBS
2538 LAPACK libraries: $LAPACK_LIBS 2641 LAPACK libraries: $LAPACK_LIBS
2539 LLVM CPPFLAGS: $LLVM_CPPFLAGS 2642 LLVM CPPFLAGS: $LLVM_CPPFLAGS
2540 LLVM LDFLAGS: $LLVM_LDFLAGS 2643 LLVM LDFLAGS: $LLVM_LDFLAGS
2541 LLVM libraries: $LLVM_LIBS 2644 LLVM libraries: $LLVM_LIBS
2542 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS 2645 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS