Ignore:
Timestamp:
Jul 8, 2011 3:14:27 PM (9 years ago)
Author:
gah
Message:

fixes for grid.sh build for opensees

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cf/rpLangJava.m4

    r2209 r2298  
    11AC_DEFUN([RP_LANG_JAVA],[
    2 rp_with_java="yes"
    32AC_ARG_WITH([java],
    43    [AS_HELP_STRING([--with-java[=DIR]],[location of java @<:@default=yes@:>@])],
    5     [rp_with_java=$withval],
    6     [rp_with_java=yes])
     4    [],
     5    [with_java=yes])
    76JAVA=""
    87JAVAH=""
    98JAVAC=""
    109JAVA_DEV_PKG="no"
    11 AC_ARG_WITH(
    12     [java],
    13     [AS_HELP_STRING([--with-java=DIR], [location of java @<:@default=yes@:>@])],
    14     [rp_with_java=$withval])
    1510
    16 if test "${rp_with_java}" != "no" ; then
    17   if test "${rp_with_java}" = "yes" ; then
     11if test "${with_java}" != "no" ; then
     12  if test "${with_java}" = "yes" ; then
    1813    AC_PATH_PROG(JAVA,  java)
    1914    AC_PATH_PROG(JAVAC, javac)
    2015    AC_PATH_PROG(JAVAH, javah)
    2116  else
    22     AC_PATH_PROG(JAVA,  java,  [], [${rp_with_java}/bin:${rp_with_java}])
    23     AC_PATH_PROG(JAVAC, javac, [], [${rp_with_java}/bin:${rp_with_java}])
    24     AC_PATH_PROG(JAVAH, javah, [], [${rp_with_java}/bin:${rp_with_java}])
     17    AC_PATH_PROG(JAVA,  java,  [], [${with_java}/bin:${with_java}])
     18    AC_PATH_PROG(JAVAC, javac, [], [${with_java}/bin:${with_java}])
     19    AC_PATH_PROG(JAVAH, javah, [], [${with_java}/bin:${with_java}])
    2520  fi
    2621fi
     
    3227if test "x${JAVA}" != "x" ; then
    3328  for d in \
    34    ${rp_with_java} \
     29   ${with_java} \
    3530   ${JAVA_HOME} \
    3631   /apps/java/jdk1.6* \
Note: See TracChangeset for help on using the changeset viewer.