Changeset 1975 for trunk/configure


Ignore:
Timestamp:
Dec 3, 2010, 12:49:21 AM (9 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r1957 r1975  
    71937193
    71947194
    7195 with_tclsh="yes"
     7195rp_with_tclsh="yes"
    71967196
    71977197# Check whether --with-tclsh was given.
     
    71997199  withval=$with_tclsh;
    72007200else
    7201   with_tclsh=yes
     7201  rp_with_tclsh=yes
    72027202fi
    72037203
    72047204
    72057205TCLSH=
    7206 if test "$with_tclsh" != "no" ; then
     7206if test "$rp_with_tclsh" != "no" ; then
    72077207    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
    72087208$as_echo_n "checking for tclsh... " >&6; }
    7209     if test -x "$with_tclsh/bin/tclsh"
     7209    if test -x "$rp_with_tclsh/bin/tclsh"
    72107210    then
    7211         echo Found tclsh in $with_tclsh/bin/tclsh
    7212         TCLSH="$with_tclsh/bin/tclsh"
     7211        echo Found tclsh in $rp_with_tclsh/bin/tclsh
     7212        TCLSH="$rp_with_tclsh/bin/tclsh"
    72137213    else
    7214        if test -x "$with_tclsh"
     7214       if test -x "$rp_with_tclsh"
    72157215        then
    7216             echo Found tclsh in $with_tclsh
    7217             TCLSH="$with_tclsh"
     7216            echo Found tclsh in $rp_with_tclsh
     7217            TCLSH="$rp_with_tclsh"
    72187218        else
    72197219            if test -x "${exec_prefix}/bin/tclsh"
     
    72947294TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
    72957295
    7296 if test "x$with_tcllib" != "x" ; then
    7297    tclconfig="${with_tcllib}/tclConfig.sh"
     7296if test "x$rp_with_tcllib" != "x" ; then
     7297   tclconfig="${rp_with_tcllib}/tclConfig.sh"
    72987298   if test -f "$tclconfig" ; then
    72997299    . $tclconfig
    73007300   fi
    7301    TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}"
    7302 fi
    7303 if test "x$with_tclinclude" != "x" ; then
    7304    TCL_INC_SPEC="-I${with_tclinclude}"
     7301   TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
     7302fi
     7303if test "x$rp_with_tclinclude" != "x" ; then
     7304   TCL_INC_SPEC="-I${rp_with_tclinclude}"
    73057305fi
    73067306
     
    73127312# Check whether --with-vtk was given.
    73137313if test "${with_vtk+set}" = set; then :
    7314   withval=$with_vtk; with_vtk=$withval
    7315 else
    7316   with_vtk=yes
     7314  withval=$with_vtk; rp_with_vtk=$withval
     7315else
     7316  rp_with_vtk=yes
    73177317fi
    73187318
     
    73227322VTKDIR=""
    73237323
    7324 if test "$with_vtk" != "no" ; then
    7325   if test "$with_vtk" = "yes" ; then
     7324if test "$rp_with_vtk" != "no" ; then
     7325  if test "$rp_with_vtk" = "yes" ; then
    73267326    for path in \
    73277327     $libdir \
     
    73497349# Check whether --with-matlab was given.
    73507350if test "${with_matlab+set}" = set; then :
    7351   withval=$with_matlab; with_matlab=$withval
    7352 else
    7353   with_matlab=yes
     7351  withval=$with_matlab; rp_with_matlab=$withval
     7352else
     7353  rp_with_matlab=yes
    73547354fi
    73557355
     
    73607360MEXEXT=""
    73617361MATLAB=
    7362 if test "$with_matlab" != "no" ; then
    7363   if test "$with_matlab" = "yes" ; then
     7362if test "$rp_with_matlab" != "no" ; then
     7363  if test "$rp_with_matlab" = "yes" ; then
    73647364    # Extract the first word of "matlab", so it can be a program name with args.
    73657365set dummy matlab; ac_word=$2
     
    74167416  *)
    74177417  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7418 as_dummy="${with_matlab}/bin:${with_matlab}"
     7418as_dummy="${rp_with_matlab}/bin:${rp_with_matlab}"
    74197419for as_dir in $as_dummy
    74207420do
     
    75997599# Check whether --with-octave was given.
    76007600if test "${with_octave+set}" = set; then :
    7601   withval=$with_octave; with_octave=$withval
    7602 else
    7603   with_octave=yes
     7601  withval=$with_octave; rp_with_octave=$withval
     7602else
     7603  rp_with_octave=yes
    76047604fi
    76057605
     
    76137613MKOCTFILE2=
    76147614MKOCTFILE3=
    7615 if test "$with_octave" != "no" ; then
     7615if test "$rp_with_octave" != "no" ; then
    76167616  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
    76177617$as_echo_n "checking for octave and mkoctfile... " >&6; }
    7618   if test "$with_octave" = "yes" ; then
     7618  if test "$rp_with_octave" = "yes" ; then
    76197619    # Extract the first word of "octave", so it can be a program name with args.
    76207620set dummy octave; ac_word=$2
     
    76987698
    76997699  else
    7700     MKOCTFILE=$with_octave
    7701     OCTAVE=$with_octave
     7700    MKOCTFILE=$rp_with_octave
     7701    OCTAVE=$rp_with_octave
    77027702  fi
    77037703fi
     
    77197719# Check whether --with-octave2 was given.
    77207720if test "${with_octave2+set}" = set; then :
    7721   withval=$with_octave2; with_octave2=$withval
    7722 else
    7723   with_octave2=no
    7724 fi
    7725 
    7726 
    7727 if test "$with_octave2" != "no" ; then
    7728   if test "$with_octave2" = "yes" ; then
     7721  withval=$with_octave2; rp_with_octave2=$withval
     7722else
     7723  rp_with_octave2=no
     7724fi
     7725
     7726
     7727if test "$rp_with_octave2" != "no" ; then
     7728  if test "$rp_with_octave2" = "yes" ; then
    77297729    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
    77307730$as_echo_n "checking for octave and mkoctfile... " >&6; }
     
    78107810
    78117811  else
    7812     octave2=$with_octave2
    7813     mkoctfile2=`dirname $with_octave2`/mkoctfile
     7812    octave2=$rp_with_octave2
     7813    mkoctfile2=`dirname $rp_with_octave2`/mkoctfile
    78147814  fi
    78157815fi
     
    78287828# Check whether --with-octave3 was given.
    78297829if test "${with_octave3+set}" = set; then :
    7830   withval=$with_octave3; with_octave3=$withval
    7831 else
    7832   with_octave3=no
    7833 fi
    7834 
    7835 
    7836 echo with_octave3=$with_octave3
    7837 if test "$with_octave3" != "no" ; then
    7838   if test "$with_octave3" = "yes" ; then
     7830  withval=$with_octave3; rp_with_octave3=$withval
     7831else
     7832  rp_with_octave3=no
     7833fi
     7834
     7835
     7836echo rp_with_octave3=$rp_with_octave3
     7837if test "$rp_with_octave3" != "no" ; then
     7838  if test "$rp_with_octave3" = "yes" ; then
    78397839    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
    78407840$as_echo_n "checking for octave and mkoctfile... " >&6; }
     
    79207920
    79217921  else
    7922     octave3=$with_octave3
    7923     mkoctfile3=`dirname $with_octave3`/mkoctfile
     7922    octave3=$rp_with_octave3
     7923    mkoctfile3=`dirname $rp_with_octave3`/mkoctfile
    79247924  fi
    79257925fi
     
    79337933  echo version_major=$version_major
    79347934  if test "$version_major" = "3" ; then
    7935     OCTAVE3=$with_octave3
     7935    OCTAVE3=$rp_with_octave3
    79367936    MKOCTFILE3=$mkoctfile3
    79377937  fi
     
    79527952  withval=$with_perl;
    79537953else
    7954   with_perl=yes
     7954  rp_with_perl=yes
    79557955fi
    79567956
     
    79677967PERL_VERSION_RV=
    79687968PERL_LIBSPEC=
    7969 if test "$with_perl" != "no" ; then
     7969if test "$rp_with_perl" != "no" ; then
    79707970  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl" >&5
    79717971$as_echo_n "checking for perl... " >&6; }
    7972   if test "$with_perl" != "yes" ; then
     7972  if test "$rp_with_perl" != "yes" ; then
    79737973    # Extract the first word of "perl", so it can be a program name with args.
    79747974set dummy perl; ac_word=$2
     
    79847984  *)
    79857985  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7986 as_dummy="$with_perl/bin:$with_perl"
     7986as_dummy="$rp_with_perl/bin:$rp_with_perl"
    79877987for as_dir in $as_dummy
    79887988do
     
    81058105  withval=$with_python;
    81068106else
    8107   with_python=yes
    8108 fi
    8109 
    8110 
    8111 if test "$with_python" != "no" ; then
     8107  rp_with_python=yes
     8108fi
     8109
     8110
     8111if test "$rp_with_python" != "no" ; then
    81128112  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5
    81138113$as_echo_n "checking for python... " >&6; }
    8114   if test -x "$with_python/bin/python"; then
    8115     echo Found python in $with_python/bin/python
    8116     PYTHON="$with_python/bin/python"
    8117   elif test -x "$with_python"; then
    8118     echo Found python in $with_python
    8119     PYTHON="$with_python"
     8114  if test -x "$rp_with_python/bin/python"; then
     8115    echo Found python in $rp_with_python/bin/python
     8116    PYTHON="$rp_with_python/bin/python"
     8117  elif test -x "$rp_with_python"; then
     8118    echo Found python in $rp_with_python
     8119    PYTHON="$rp_with_python"
    81208120  else
    81218121    # 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.
     
    81658165  fi
    81668166  if test "x${PYTHON_VERSION}" != "x"; then
    8167     if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
    8168      -d $with_python/lib/python$PYTHON_VERSION/site-packages; then
    8169       PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
    8170       PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
     8167    if test -r $rp_with_python/include/python$PYTHON_VERSION/Python.h -a \
     8168     -d $rp_with_python/lib/python$PYTHON_VERSION/site-packages; then
     8169      PYTHON_INCLUDES=$rp_with_python/include/python$PYTHON_VERSION
     8170      PYTHON_SITE_PACKAGES=$rp_with_python/lib/python$PYTHON_VERSION/site-packages
    81718171    else
    81728172      if test -r $prefix/include/python$PYTHON_VERSION/Python.h; then
     
    81868186    fi
    81878187  fi
    8188   if test "x$with_python" != "x" ;  then
     8188  if test "x$rp_with_python" != "x" ;  then
    81898189    pythondir='$(PYTHON_SITE_PACKAGES)'
    81908190  else
     
    82428242
    82438243
    8244 rappture_with_ruby="yes"
     8244rp_with_ruby="yes"
    82458245
    82468246RUBY=""
     
    82508250# Check whether --with-ruby was given.
    82518251if test "${with_ruby+set}" = set; then :
    8252   withval=$with_ruby; rappture_with_ruby=$with_val
    8253 fi
    8254 
    8255 if test "${rappture_with_ruby}" != "no" ; then
    8256   if test "${rappture_with_ruby}" = "yes" ; then
     8252  withval=$with_ruby; rp_with_ruby=$withval
     8253fi
     8254
     8255if test "${rp_with_ruby}" != "no" ; then
     8256  if test "${rp_with_ruby}" = "yes" ; then
    82578257    # Extract the first word of "ruby", so it can be a program name with args.
    82588258set dummy ruby; ac_word=$2
     
    83098309  *)
    83108310  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8311 as_dummy="${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}"
     8311as_dummy="${rp_with_ruby}/bin:${rp_with_ruby}"
    83128312for as_dir in $as_dummy
    83138313do
     
    86608660
    86618661
    8662 rappture_with_java="yes"
     8662rp_with_java="yes"
    86638663JAVA=""
    86648664JAVAH=""
     
    86698669# Check whether --with-java was given.
    86708670if test "${with_java+set}" = set; then :
    8671   withval=$with_java; rappture_with_java=$with_val
    8672 fi
    8673 
    8674 if test "${rappture_with_java}" != "no" ; then
    8675   if test "${rappture_with_java}" = "yes" ; then
     8671  withval=$with_java; rp_with_java=$withval
     8672fi
     8673
     8674
     8675if test "${rp_with_java}" != "no" ; then
     8676  if test "${rp_with_java}" = "yes" ; then
    86768677    # Extract the first word of "java", so it can be a program name with args.
    86778678set dummy java; ac_word=$2
     
    88088809  *)
    88098810  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8810 as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
     8811as_dummy="${rp_with_java}/bin:${rp_with_java}"
    88118812for as_dir in $as_dummy
    88128813do
     
    88498850  *)
    88508851  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8851 as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
     8852as_dummy="${rp_with_java}/bin:${rp_with_java}"
    88528853for as_dir in $as_dummy
    88538854do
     
    88908891  *)
    88918892  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8892 as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
     8893as_dummy="${rp_with_java}/bin:${rp_with_java}"
    88938894for as_dir in $as_dummy
    88948895do
Note: See TracChangeset for help on using the changeset viewer.