Changeset 1751
- Timestamp:
- Jun 8, 2010 1:30:59 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
configure (modified) (10 diffs)
-
configure.in (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r1736 r1751 605 605 SIZEOF_INT 606 606 TK_VERSION 607 TCL_VERSION608 607 SHLIB_LDFLAGS 609 608 RP_BASE … … 654 653 MATLAB 655 654 VTKDIR 655 TCL_LIB_SPEC 656 TCL_INC_SPEC 657 TCL_VERSION 656 658 TCLSH 657 659 ENABLE_GUI … … 688 690 FFLAGS 689 691 F77 690 MKDIR_P691 LN_S692 RANLIB693 692 ac_ct_CXX 694 693 CXXFLAGS … … 702 701 CC 703 702 SET_MAKE 703 MKDIR_P 704 LN_S 705 RANLIB 704 706 INSTALL_DATA 705 707 INSTALL_SCRIPT … … 2792 2794 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' 2793 2795 2796 2797 if test -n "$ac_tool_prefix"; then 2798 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 2799 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 2800 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2801 $as_echo_n "checking for $ac_word... " >&6; } 2802 if test "${ac_cv_prog_RANLIB+set}" = set; then : 2803 $as_echo_n "(cached) " >&6 2804 else 2805 if test -n "$RANLIB"; then 2806 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. 2807 else 2808 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2809 for as_dir in $PATH 2810 do 2811 IFS=$as_save_IFS 2812 test -z "$as_dir" && as_dir=. 2813 for ac_exec_ext in '' $ac_executable_extensions; do 2814 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2815 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 2816 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2817 break 2 2818 fi 2819 done 2820 done 2821 IFS=$as_save_IFS 2822 2823 fi 2824 fi 2825 RANLIB=$ac_cv_prog_RANLIB 2826 if test -n "$RANLIB"; then 2827 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 2828 $as_echo "$RANLIB" >&6; } 2829 else 2830 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2831 $as_echo "no" >&6; } 2832 fi 2833 2834 2835 fi 2836 if test -z "$ac_cv_prog_RANLIB"; then 2837 ac_ct_RANLIB=$RANLIB 2838 # Extract the first word of "ranlib", so it can be a program name with args. 2839 set dummy ranlib; ac_word=$2 2840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2841 $as_echo_n "checking for $ac_word... " >&6; } 2842 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : 2843 $as_echo_n "(cached) " >&6 2844 else 2845 if test -n "$ac_ct_RANLIB"; then 2846 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. 2847 else 2848 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2849 for as_dir in $PATH 2850 do 2851 IFS=$as_save_IFS 2852 test -z "$as_dir" && as_dir=. 2853 for ac_exec_ext in '' $ac_executable_extensions; do 2854 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2855 ac_cv_prog_ac_ct_RANLIB="ranlib" 2856 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 2857 break 2 2858 fi 2859 done 2860 done 2861 IFS=$as_save_IFS 2862 2863 fi 2864 fi 2865 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 2866 if test -n "$ac_ct_RANLIB"; then 2867 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 2868 $as_echo "$ac_ct_RANLIB" >&6; } 2869 else 2870 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2871 $as_echo "no" >&6; } 2872 fi 2873 2874 if test "x$ac_ct_RANLIB" = x; then 2875 RANLIB=":" 2876 else 2877 case $cross_compiling:$ac_tool_warned in 2878 yes:) 2879 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 2880 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} 2881 ac_tool_warned=yes ;; 2882 esac 2883 RANLIB=$ac_ct_RANLIB 2884 fi 2885 else 2886 RANLIB="$ac_cv_prog_RANLIB" 2887 fi 2888 2889 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 2890 $as_echo_n "checking whether ln -s works... " >&6; } 2891 LN_S=$as_ln_s 2892 if test "$LN_S" = "ln -s"; then 2893 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2894 $as_echo "yes" >&6; } 2895 else 2896 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 2897 $as_echo "no, using $LN_S" >&6; } 2898 fi 2899 2900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 2901 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } 2902 if test -z "$MKDIR_P"; then 2903 if test "${ac_cv_path_mkdir+set}" = set; then : 2904 $as_echo_n "(cached) " >&6 2905 else 2906 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2907 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin 2908 do 2909 IFS=$as_save_IFS 2910 test -z "$as_dir" && as_dir=. 2911 for ac_prog in mkdir gmkdir; do 2912 for ac_exec_ext in '' $ac_executable_extensions; do 2913 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue 2914 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 2915 'mkdir (GNU coreutils) '* | \ 2916 'mkdir (coreutils) '* | \ 2917 'mkdir (fileutils) '4.1*) 2918 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext 2919 break 3;; 2920 esac 2921 done 2922 done 2923 done 2924 IFS=$as_save_IFS 2925 2926 fi 2927 2928 test -d ./--version && rmdir ./--version 2929 if test "${ac_cv_path_mkdir+set}" = set; then 2930 MKDIR_P="$ac_cv_path_mkdir -p" 2931 else 2932 # As a last resort, use the slow shell script. Don't cache a 2933 # value for MKDIR_P within a source directory, because that will 2934 # break other packages using the cache if that directory is 2935 # removed, or if the value is a relative name. 2936 MKDIR_P="$ac_install_sh -d" 2937 fi 2938 fi 2939 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 2940 $as_echo "$MKDIR_P" >&6; } 2941 2794 2942 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 2795 2943 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } … … 3874 4022 3875 4023 # Avoid g95 3876 3877 if test -n "$ac_tool_prefix"; then3878 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.3879 set dummy ${ac_tool_prefix}ranlib; ac_word=$23880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53881 $as_echo_n "checking for $ac_word... " >&6; }3882 if test "${ac_cv_prog_RANLIB+set}" = set; then :3883 $as_echo_n "(cached) " >&63884 else3885 if test -n "$RANLIB"; then3886 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.3887 else3888 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3889 for as_dir in $PATH3890 do3891 IFS=$as_save_IFS3892 test -z "$as_dir" && as_dir=.3893 for ac_exec_ext in '' $ac_executable_extensions; do3894 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3895 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"3896 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&53897 break 23898 fi3899 done3900 done3901 IFS=$as_save_IFS3902 3903 fi3904 fi3905 RANLIB=$ac_cv_prog_RANLIB3906 if test -n "$RANLIB"; then3907 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&53908 $as_echo "$RANLIB" >&6; }3909 else3910 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&53911 $as_echo "no" >&6; }3912 fi3913 3914 3915 fi3916 if test -z "$ac_cv_prog_RANLIB"; then3917 ac_ct_RANLIB=$RANLIB3918 # Extract the first word of "ranlib", so it can be a program name with args.3919 set dummy ranlib; ac_word=$23920 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&53921 $as_echo_n "checking for $ac_word... " >&6; }3922 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :3923 $as_echo_n "(cached) " >&63924 else3925 if test -n "$ac_ct_RANLIB"; then3926 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.3927 else3928 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3929 for as_dir in $PATH3930 do3931 IFS=$as_save_IFS3932 test -z "$as_dir" && as_dir=.3933 for ac_exec_ext in '' $ac_executable_extensions; do3934 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3935 ac_cv_prog_ac_ct_RANLIB="ranlib"3936 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&53937 break 23938 fi3939 done3940 done3941 IFS=$as_save_IFS3942 3943 fi3944 fi3945 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB3946 if test -n "$ac_ct_RANLIB"; then3947 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&53948 $as_echo "$ac_ct_RANLIB" >&6; }3949 else3950 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&53951 $as_echo "no" >&6; }3952 fi3953 3954 if test "x$ac_ct_RANLIB" = x; then3955 RANLIB=":"3956 else3957 case $cross_compiling:$ac_tool_warned in3958 yes:)3959 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&53960 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}3961 ac_tool_warned=yes ;;3962 esac3963 RANLIB=$ac_ct_RANLIB3964 fi3965 else3966 RANLIB="$ac_cv_prog_RANLIB"3967 fi3968 3969 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&53970 $as_echo_n "checking whether ln -s works... " >&6; }3971 LN_S=$as_ln_s3972 if test "$LN_S" = "ln -s"; then3973 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&53974 $as_echo "yes" >&6; }3975 else3976 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&53977 $as_echo "no, using $LN_S" >&6; }3978 fi3979 3980 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&53981 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }3982 if test -z "$MKDIR_P"; then3983 if test "${ac_cv_path_mkdir+set}" = set; then :3984 $as_echo_n "(cached) " >&63985 else3986 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3987 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin3988 do3989 IFS=$as_save_IFS3990 test -z "$as_dir" && as_dir=.3991 for ac_prog in mkdir gmkdir; do3992 for ac_exec_ext in '' $ac_executable_extensions; do3993 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue3994 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(3995 'mkdir (GNU coreutils) '* | \3996 'mkdir (coreutils) '* | \3997 'mkdir (fileutils) '4.1*)3998 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext3999 break 3;;4000 esac4001 done4002 done4003 done4004 IFS=$as_save_IFS4005 4006 fi4007 4008 test -d ./--version && rmdir ./--version4009 if test "${ac_cv_path_mkdir+set}" = set; then4010 MKDIR_P="$ac_cv_path_mkdir -p"4011 else4012 # As a last resort, use the slow shell script. Don't cache a4013 # value for MKDIR_P within a source directory, because that will4014 # break other packages using the cache if that directory is4015 # removed, or if the value is a relative name.4016 MKDIR_P="$ac_install_sh -d"4017 fi4018 fi4019 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&54020 $as_echo "$MKDIR_P" >&6; }4021 4022 4023 4024 ac_ext=f 4024 4025 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' … … 7238 7239 7239 7240 7241 TCL_VERSION="8.4" 7242 for dir in \ 7243 ${exec_prefix} \ 7244 ${exec_prefix}/lib ; do 7245 tclconfig="${dir}/tclConfig.sh" 7246 if test -f "$tclconfig" ; then 7247 . $tclconfig 7248 break 7249 fi 7250 done 7251 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 7252 7253 if test "x$with_tcllib" != "x" ; then 7254 tclconfig="${with_tcllib}/tclConfig.sh" 7255 if test -f "$tclconfig" ; then 7256 . $tclconfig 7257 fi 7258 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}" 7259 fi 7260 if test "x$with_tclinclude" != "x" ; then 7261 TCL_INC_SPEC="-I${with_tclinclude}" 7262 fi 7263 7264 7265 7266 7240 7267 7241 7268 … … 7261 7288 do 7262 7289 for vtk in $path/vtk-* ; do 7263 7264 7265 7290 if test -d "${vtk}" ; then 7291 VTKDIR=${vtk} 7292 fi 7266 7293 done 7267 7294 if test "x${VTKDIR}" != "x" ; then 7268 7295 break 7269 7296 fi 7270 7297 done … … 7283 7310 with_matlab=yes 7284 7311 fi 7285 7286 7312 7287 7313 … … 8699 8725 for d in \ 8700 8726 /apps/java/jdk1.6.0_01 \ 8727 /usr/lib/jvm/*sun-1.6* \ 8728 /opt/sun-jdk-1.6* \ 8701 8729 /opt/icedtea6-* \ 8702 /opt/sun-jdk-1. 6* \8703 / opt/sun-jdk-1.5*8730 /opt/sun-jdk-1.5* \ 8731 /usr/lib/jvm/*sun-1.5* 8704 8732 do 8705 8733 if test -r "${d}/include/jni.h" ; then -
trunk/configure.in
r1735 r1751 24 24 25 25 AC_PROG_INSTALL 26 AC_PROG_INSTALL 27 AC_PROG_RANLIB 28 AC_PROG_LN_S 29 AC_PROG_MKDIR_P 26 30 AC_PROG_MAKE_SET 27 31 … … 30 34 AC_PROG_CXX 31 35 # Avoid g95 32 AC_PROG_INSTALL33 AC_PROG_RANLIB34 AC_PROG_LN_S35 AC_PROG_MKDIR_P36 37 36 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32]) 38 37 … … 143 142 AC_SUBST(TCLSH) 144 143 144 TCL_VERSION="8.4" 145 for dir in \ 146 ${exec_prefix} \ 147 ${exec_prefix}/lib ; do 148 tclconfig="${dir}/tclConfig.sh" 149 if test -f "$tclconfig" ; then 150 . $tclconfig 151 break 152 fi 153 done 154 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 155 156 if test "x$with_tcllib" != "x" ; then 157 tclconfig="${with_tcllib}/tclConfig.sh" 158 if test -f "$tclconfig" ; then 159 . $tclconfig 160 fi 161 TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}" 162 fi 163 if test "x$with_tclinclude" != "x" ; then 164 TCL_INC_SPEC="-I${with_tclinclude}" 165 fi 166 167 AC_SUBST(TCL_VERSION) 168 AC_SUBST(TCL_INC_SPEC) 169 AC_SUBST(TCL_LIB_SPEC) 145 170 146 171 AC_ARG_WITH( … … 161 186 /usr/lib 162 187 do 163 for vtk in $path/vtk-* ; do 164 165 166 188 for vtk in $path/vtk-* ; do 189 if test -d "${vtk}" ; then 190 VTKDIR=${vtk} 191 fi 167 192 done 168 193 if test "x${VTKDIR}" != "x" ; then 169 194 break 170 195 fi 171 196 done … … 182 207 [with_matlab=$withval], 183 208 [with_matlab=yes]) 184 185 209 186 210 MCC="" … … 484 508 for d in \ 485 509 /apps/java/jdk1.6.0_01 \ 510 /usr/lib/jvm/*sun-1.6* \ 511 /opt/sun-jdk-1.6* \ 486 512 /opt/icedtea6-* \ 487 /opt/sun-jdk-1. 6* \488 / opt/sun-jdk-1.5*513 /opt/sun-jdk-1.5* \ 514 /usr/lib/jvm/*sun-1.5* 489 515 do 490 516 if test -r "${d}/include/jni.h" ; then
Note: See TracChangeset
for help on using the changeset viewer.
