Changeset 2298
- Timestamp:
- Jul 8, 2011, 3:14:27 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
Makefile.in (modified) (1 diff)
-
cf/rpLangJava.m4 (modified) (2 diffs)
-
cf/rpLangMatlab.m4 (modified) (2 diffs)
-
cf/rpLangOctave.m4 (modified) (5 diffs)
-
cf/rpLangPerl.m4 (modified) (2 diffs)
-
cf/rpLangPython.m4 (modified) (1 diff)
-
configure (modified) (23 diffs)
-
configure.in (modified) (2 diffs)
-
lang/Makefile.in (modified) (2 diffs)
-
lang/tcl/pkgIndex.tcl.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r2081 r2298 32 32 ENABLE_GUI = @ENABLE_GUI@ 33 33 34 TARGETS = src 34 TARGETS = src lang 35 35 36 36 ifneq ($(ENABLE_GUI),) 37 TARGETS += gui l ang lib builder tester examples37 TARGETS += gui lib builder tester examples 38 38 endif 39 39 -
trunk/cf/rpLangJava.m4
r2209 r2298 1 1 AC_DEFUN([RP_LANG_JAVA],[ 2 rp_with_java="yes"3 2 AC_ARG_WITH([java], 4 3 [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]) 7 6 JAVA="" 8 7 JAVAH="" 9 8 JAVAC="" 10 9 JAVA_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])15 10 16 if test "${ rp_with_java}" != "no" ; then17 if test "${ rp_with_java}" = "yes" ; then11 if test "${with_java}" != "no" ; then 12 if test "${with_java}" = "yes" ; then 18 13 AC_PATH_PROG(JAVA, java) 19 14 AC_PATH_PROG(JAVAC, javac) 20 15 AC_PATH_PROG(JAVAH, javah) 21 16 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}]) 25 20 fi 26 21 fi … … 32 27 if test "x${JAVA}" != "x" ; then 33 28 for d in \ 34 ${ rp_with_java} \29 ${with_java} \ 35 30 ${JAVA_HOME} \ 36 31 /apps/java/jdk1.6* \ -
trunk/cf/rpLangMatlab.m4
r2209 r2298 1 1 AC_DEFUN([RP_LANG_MATLAB],[ 2 rp_with_matlab="yes"2 with_matlab="yes" 3 3 AC_ARG_WITH( 4 4 [matlab], 5 5 [AS_HELP_STRING([--with-matlab[=DIR]], 6 6 [location of matlab and mex compiler @<:@default=yes@:>@])], 7 [ rp_with_matlab=$withval],8 [ rp_with_matlab=yes])7 [], 8 [with_matlab=yes]) 9 9 10 10 MCC="" … … 13 13 MEXEXT="" 14 14 MATLAB= 15 if test "$ rp_with_matlab" != "no" ; then16 if test "$ rp_with_matlab" = "yes" ; then15 if test "$with_matlab" != "no" ; then 16 if test "$with_matlab" = "yes" ; then 17 17 AC_PATH_PROG(MATLAB, matlab) 18 18 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}]) 20 20 fi 21 21 fi -
trunk/cf/rpLangOctave.m4
r2209 r2298 22 22 # Standard octave search (use the installed version of octave) 23 23 AC_DEFUN([RP_LANG_OCTAVE],[ 24 rp_with_octave="yes"25 24 AC_ARG_WITH( 26 25 [octave], 27 26 [AS_HELP_STRING([--with-octave[=DIR]], 28 27 [path of default octave compiler `mkoctfile' @<:@default=yes@:>@])], 29 [ rp_with_octave=$withval],30 [ rp_with_octave=yes])28 [], 29 [with_octave=yes]) 31 30 32 31 OCTAVE= … … 36 35 MKOCTFILE3= 37 36 38 if test "$ rp_with_octave" != "no" ; then39 if test "$ rp_with_octave" = "yes" ; then37 if test "$with_octave" != "no" ; then 38 if test "$with_octave" = "yes" ; then 40 39 AC_PATH_PROG(OCTAVE, octave) 41 40 AC_PATH_PROG(MKOCTFILE, mkoctfile) 42 41 else 43 OCTAVE=$ rp_with_octave44 MKOCTFILE=`dirname $ rp_with_octave`/mkoctfile42 OCTAVE=$with_octave 43 MKOCTFILE=`dirname $with_octave`/mkoctfile 45 44 fi 46 45 fi … … 80 79 [AS_HELP_STRING([--with-mkoctfile3[=DIR]], 81 80 [path of octave compiler `mkoctfile' @<:@default=no@:>@])], 82 [ rp_with_mkoctfile3=$withval],83 [ rp_with_mkoctfile3=no])81 [], 82 [with_mkoctfile3=no]) 84 83 85 if test "$ rp_with_mkoctfile3" != "no" ; then86 if test "$ rp_with_mkoctfile3" = "yes" ; then84 if test "$with_mkoctfile3" != "no" ; then 85 if test "$with_mkoctfile3" = "yes" ; then 87 86 AC_PATH_PROG(mkoctfile3, mkoctfile) 88 87 else 89 MKOCTFILE3=$ rp_with_mkoctfile388 MKOCTFILE3=$with_mkoctfile3 90 89 fi 91 90 OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3` … … 99 98 [AS_HELP_STRING([--with-mkoctfile2[=DIR]], 100 99 [path of octave compiler `mkoctfile' @<:@default=no@:>@])], 101 [ rp_with_mkoctfile2=$withval],102 [ rp_with_mkoctfile2=no])100 [], 101 [with_mkoctfile2=no]) 103 102 104 if test "$ rp_with_mkoctfile2" != "no" ; then105 if test "$ rp_with_mkoctfile2" = "yes" ; then103 if test "$with_mkoctfile2" != "no" ; then 104 if test "$with_mkoctfile2" = "yes" ; then 106 105 AC_PATH_PROG(mkoctfile2, mkoctfile) 107 106 else 108 MKOCTFILE2=$ rp_with_mkoctfile2107 MKOCTFILE2=$with_mkoctfile2 109 108 fi 110 109 # Have to use octave to get a version, instead of mkoctfile. … … 113 112 OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1` 114 113 fi 115 116 117 echo "MKOCTFILE2 = $MKOCTFILE2"118 echo "MKOCTFILE3 = $MKOCTFILE3"119 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"120 echo "OCTAVE_VERSION = $OCTAVE_VERSION"121 114 ]) -
trunk/cf/rpLangPerl.m4
r2209 r2298 5 5 [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])], 6 6 [], 7 [ rp_with_perl=yes])7 [with_perl=yes]) 8 8 9 9 PERL= … … 18 18 PERL_VERSION_RV= 19 19 PERL_LIBSPEC= 20 if test "$ rp_with_perl" != "no" ; then21 if test "$ rp_with_perl" != "yes" ; then22 AC_PATH_PROG(PERL, perl, [], [$ rp_with_perl/bin:$rp_with_perl])20 if test "$with_perl" != "no" ; then 21 if test "$with_perl" != "yes" ; then 22 AC_PATH_PROG(PERL, perl, [], [$with_perl/bin:$with_perl]) 23 23 else 24 24 AC_PATH_PROG(PERL, perl) -
trunk/cf/rpLangPython.m4
r2209 r2298 13 13 PYTHON_VERSION="" 14 14 pythondir="" 15 rp_with_python="yes"16 15 AC_ARG_WITH([python], 17 16 [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]) 20 19 21 if test "$ rp_with_python" != "no" ; then22 if test "$ rp_with_python" = "yes" ; then20 if test "$with_python" != "no" ; then 21 if test "$with_python" = "yes" ; then 23 22 AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) 24 23 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}]) 26 25 fi 27 26 AC_MSG_CHECKING([for Python version]) -
trunk/configure
r2207 r2298 7376 7376 7377 7377 7378 with_matlab="yes" 7378 7379 7379 7380 # Check whether --with-matlab was given. 7380 7381 if test "${with_matlab+set}" = set; then : 7381 withval=$with_matlab; rp_with_matlab=$withval7382 else 7383 rp_with_matlab=yes7382 withval=$with_matlab; 7383 else 7384 with_matlab=yes 7384 7385 fi 7385 7386 … … 7390 7391 MEXEXT="" 7391 7392 MATLAB= 7392 if test "$ rp_with_matlab" != "no" ; then7393 if test "$ rp_with_matlab" = "yes" ; then7393 if test "$with_matlab" != "no" ; then 7394 if test "$with_matlab" = "yes" ; then 7394 7395 # Extract the first word of "matlab", so it can be a program name with args. 7395 7396 set dummy matlab; ac_word=$2 … … 7446 7447 *) 7447 7448 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7448 as_dummy="${ rp_with_matlab}/bin:${rp_with_matlab}"7449 as_dummy="${with_matlab}/bin:${with_matlab}" 7449 7450 for as_dir in $as_dummy 7450 7451 do … … 7623 7624 # Check whether --with-octave was given. 7624 7625 if test "${with_octave+set}" = set; then : 7625 withval=$with_octave; rp_with_octave=$withval7626 else 7627 rp_with_octave=yes7626 withval=$with_octave; 7627 else 7628 with_octave=yes 7628 7629 fi 7629 7630 … … 7635 7636 MKOCTFILE3= 7636 7637 7637 if test "$ rp_with_octave" != "no" ; then7638 if test "$ rp_with_octave" = "yes" ; then7638 if test "$with_octave" != "no" ; then 7639 if test "$with_octave" = "yes" ; then 7639 7640 # Extract the first word of "octave", so it can be a program name with args. 7640 7641 set dummy octave; ac_word=$2 … … 7718 7719 7719 7720 else 7720 OCTAVE=$ rp_with_octave7721 MKOCTFILE=`dirname $ rp_with_octave`/mkoctfile7721 OCTAVE=$with_octave 7722 MKOCTFILE=`dirname $with_octave`/mkoctfile 7722 7723 fi 7723 7724 fi … … 7756 7757 # Check whether --with-mkoctfile3 was given. 7757 7758 if test "${with_mkoctfile3+set}" = set; then : 7758 withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval7759 else 7760 rp_with_mkoctfile3=no7761 fi 7762 7763 7764 if test "$ rp_with_mkoctfile3" != "no" ; then7765 if test "$ rp_with_mkoctfile3" = "yes" ; then7759 withval=$with_mkoctfile3; 7760 else 7761 with_mkoctfile3=no 7762 fi 7763 7764 7765 if test "$with_mkoctfile3" != "no" ; then 7766 if test "$with_mkoctfile3" = "yes" ; then 7766 7767 # Extract the first word of "mkoctfile", so it can be a program name with args. 7767 7768 set dummy mkoctfile; ac_word=$2 … … 7805 7806 7806 7807 else 7807 MKOCTFILE3=$ rp_with_mkoctfile37808 MKOCTFILE3=$with_mkoctfile3 7808 7809 fi 7809 7810 OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3` … … 7816 7817 # Check whether --with-mkoctfile2 was given. 7817 7818 if test "${with_mkoctfile2+set}" = set; then : 7818 withval=$with_mkoctfile2; rp_with_mkoctfile2=$withval7819 else 7820 rp_with_mkoctfile2=no7821 fi 7822 7823 7824 if test "$ rp_with_mkoctfile2" != "no" ; then7825 if test "$ rp_with_mkoctfile2" = "yes" ; then7819 withval=$with_mkoctfile2; 7820 else 7821 with_mkoctfile2=no 7822 fi 7823 7824 7825 if test "$with_mkoctfile2" != "no" ; then 7826 if test "$with_mkoctfile2" = "yes" ; then 7826 7827 # Extract the first word of "mkoctfile", so it can be a program name with args. 7827 7828 set dummy mkoctfile; ac_word=$2 … … 7865 7866 7866 7867 else 7867 MKOCTFILE2=$ rp_with_mkoctfile27868 MKOCTFILE2=$with_mkoctfile2 7868 7869 fi 7869 7870 # Have to use octave to get a version, instead of mkoctfile. … … 7874 7875 7875 7876 7876 echo "MKOCTFILE2 = $MKOCTFILE2"7877 echo "MKOCTFILE3 = $MKOCTFILE3"7878 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"7879 echo "OCTAVE_VERSION = $OCTAVE_VERSION"7880 7881 7882 7877 7883 7878 # Check whether --with-perl was given. … … 7885 7880 withval=$with_perl; 7886 7881 else 7887 rp_with_perl=yes7882 with_perl=yes 7888 7883 fi 7889 7884 … … 7900 7895 PERL_VERSION_RV= 7901 7896 PERL_LIBSPEC= 7902 if test "$ rp_with_perl" != "no" ; then7903 if test "$ rp_with_perl" != "yes" ; then7897 if test "$with_perl" != "no" ; then 7898 if test "$with_perl" != "yes" ; then 7904 7899 # Extract the first word of "perl", so it can be a program name with args. 7905 7900 set dummy perl; ac_word=$2 … … 7915 7910 *) 7916 7911 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7917 as_dummy="$ rp_with_perl/bin:$rp_with_perl"7912 as_dummy="$with_perl/bin:$with_perl" 7918 7913 for as_dir in $as_dummy 7919 7914 do … … 8020 8015 withval=$with_python; 8021 8016 else 8022 rp_with_python=yes8023 fi 8024 8025 8026 if test "$ rp_with_python" != "no" ; then8027 if test "$ rp_with_python" = "yes" ; then8017 with_python=yes 8018 fi 8019 8020 8021 if test "$with_python" != "no" ; then 8022 if test "$with_python" = "yes" ; then 8028 8023 # 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. 8029 8024 set dummy python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2 … … 8080 8075 *) 8081 8076 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8082 as_dummy="${ rp_with_python}/bin:${rp_with_python}"8077 as_dummy="${with_python}/bin:${with_python}" 8083 8078 for as_dir in $as_dummy 8084 8079 do … … 8174 8169 8175 8170 8171 8172 # Check whether --with-java was given. 8173 if test "${with_java+set}" = set; then : 8174 withval=$with_java; 8175 else 8176 with_java=yes 8177 fi 8178 8176 8179 JAVA="" 8177 8180 JAVAH="" … … 8179 8182 JAVA_DEV_PKG="no" 8180 8183 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 8184 if test "${with_java}" != "no" ; then 8185 if test "${with_java}" = "yes" ; then 8189 8186 # Extract the first word of "java", so it can be a program name with args. 8190 8187 set dummy java; ac_word=$2 … … 8321 8318 *) 8322 8319 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8323 as_dummy="${ rp_with_java}/bin:${rp_with_java}"8320 as_dummy="${with_java}/bin:${with_java}" 8324 8321 for as_dir in $as_dummy 8325 8322 do … … 8362 8359 *) 8363 8360 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8364 as_dummy="${ rp_with_java}/bin:${rp_with_java}"8361 as_dummy="${with_java}/bin:${with_java}" 8365 8362 for as_dir in $as_dummy 8366 8363 do … … 8403 8400 *) 8404 8401 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8405 as_dummy="${ rp_with_java}/bin:${rp_with_java}"8402 as_dummy="${with_java}/bin:${with_java}" 8406 8403 for as_dir in $as_dummy 8407 8404 do … … 8440 8437 if test "x${JAVA}" != "x" ; then 8441 8438 for d in \ 8439 ${with_java} \ 8442 8440 ${JAVA_HOME} \ 8443 /apps/java/jdk1.6 .0_01\8441 /apps/java/jdk1.6* \ 8444 8442 /usr/lib/jvm/*sun-1.6* \ 8445 8443 /opt/sun-jdk-1.6* \ … … 8925 8923 . ${exec_prefix}/lib/tclConfig.sh 8926 8924 fi 8927 if test -f "${exec_prefix}/lib/t clConfig.sh" ; then8925 if test -f "${exec_prefix}/lib/tkConfig.sh" ; then 8928 8926 . ${exec_prefix}/lib/tkConfig.sh 8929 8927 fi -
trunk/configure.in
r2205 r2298 255 255 . ${exec_prefix}/lib/tclConfig.sh 256 256 fi 257 if test -f "${exec_prefix}/lib/t clConfig.sh" ; then257 if test -f "${exec_prefix}/lib/tkConfig.sh" ; then 258 258 . ${exec_prefix}/lib/tkConfig.sh 259 259 fi … … 261 261 # ----------------------------------------------------------------------- 262 262 # 263 # Compiler characteristics: 263 # Compiler characteristics: 264 264 # Check for existence of types of size_t and pid_t 265 265 # -
trunk/lang/Makefile.in
r2180 r2298 21 21 MEX = @MEX@ 22 22 OCTAVE = @OCTAVE_VERSION@ 23 JAVA _HOME = @JAVA_HOME@23 JAVAC = @JAVAC@ 24 24 25 25 # Rappture requires it. We always build a Tcl language API. … … 41 41 LANGS += octave 42 42 endif 43 ifneq ($(JAVA _HOME),)43 ifneq ($(JAVAC),) 44 44 LANGS += java 45 45 endif -
trunk/lang/tcl/pkgIndex.tcl.in
r1151 r2298 12 12 set ext [info sharedlibextension] 13 13 load [file join $dir "Rappture${version}${ext}"] 14 package require BLT15 14 package provide Rappture $version 16 15 } $dir]
Note: See TracChangeset
for help on using the changeset viewer.
