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/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])
Note: See TracChangeset for help on using the changeset viewer.