Changeset 2298 for trunk/cf


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

fixes for grid.sh build for opensees

Location:
trunk/cf
Files:
5 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* \
  • trunk/cf/rpLangMatlab.m4

    r2209 r2298  
    11AC_DEFUN([RP_LANG_MATLAB],[
    2 rp_with_matlab="yes"
     2with_matlab="yes"
    33AC_ARG_WITH(
    44    [matlab],
    55    [AS_HELP_STRING([--with-matlab[=DIR]],
    66        [location of matlab and mex compiler @<:@default=yes@:>@])],
    7     [rp_with_matlab=$withval],
    8     [rp_with_matlab=yes])
     7    [],
     8    [with_matlab=yes])
    99
    1010MCC=""
     
    1313MEXEXT=""
    1414MATLAB=
    15 if test "$rp_with_matlab" != "no" ; then
    16   if test "$rp_with_matlab" = "yes" ; then
     15if test "$with_matlab" != "no" ; then
     16  if test "$with_matlab" = "yes" ; then
    1717    AC_PATH_PROG(MATLAB, matlab)
    1818  else
    19     AC_PATH_PROG(MATLAB, matlab, [], [${rp_with_matlab}/bin:${rp_with_matlab}])
     19    AC_PATH_PROG(MATLAB, matlab, [], [${with_matlab}/bin:${with_matlab}])
    2020  fi
    2121fi
  • trunk/cf/rpLangOctave.m4

    r2209 r2298  
    2222# Standard octave search (use the installed version of octave)
    2323AC_DEFUN([RP_LANG_OCTAVE],[
    24 rp_with_octave="yes"
    2524AC_ARG_WITH(
    2625    [octave],
    2726    [AS_HELP_STRING([--with-octave[=DIR]],
    2827        [path of default octave compiler `mkoctfile' @<:@default=yes@:>@])],
    29     [rp_with_octave=$withval],
    30     [rp_with_octave=yes])
     28    [],
     29    [with_octave=yes])
    3130
    3231OCTAVE=
     
    3635MKOCTFILE3=
    3736
    38 if test "$rp_with_octave" != "no" ; then
    39   if test "$rp_with_octave" = "yes" ; then
     37if test "$with_octave" != "no" ; then
     38  if test "$with_octave" = "yes" ; then
    4039    AC_PATH_PROG(OCTAVE, octave)
    4140    AC_PATH_PROG(MKOCTFILE, mkoctfile)
    4241  else
    43     OCTAVE=$rp_with_octave
    44     MKOCTFILE=`dirname $rp_with_octave`/mkoctfile
     42    OCTAVE=$with_octave
     43    MKOCTFILE=`dirname $with_octave`/mkoctfile
    4544  fi
    4645fi
     
    8079    [AS_HELP_STRING([--with-mkoctfile3[=DIR]],
    8180        [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
    82     [rp_with_mkoctfile3=$withval],
    83     [rp_with_mkoctfile3=no])
     81    [],
     82    [with_mkoctfile3=no])
    8483
    85 if test "$rp_with_mkoctfile3" != "no" ; then
    86   if test "$rp_with_mkoctfile3" = "yes" ; then
     84if test "$with_mkoctfile3" != "no" ; then
     85  if test "$with_mkoctfile3" = "yes" ; then
    8786    AC_PATH_PROG(mkoctfile3, mkoctfile)
    8887  else
    89     MKOCTFILE3=$rp_with_mkoctfile3
     88    MKOCTFILE3=$with_mkoctfile3
    9089  fi
    9190  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
     
    9998    [AS_HELP_STRING([--with-mkoctfile2[=DIR]],
    10099        [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
    101     [rp_with_mkoctfile2=$withval],
    102     [rp_with_mkoctfile2=no])
     100    [],
     101    [with_mkoctfile2=no])
    103102
    104 if test "$rp_with_mkoctfile2" != "no" ; then
    105   if test "$rp_with_mkoctfile2" = "yes" ; then
     103if test "$with_mkoctfile2" != "no" ; then
     104  if test "$with_mkoctfile2" = "yes" ; then
    106105    AC_PATH_PROG(mkoctfile2, mkoctfile)
    107106  else
    108     MKOCTFILE2=$rp_with_mkoctfile2
     107    MKOCTFILE2=$with_mkoctfile2
    109108  fi
    110109  # Have to use octave to get a version, instead of mkoctfile.
     
    113112  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    114113fi
    115 
    116 
    117 echo "MKOCTFILE2 = $MKOCTFILE2"
    118 echo "MKOCTFILE3 = $MKOCTFILE3"
    119 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"
    120 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
    121114])
  • trunk/cf/rpLangPerl.m4

    r2209 r2298  
    55    [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])],
    66    [],
    7     [rp_with_perl=yes])
     7    [with_perl=yes])
    88
    99PERL=
     
    1818PERL_VERSION_RV=
    1919PERL_LIBSPEC=
    20 if test "$rp_with_perl" != "no" ; then
    21   if test "$rp_with_perl" != "yes" ; then
    22     AC_PATH_PROG(PERL, perl, [], [$rp_with_perl/bin:$rp_with_perl])
     20if test "$with_perl" != "no" ; then
     21  if test "$with_perl" != "yes" ; then
     22    AC_PATH_PROG(PERL, perl, [], [$with_perl/bin:$with_perl])
    2323  else
    2424    AC_PATH_PROG(PERL, perl)
  • trunk/cf/rpLangPython.m4

    r2209 r2298  
    1313PYTHON_VERSION=""
    1414pythondir=""
    15 rp_with_python="yes"
    1615AC_ARG_WITH([python],
    1716    [AS_HELP_STRING([--with-python[=DIR]],[location of python @<:@default=yes@:>@])],
    18     [rp_with_python=$withval],
    19     [rp_with_python=yes])
     17    [],
     18    [with_python=yes])
    2019
    21 if test "$rp_with_python" != "no" ; then
    22   if test "$rp_with_python" = "yes" ; then
     20if test "$with_python" != "no" ; then
     21  if test "$with_python" = "yes" ; then
    2322    AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
    2423  else
    25     AC_PATH_PROG(PYTHON, python, [], [${rp_with_python}/bin:${rp_with_python}])
     24    AC_PATH_PROG(PYTHON, python, [], [${with_python}/bin:${with_python}])
    2625  fi
    2726  AC_MSG_CHECKING([for Python version])
Note: See TracChangeset for help on using the changeset viewer.