Skip to content

Commit

Permalink
- Reverted the re-addition of the outdated configure script for Java.
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@4598 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Nov 30, 2009
1 parent 250a753 commit e878da3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 120 deletions.
93 changes: 0 additions & 93 deletions c_runtime/Makefile.in

This file was deleted.

5 changes: 1 addition & 4 deletions configure
Expand Up @@ -1283,7 +1283,6 @@ if test -n "$ac_init_help"; then
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-java=DIR With JVM in DIR
--with-CORBA=DIR use corba installed in DIR /usr/local
--with-omniORB=DIR use omniORB installed in DIR
--with-MODPAR Compile with automatic parallelization, requires boost
Expand Down Expand Up @@ -4020,7 +4019,7 @@ $as_echo "Not compiling with BOOST" >&6; }; USE_MODPAR=""; BOOSTHOME=""
fi


ac_config_files="$ac_config_files Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/template_precompile/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile"
ac_config_files="$ac_config_files Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile"

cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -4717,11 +4716,9 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"c_runtime/Makefile") CONFIG_FILES="$CONFIG_FILES c_runtime/Makefile" ;;
"Compiler/rml2sig/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/rml2sig/Makefile" ;;
"modelica_parser/test/parser/Makefile") CONFIG_FILES="$CONFIG_FILES modelica_parser/test/parser/Makefile" ;;
"mosh/src/Makefile") CONFIG_FILES="$CONFIG_FILES mosh/src/Makefile" ;;
"Compiler/template_precompile/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/template_precompile/Makefile" ;;
"Compiler/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/Makefile" ;;
"Compiler/omc_release/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/omc_release/Makefile" ;;
"Compiler/omc_debug/Makefile") CONFIG_FILES="$CONFIG_FILES Compiler/omc_debug/Makefile" ;;
Expand Down
24 changes: 1 addition & 23 deletions configure.in
Expand Up @@ -17,8 +17,6 @@ AC_SUBST(CORBALIBS)
AC_SUBST(IDLCMD)
AC_SUBST(USE_MODPAR)
AC_SUBST(BOOSTHOME)
AC_SUBST(INCLUDE_JAVA)
AC_SUBST(OBJS_JAVA)

dnl Checks for programs.
AC_PROG_CC
Expand Down Expand Up @@ -75,26 +73,6 @@ else
AC_MSG_RESULT([yes])
fi

AC_MSG_CHECKING([for jni.h])
AC_ARG_WITH(java, [ --with-java=DIR With JVM in DIR],
[
if test "x$withval" = "xno" ; then
AC_MSG_RESULT([Not compiling with Java]);
INCLUDE_JAVA=""; OBJS_JAVA="";
else
if test -e $withval/include/jni.h; then
AC_MSG_RESULT([$withval/include]);
INCLUDE_JAVA="-I$withval/include";
OBJS_JAVA="java_interface.o";
else
AC_MSG_ERROR([Could not find jni.h in $withval/include]);
fi
fi
], [
AC_MSG_RESULT([Not compiling with Java]);
INCLUDE_JAVA=""; OBJS_JAVA="";
])

AC_MSG_CHECKING([for antlr header files])
antlrinc=`find $ANTLRHOME /usr/local/include -type f -name TreeParser.hpp -print | head -1 | awk -F/ '{ total="";for (i = 1 ; i < NF-1; i++) total= total $i "/"; print total}'`
if test -z "$antlrinc" ; then
Expand Down Expand Up @@ -267,5 +245,5 @@ fi
AC_MSG_RESULT([Not compiling with BOOST]); USE_MODPAR=""; BOOSTHOME=""
])

AC_OUTPUT(Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/template_precompile/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile)
AC_OUTPUT(Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile)

0 comments on commit e878da3

Please sign in to comment.