Changeset 2298


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

fixes for grid.sh build for opensees

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r2081 r2298  
    3232ENABLE_GUI      = @ENABLE_GUI@
    3333
    34 TARGETS         = src
     34TARGETS         = src lang
    3535
    3636ifneq ($(ENABLE_GUI),)
    37   TARGETS += gui lang lib builder tester examples
     37  TARGETS += gui lib builder tester examples
    3838endif
    3939
  • 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])
  • trunk/configure

    r2207 r2298  
    73767376
    73777377
     7378with_matlab="yes"
    73787379
    73797380# Check whether --with-matlab was given.
    73807381if test "${with_matlab+set}" = set; then :
    7381   withval=$with_matlab; rp_with_matlab=$withval
    7382 else
    7383   rp_with_matlab=yes
     7382  withval=$with_matlab;
     7383else
     7384  with_matlab=yes
    73847385fi
    73857386
     
    73907391MEXEXT=""
    73917392MATLAB=
    7392 if test "$rp_with_matlab" != "no" ; then
    7393   if test "$rp_with_matlab" = "yes" ; then
     7393if test "$with_matlab" != "no" ; then
     7394  if test "$with_matlab" = "yes" ; then
    73947395    # Extract the first word of "matlab", so it can be a program name with args.
    73957396set dummy matlab; ac_word=$2
     
    74467447  *)
    74477448  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7448 as_dummy="${rp_with_matlab}/bin:${rp_with_matlab}"
     7449as_dummy="${with_matlab}/bin:${with_matlab}"
    74497450for as_dir in $as_dummy
    74507451do
     
    76237624# Check whether --with-octave was given.
    76247625if test "${with_octave+set}" = set; then :
    7625   withval=$with_octave; rp_with_octave=$withval
    7626 else
    7627   rp_with_octave=yes
     7626  withval=$with_octave;
     7627else
     7628  with_octave=yes
    76287629fi
    76297630
     
    76357636MKOCTFILE3=
    76367637
    7637 if test "$rp_with_octave" != "no" ; then
    7638   if test "$rp_with_octave" = "yes" ; then
     7638if test "$with_octave" != "no" ; then
     7639  if test "$with_octave" = "yes" ; then
    76397640    # Extract the first word of "octave", so it can be a program name with args.
    76407641set dummy octave; ac_word=$2
     
    77187719
    77197720  else
    7720     OCTAVE=$rp_with_octave
    7721     MKOCTFILE=`dirname $rp_with_octave`/mkoctfile
     7721    OCTAVE=$with_octave
     7722    MKOCTFILE=`dirname $with_octave`/mkoctfile
    77227723  fi
    77237724fi
     
    77567757# Check whether --with-mkoctfile3 was given.
    77577758if test "${with_mkoctfile3+set}" = set; then :
    7758   withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
    7759 else
    7760   rp_with_mkoctfile3=no
    7761 fi
    7762 
    7763 
    7764 if test "$rp_with_mkoctfile3" != "no" ; then
    7765   if test "$rp_with_mkoctfile3" = "yes" ; then
     7759  withval=$with_mkoctfile3;
     7760else
     7761  with_mkoctfile3=no
     7762fi
     7763
     7764
     7765if test "$with_mkoctfile3" != "no" ; then
     7766  if test "$with_mkoctfile3" = "yes" ; then
    77667767    # Extract the first word of "mkoctfile", so it can be a program name with args.
    77677768set dummy mkoctfile; ac_word=$2
     
    78057806
    78067807  else
    7807     MKOCTFILE3=$rp_with_mkoctfile3
     7808    MKOCTFILE3=$with_mkoctfile3
    78087809  fi
    78097810  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
     
    78167817# Check whether --with-mkoctfile2 was given.
    78177818if test "${with_mkoctfile2+set}" = set; then :
    7818   withval=$with_mkoctfile2; rp_with_mkoctfile2=$withval
    7819 else
    7820   rp_with_mkoctfile2=no
    7821 fi
    7822 
    7823 
    7824 if test "$rp_with_mkoctfile2" != "no" ; then
    7825   if test "$rp_with_mkoctfile2" = "yes" ; then
     7819  withval=$with_mkoctfile2;
     7820else
     7821  with_mkoctfile2=no
     7822fi
     7823
     7824
     7825if test "$with_mkoctfile2" != "no" ; then
     7826  if test "$with_mkoctfile2" = "yes" ; then
    78267827    # Extract the first word of "mkoctfile", so it can be a program name with args.
    78277828set dummy mkoctfile; ac_word=$2
     
    78657866
    78667867  else
    7867     MKOCTFILE2=$rp_with_mkoctfile2
     7868    MKOCTFILE2=$with_mkoctfile2
    78687869  fi
    78697870  # Have to use octave to get a version, instead of mkoctfile.
     
    78747875
    78757876
    7876 echo "MKOCTFILE2 = $MKOCTFILE2"
    7877 echo "MKOCTFILE3 = $MKOCTFILE3"
    7878 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"
    7879 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
    7880 
    7881 
    78827877
    78837878# Check whether --with-perl was given.
     
    78857880  withval=$with_perl;
    78867881else
    7887   rp_with_perl=yes
     7882  with_perl=yes
    78887883fi
    78897884
     
    79007895PERL_VERSION_RV=
    79017896PERL_LIBSPEC=
    7902 if test "$rp_with_perl" != "no" ; then
    7903   if test "$rp_with_perl" != "yes" ; then
     7897if test "$with_perl" != "no" ; then
     7898  if test "$with_perl" != "yes" ; then
    79047899    # Extract the first word of "perl", so it can be a program name with args.
    79057900set dummy perl; ac_word=$2
     
    79157910  *)
    79167911  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7917 as_dummy="$rp_with_perl/bin:$rp_with_perl"
     7912as_dummy="$with_perl/bin:$with_perl"
    79187913for as_dir in $as_dummy
    79197914do
     
    80208015  withval=$with_python;
    80218016else
    8022   rp_with_python=yes
    8023 fi
    8024 
    8025 
    8026 if test "$rp_with_python" != "no" ; then
    8027   if test "$rp_with_python" = "yes" ; then
     8017  with_python=yes
     8018fi
     8019
     8020
     8021if test "$with_python" != "no" ; then
     8022  if test "$with_python" = "yes" ; then
    80288023    # Extract the first word of "python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
    80298024set dummy python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
     
    80808075  *)
    80818076  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8082 as_dummy="${rp_with_python}/bin:${rp_with_python}"
     8077as_dummy="${with_python}/bin:${with_python}"
    80838078for as_dir in $as_dummy
    80848079do
     
    81748169
    81758170
     8171
     8172# Check whether --with-java was given.
     8173if test "${with_java+set}" = set; then :
     8174  withval=$with_java;
     8175else
     8176  with_java=yes
     8177fi
     8178
    81768179JAVA=""
    81778180JAVAH=""
     
    81798182JAVA_DEV_PKG="no"
    81808183
    8181 # Check whether --with-java was given.
    8182 if test "${with_java+set}" = set; then :
    8183   withval=$with_java; rp_with_java=$withval
    8184 fi
    8185 
    8186 
    8187 if test "${rp_with_java}" != "no" ; then
    8188   if test "${rp_with_java}" = "yes" ; then
     8184if test "${with_java}" != "no" ; then
     8185  if test "${with_java}" = "yes" ; then
    81898186    # Extract the first word of "java", so it can be a program name with args.
    81908187set dummy java; ac_word=$2
     
    83218318  *)
    83228319  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8323 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8320as_dummy="${with_java}/bin:${with_java}"
    83248321for as_dir in $as_dummy
    83258322do
     
    83628359  *)
    83638360  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8364 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8361as_dummy="${with_java}/bin:${with_java}"
    83658362for as_dir in $as_dummy
    83668363do
     
    84038400  *)
    84048401  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8405 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8402as_dummy="${with_java}/bin:${with_java}"
    84068403for as_dir in $as_dummy
    84078404do
     
    84408437if test "x${JAVA}" != "x" ; then
    84418438  for d in \
     8439   ${with_java} \
    84428440   ${JAVA_HOME} \
    8443    /apps/java/jdk1.6.0_01 \
     8441   /apps/java/jdk1.6* \
    84448442   /usr/lib/jvm/*sun-1.6* \
    84458443   /opt/sun-jdk-1.6* \
     
    89258923  . ${exec_prefix}/lib/tclConfig.sh
    89268924fi
    8927 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
     8925if test -f "${exec_prefix}/lib/tkConfig.sh" ; then
    89288926  . ${exec_prefix}/lib/tkConfig.sh
    89298927fi
  • trunk/configure.in

    r2205 r2298  
    255255  . ${exec_prefix}/lib/tclConfig.sh
    256256fi
    257 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
     257if test -f "${exec_prefix}/lib/tkConfig.sh" ; then
    258258  . ${exec_prefix}/lib/tkConfig.sh
    259259fi
     
    261261# -----------------------------------------------------------------------
    262262#
    263 # Compiler characteristics:
     263# Compiler characteristics:     
    264264#   Check for existence of types of size_t and pid_t
    265265#
  • trunk/lang/Makefile.in

    r2180 r2298  
    2121MEX             = @MEX@
    2222OCTAVE          = @OCTAVE_VERSION@
    23 JAVA_HOME       = @JAVA_HOME@
     23JAVAC           = @JAVAC@
    2424
    2525# Rappture requires it. We always build a Tcl language API.
     
    4141  LANGS += octave
    4242endif
    43 ifneq ($(JAVA_HOME),)
     43ifneq ($(JAVAC),)
    4444  LANGS += java
    4545endif
  • trunk/lang/tcl/pkgIndex.tcl.in

    r1151 r2298  
    1212    set ext [info sharedlibextension]
    1313    load [file join $dir "Rappture${version}${ext}"]
    14     package require BLT
    1514    package provide Rappture $version
    1615} $dir]
Note: See TracChangeset for help on using the changeset viewer.