- Timestamp:
- May 9, 2007, 1:48:39 PM (17 years ago)
- Location:
- trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.in
r708 r718 39 39 # define our directories 40 40 # 41 INCLUDES_DIR = $(RP_BASE)/ src41 INCLUDES_DIR = $(RP_BASE)/include 42 42 BIN_DIR = $(RP_BASE)/bin 43 43 LIB_DIR = $(RP_BASE)/src … … 70 70 71 71 all: ${PROGS} 72 install: install_rappture 73 install_rpobjs 74 install_matlab 72 install: install_rappture \ 73 install_rpobjs \ 74 install_matlab \ 75 75 install_octave 76 76 # install_tcl … … 97 97 librappture: $(RP_IO_DEPS) $(RP_UTILS_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS) 98 98 (cd ../src2/core/; make Outcome.o Ptr.o RpBuffer.o) 99 $(INSTALL_DATA) $(CORE_SRC)/*.h $(INCLUDES_DIR) 100 $(INSTALL_DATA) $(CEE_SRC)/*.h $(INCLUDES_DIR) 101 $(INSTALL_DATA) $(FORT_SRC)/*.h $(INCLUDES_DIR) 102 $(INSTALL_DATA) $(CORE2_SRC)/Outcome.h $(INCLUDES_DIR) 103 $(INSTALL_DATA) $(CORE2_SRC)/Ptr.h $(INCLUDES_DIR) 104 $(INSTALL_DATA) $(CORE2_SRC)/RpBuffer.h $(INCLUDES_DIR) 105 $(INSTALL_DATA) $(CORE2_SRC)/rappture2.h $(INCLUDES_DIR) 99 106 @if test "`uname`" == "Darwin"; then \ 100 107 $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(RP2_OBJ_DEP) $(EXTERNAL_RP_LIBS); \ … … 116 123 cp -d $<.a $(libdir); \ 117 124 fi 118 $(INSTALL_DATA) $(CORE_SRC)/*.h $(includedir) 119 $(INSTALL_DATA) $(CEE_SRC)/*.h $(includedir) 120 $(INSTALL_DATA) $(FORT_SRC)/*.h $(includedir) 121 $(INSTALL_DATA) $(CORE2_SRC)/Outcome.h $(includedir) 122 $(INSTALL_DATA) $(CORE2_SRC)/Ptr.h $(includedir) 123 $(INSTALL_DATA) $(CORE2_SRC)/RpBuffer.h $(includedir) 124 $(INSTALL_DATA) $(CORE2_SRC)/rappture2.h $(includedir) 125 $(INSTALL_DATA) $(INCLUDES_DIR)/* $(includedir) 125 126 126 127 #### libRpObjects ######################################################## -
trunk/src/matlab/Makefile.in
r708 r718 24 24 # define our directories 25 25 # 26 INCLUDES_DIR = $(RP_BASE)/src27 26 LIB_DIR = $(RP_BASE)/src 28 MATLAB_SRC = $(RP_BASE)/ matlab27 MATLAB_SRC = $(RP_BASE)/src/matlab 29 28 LIB_RAPPTURE = -L$(LIB_DIR) -lrappture 30 INCL_CORE = -I$(INCLUDES_DIR)/core 31 INCL_CEE = -I$(INCLUDES_DIR)/cee 32 INCL_MATLAB = -I$(INCLUDES_DIR)/matlab 29 INCL_RAPPTURE = -I$(RP_BASE)/include 30 INCL_MATLAB = -I$(RP_BASE)/src/matlab 33 31 34 32 OBJS=rpLib.@MEXEXT@ rpLibXml.@MEXEXT@ rpLibElement.@MEXEXT@ rpLibElementAsObject.@MEXEXT@ rpLibElementAsType.@MEXEXT@ rpLibElementAsComp.@MEXEXT@ rpLibElementAsId.@MEXEXT@ rpLibChildren.@MEXEXT@ rpLibChildrenByType.@MEXEXT@ rpLibGet.@MEXEXT@ rpLibGetString.@MEXEXT@ rpLibGetDouble.@MEXEXT@ rpLibPut.@MEXEXT@ rpLibPutString.@MEXEXT@ rpLibPutDouble.@MEXEXT@ rpLibPutData.@MEXEXT@ rpLibPutFile.@MEXEXT@ rpLibNodeComp.@MEXEXT@ rpLibNodeType.@MEXEXT@ rpLibNodeId.@MEXEXT@ rpLibResult.@MEXEXT@ rpUnitsDefineUnit.@MEXEXT@ rpUnitsGetUnits.@MEXEXT@ rpUnitsGetUnitsName.@MEXEXT@ rpUnitsGetExponent.@MEXEXT@ rpUnitsGetBasis.@MEXEXT@ rpUnitsFind.@MEXEXT@ rpUnitsConvert.@MEXEXT@ rpUnitsConvertStr.@MEXEXT@ rpUnitsConvertObjStr.@MEXEXT@ rpUnitsConvertDbl.@MEXEXT@ rpUnitsConvertObjDbl.@MEXEXT@ rpAddPresets.@MEXEXT@ rpUtilsProgress.@MEXEXT@ … … 46 44 47 45 # matlab bindings 48 MEX_INCLS = $(INCL_MATLAB) $(INCL_ CORE) $(INCL_CEE) $(INCL_RP_DEPS)46 MEX_INCLS = $(INCL_MATLAB) $(INCL_RAPPTURE) $(INCL_RP_DEPS) 49 47 # MEX_OPTS = -g -outdir $(MATLAB_SRC) -L$(LIB_DIR) -lrappture 50 48 MEX_OPTS = -g $(LIB_RAPPTURE) -
trunk/src/matlab/RpMatlabInterface.h
r665 r718 12 12 */ 13 13 14 #ifndef _Rp_MATLAB_HELPER_H 15 #define _Rp_MATLAB_HELPER_H 14 #ifndef _Rp_MATLAB_HELPER_H 15 #define _Rp_MATLAB_HELPER_H 16 16 17 17 #include "rappture.h" 18 18 #include "RpBindingsDict.h" 19 20 // dont delete this, still working on making it happen21 //#include "rappture.h"22 19 23 20 // include the matlab api header -
trunk/src/octave/Makefile.in
r708 r718 24 24 # define our directories 25 25 # 26 INCLUDES_DIR = $(RP_BASE)/src27 26 LIB_DIR = $(RP_BASE)/src 28 OCTAVE_SRC = $(SRC_DIR)/octave29 27 LIB_RAPPTURE = -L$(LIB_DIR) -lrappture 30 INCL_ CORE = -I$(INCLUDES_DIR)/core31 INCL_OCTAVE = -I$( INCLUDES_DIR)/octave28 INCL_RAPPTURE = -I$(RP_BASE)/include 29 INCL_OCTAVE = -I$(RP_BASE)/src/octave 32 30 33 31 OBJS=rpAddPresets.oct rpUtilsProgress.oct rpLib.oct rpLibChildrenByType.oct rpLibChildren.oct rpLibElementAsComp.oct rpLibElementAsId.oct rpLibElementAsObject.oct rpLibElementAsType.oct rpLibElement.oct rpLibGet.oct rpLibGetString.oct rpLibGetDouble.oct rpLibNodeComp.oct rpLibNodeId.oct rpLibNodeType.oct rpLibPut.oct rpLibPutDouble.oct rpLibPutString.oct rpLibPutFile.oct rpLibResult.oct rpLibXml.oct rpUnitsConvert.oct rpUnitsConvertDbl.oct rpUnitsConvertStr.oct rpUnitsConvertObjDbl.oct rpUnitsConvertObjStr.oct rpUnitsDefineUnit.oct rpUnitsFind.oct rpUnitsGetBasis.oct rpUnitsGetExponent.oct rpUnitsGetUnits.oct rpUnitsGetUnitsName.oct … … 43 41 #################################################################### 44 42 45 OCT_INCLS = $(INCL_OCTAVE) $(INCL_ CORE) $(INCL_RP_DEPS)43 OCT_INCLS = $(INCL_OCTAVE) $(INCL_RAPPTURE) $(INCL_RP_DEPS) 46 44 OCTAVE_COMP_ARGS = $(OCT_INCLS) $(LIB_RAPPTURE) 47 45 -
trunk/src/octave/RpOctaveInterface.h
r665 r718 10 10 */ 11 11 12 #ifndef _Rp_OCTAVE_HELPER_H 13 #define _Rp_OCTAVE_HELPER_H 12 #ifndef _Rp_OCTAVE_HELPER_H 13 #define _Rp_OCTAVE_HELPER_H 14 14 15 15 #include "rappture.h" -
trunk/src/tcl/configure
r708 r718 970 970 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 971 971 fi 972 cd "$ac_popdir"972 cd $ac_popdir 973 973 done 974 974 fi … … 2320 2320 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2321 2321 (exit $ac_status); } && 2322 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2322 { ac_try='test -z "$ac_c_werror_flag" 2323 || test ! -s conftest.err' 2323 2324 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2324 2325 (eval $ac_try) 2>&5 … … 2378 2379 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2379 2380 (exit $ac_status); } && 2380 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2381 { ac_try='test -z "$ac_c_werror_flag" 2382 || test ! -s conftest.err' 2381 2383 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2382 2384 (eval $ac_try) 2>&5 … … 2494 2496 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2495 2497 (exit $ac_status); } && 2496 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2498 { ac_try='test -z "$ac_c_werror_flag" 2499 || test ! -s conftest.err' 2497 2500 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2498 2501 (eval $ac_try) 2>&5 … … 2548 2551 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2549 2552 (exit $ac_status); } && 2550 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2553 { ac_try='test -z "$ac_c_werror_flag" 2554 || test ! -s conftest.err' 2551 2555 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2552 2556 (eval $ac_try) 2>&5 … … 2593 2597 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2594 2598 (exit $ac_status); } && 2595 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2599 { ac_try='test -z "$ac_c_werror_flag" 2600 || test ! -s conftest.err' 2596 2601 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2597 2602 (eval $ac_try) 2>&5 … … 2637 2642 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2638 2643 (exit $ac_status); } && 2639 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2644 { ac_try='test -z "$ac_c_werror_flag" 2645 || test ! -s conftest.err' 2640 2646 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2641 2647 (eval $ac_try) 2>&5 … … 2821 2827 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2822 2828 (exit $ac_status); } && 2823 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2829 { ac_try='test -z "$ac_cxx_werror_flag" 2830 || test ! -s conftest.err' 2824 2831 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2825 2832 (eval $ac_try) 2>&5 … … 2879 2886 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2880 2887 (exit $ac_status); } && 2881 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2888 { ac_try='test -z "$ac_cxx_werror_flag" 2889 || test ! -s conftest.err' 2882 2890 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2883 2891 (eval $ac_try) 2>&5 … … 2950 2958 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2951 2959 (exit $ac_status); } && 2952 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2960 { ac_try='test -z "$ac_cxx_werror_flag" 2961 || test ! -s conftest.err' 2953 2962 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2954 2963 (eval $ac_try) 2>&5 … … 2994 3003 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2995 3004 (exit $ac_status); } && 2996 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 3005 { ac_try='test -z "$ac_cxx_werror_flag" 3006 || test ! -s conftest.err' 2997 3007 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2998 3008 (eval $ac_try) 2>&5 … … 3518 3528 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3519 3529 (exit $ac_status); } && 3520 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3530 { ac_try='test -z "$ac_c_werror_flag" 3531 || test ! -s conftest.err' 3521 3532 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3522 3533 (eval $ac_try) 2>&5 … … 3688 3699 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3689 3700 (exit $ac_status); } && 3690 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3701 { ac_try='test -z "$ac_c_werror_flag" 3702 || test ! -s conftest.err' 3691 3703 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3692 3704 (eval $ac_try) 2>&5 … … 3759 3771 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3760 3772 (exit $ac_status); } && 3761 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3773 { ac_try='test -z "$ac_c_werror_flag" 3774 || test ! -s conftest.err' 3762 3775 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3763 3776 (eval $ac_try) 2>&5 … … 3823 3836 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3824 3837 (exit $ac_status); } && 3825 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3838 { ac_try='test -z "$ac_c_werror_flag" 3839 || test ! -s conftest.err' 3826 3840 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3827 3841 (eval $ac_try) 2>&5 … … 3865 3879 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3866 3880 (exit $ac_status); } && 3867 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3881 { ac_try='test -z "$ac_c_werror_flag" 3882 || test ! -s conftest.err' 3868 3883 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3869 3884 (eval $ac_try) 2>&5 … … 3922 3937 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3923 3938 (exit $ac_status); } && 3924 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3939 { ac_try='test -z "$ac_c_werror_flag" 3940 || test ! -s conftest.err' 3925 3941 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3926 3942 (eval $ac_try) 2>&5 … … 4089 4105 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4090 4106 (exit $ac_status); } && 4091 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4107 { ac_try='test -z "$ac_c_werror_flag" 4108 || test ! -s conftest.err' 4092 4109 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4093 4110 (eval $ac_try) 2>&5 … … 4151 4168 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4152 4169 (exit $ac_status); } && 4153 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4170 { ac_try='test -z "$ac_c_werror_flag" 4171 || test ! -s conftest.err' 4154 4172 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4155 4173 (eval $ac_try) 2>&5 … … 4218 4236 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4219 4237 (exit $ac_status); } && 4220 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4238 { ac_try='test -z "$ac_c_werror_flag" 4239 || test ! -s conftest.err' 4221 4240 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4222 4241 (eval $ac_try) 2>&5 … … 4277 4296 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4278 4297 (exit $ac_status); } && 4279 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4298 { ac_try='test -z "$ac_c_werror_flag" 4299 || test ! -s conftest.err' 4280 4300 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4281 4301 (eval $ac_try) 2>&5 … … 4478 4498 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4479 4499 (exit $ac_status); } && 4480 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4500 { ac_try='test -z "$ac_c_werror_flag" 4501 || test ! -s conftest.err' 4481 4502 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4482 4503 (eval $ac_try) 2>&5 … … 4574 4595 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4575 4596 (exit $ac_status); } && 4576 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4597 { ac_try='test -z "$ac_c_werror_flag" 4598 || test ! -s conftest.err' 4577 4599 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4578 4600 (eval $ac_try) 2>&5 … … 4639 4661 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4640 4662 (exit $ac_status); } && 4641 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4663 { ac_try='test -z "$ac_c_werror_flag" 4664 || test ! -s conftest.err' 4642 4665 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4643 4666 (eval $ac_try) 2>&5 … … 4741 4764 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4742 4765 (exit $ac_status); } && 4743 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4766 { ac_try='test -z "$ac_c_werror_flag" 4767 || test ! -s conftest.err' 4744 4768 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4745 4769 (eval $ac_try) 2>&5 … … 4837 4861 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4838 4862 (exit $ac_status); } && 4839 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4863 { ac_try='test -z "$ac_c_werror_flag" 4864 || test ! -s conftest.err' 4840 4865 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4841 4866 (eval $ac_try) 2>&5 … … 4902 4927 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4903 4928 (exit $ac_status); } && 4904 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4929 { ac_try='test -z "$ac_c_werror_flag" 4930 || test ! -s conftest.err' 4905 4931 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4906 4932 (eval $ac_try) 2>&5 … … 4990 5016 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4991 5017 (exit $ac_status); } && 4992 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5018 { ac_try='test -z "$ac_c_werror_flag" 5019 || test ! -s conftest.err' 4993 5020 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4994 5021 (eval $ac_try) 2>&5 … … 5053 5080 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5054 5081 (exit $ac_status); } && 5055 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5082 { ac_try='test -z "$ac_c_werror_flag" 5083 || test ! -s conftest.err' 5056 5084 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5057 5085 (eval $ac_try) 2>&5 … … 5200 5228 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5201 5229 (exit $ac_status); } && 5202 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5230 { ac_try='test -z "$ac_c_werror_flag" 5231 || test ! -s conftest.err' 5203 5232 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5204 5233 (eval $ac_try) 2>&5 … … 5347 5376 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5348 5377 (exit $ac_status); } && 5349 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5378 { ac_try='test -z "$ac_c_werror_flag" 5379 || test ! -s conftest.err' 5350 5380 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5351 5381 (eval $ac_try) 2>&5 … … 5494 5524 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5495 5525 (exit $ac_status); } && 5496 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5526 { ac_try='test -z "$ac_c_werror_flag" 5527 || test ! -s conftest.err' 5497 5528 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5498 5529 (eval $ac_try) 2>&5 … … 5645 5676 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5646 5677 (exit $ac_status); } && 5647 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5678 { ac_try='test -z "$ac_c_werror_flag" 5679 || test ! -s conftest.err' 5648 5680 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5649 5681 (eval $ac_try) 2>&5 … … 5846 5878 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5847 5879 (exit $ac_status); } && 5848 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5880 { ac_try='test -z "$ac_c_werror_flag" 5881 || test ! -s conftest.err' 5849 5882 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5850 5883 (eval $ac_try) 2>&5 … … 6035 6068 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6036 6069 (exit $ac_status); } && 6037 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6070 { ac_try='test -z "$ac_c_werror_flag" 6071 || test ! -s conftest.err' 6038 6072 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6039 6073 (eval $ac_try) 2>&5 … … 6182 6216 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6183 6217 (exit $ac_status); } && 6184 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6218 { ac_try='test -z "$ac_c_werror_flag" 6219 || test ! -s conftest.err' 6185 6220 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6186 6221 (eval $ac_try) 2>&5 … … 6335 6370 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6336 6371 (exit $ac_status); } && 6337 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6372 { ac_try='test -z "$ac_c_werror_flag" 6373 || test ! -s conftest.err' 6338 6374 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6339 6375 (eval $ac_try) 2>&5 … … 6847 6883 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6848 6884 (exit $ac_status); } && 6849 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6885 { ac_try='test -z "$ac_c_werror_flag" 6886 || test ! -s conftest.err' 6850 6887 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6851 6888 (eval $ac_try) 2>&5 … … 6922 6959 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6923 6960 (exit $ac_status); } && 6924 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6961 { ac_try='test -z "$ac_c_werror_flag" 6962 || test ! -s conftest.err' 6925 6963 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6926 6964 (eval $ac_try) 2>&5 … … 6997 7035 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6998 7036 (exit $ac_status); } && 6999 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7037 { ac_try='test -z "$ac_c_werror_flag" 7038 || test ! -s conftest.err' 7000 7039 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7001 7040 (eval $ac_try) 2>&5 … … 7070 7109 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7071 7110 (exit $ac_status); } && 7072 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7111 { ac_try='test -z "$ac_c_werror_flag" 7112 || test ! -s conftest.err' 7073 7113 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7074 7114 (eval $ac_try) 2>&5 … … 7140 7180 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7141 7181 (exit $ac_status); } && 7142 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7182 { ac_try='test -z "$ac_c_werror_flag" 7183 || test ! -s conftest.err' 7143 7184 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7144 7185 (eval $ac_try) 2>&5 … … 7408 7449 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7409 7450 (exit $ac_status); } && 7410 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7451 { ac_try='test -z "$ac_c_werror_flag" 7452 || test ! -s conftest.err' 7411 7453 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7412 7454 (eval $ac_try) 2>&5 … … 7910 7952 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7911 7953 (exit $ac_status); } && 7912 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7954 { ac_try='test -z "$ac_c_werror_flag" 7955 || test ! -s conftest.err' 7913 7956 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7914 7957 (eval $ac_try) 2>&5 … … 8001 8044 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8002 8045 (exit $ac_status); } && 8003 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8046 { ac_try='test -z "$ac_c_werror_flag" 8047 || test ! -s conftest.err' 8004 8048 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8005 8049 (eval $ac_try) 2>&5 … … 8112 8156 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8113 8157 (exit $ac_status); } && 8114 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8158 { ac_try='test -z "$ac_c_werror_flag" 8159 || test ! -s conftest.err' 8115 8160 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8116 8161 (eval $ac_try) 2>&5 … … 8228 8273 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8229 8274 (exit $ac_status); } && 8230 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8275 { ac_try='test -z "$ac_c_werror_flag" 8276 || test ! -s conftest.err' 8231 8277 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8232 8278 (eval $ac_try) 2>&5 … … 8583 8629 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8584 8630 (exit $ac_status); } && 8585 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8631 { ac_try='test -z "$ac_c_werror_flag" 8632 || test ! -s conftest.err' 8586 8633 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8587 8634 (eval $ac_try) 2>&5 … … 8652 8699 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8653 8700 (exit $ac_status); } && 8654 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8701 { ac_try='test -z "$ac_c_werror_flag" 8702 || test ! -s conftest.err' 8655 8703 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8656 8704 (eval $ac_try) 2>&5 … … 8992 9040 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8993 9041 (exit $ac_status); } && 8994 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9042 { ac_try='test -z "$ac_c_werror_flag" 9043 || test ! -s conftest.err' 8995 9044 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8996 9045 (eval $ac_try) 2>&5 … … 9143 9192 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9144 9193 (exit $ac_status); } && 9145 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9194 { ac_try='test -z "$ac_c_werror_flag" 9195 || test ! -s conftest.err' 9146 9196 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9147 9197 (eval $ac_try) 2>&5 … … 9185 9235 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9186 9236 (exit $ac_status); } && 9187 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9237 { ac_try='test -z "$ac_c_werror_flag" 9238 || test ! -s conftest.err' 9188 9239 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9189 9240 (eval $ac_try) 2>&5 … … 9246 9297 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9247 9298 (exit $ac_status); } && 9248 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9299 { ac_try='test -z "$ac_c_werror_flag" 9300 || test ! -s conftest.err' 9249 9301 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9250 9302 (eval $ac_try) 2>&5 … … 9288 9340 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9289 9341 (exit $ac_status); } && 9290 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9342 { ac_try='test -z "$ac_c_werror_flag" 9343 || test ! -s conftest.err' 9291 9344 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9292 9345 (eval $ac_try) 2>&5 … … 9349 9402 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9350 9403 (exit $ac_status); } && 9351 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9404 { ac_try='test -z "$ac_c_werror_flag" 9405 || test ! -s conftest.err' 9352 9406 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9353 9407 (eval $ac_try) 2>&5 … … 9391 9445 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9392 9446 (exit $ac_status); } && 9393 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9447 { ac_try='test -z "$ac_c_werror_flag" 9448 || test ! -s conftest.err' 9394 9449 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9395 9450 (eval $ac_try) 2>&5 … … 9465 9520 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9466 9521 (exit $ac_status); } && 9467 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9522 { ac_try='test -z "$ac_c_werror_flag" 9523 || test ! -s conftest.err' 9468 9524 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9469 9525 (eval $ac_try) 2>&5 … … 9514 9570 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9515 9571 (exit $ac_status); } && 9516 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9572 { ac_try='test -z "$ac_c_werror_flag" 9573 || test ! -s conftest.err' 9517 9574 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9518 9575 (eval $ac_try) 2>&5 … … 9590 9647 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9591 9648 (exit $ac_status); } && 9592 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9649 { ac_try='test -z "$ac_c_werror_flag" 9650 || test ! -s conftest.err' 9593 9651 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9594 9652 (eval $ac_try) 2>&5 … … 9652 9710 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9653 9711 (exit $ac_status); } && 9654 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9712 { ac_try='test -z "$ac_c_werror_flag" 9713 || test ! -s conftest.err' 9655 9714 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9656 9715 (eval $ac_try) 2>&5 … … 9753 9812 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9754 9813 (exit $ac_status); } && 9755 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9814 { ac_try='test -z "$ac_c_werror_flag" 9815 || test ! -s conftest.err' 9756 9816 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9757 9817 (eval $ac_try) 2>&5 … … 9816 9876 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9817 9877 (exit $ac_status); } && 9818 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9878 { ac_try='test -z "$ac_c_werror_flag" 9879 || test ! -s conftest.err' 9819 9880 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9820 9881 (eval $ac_try) 2>&5 … … 10119 10180 #-------------------------------------------------------------------- 10120 10181 RAPPTURE_DIR=$prefix 10121 # 10122 # 10123 # 10124 # 10125 # 10126 # 10127 # 10128 # 10129 # 10130 # 10131 # 10132 # 10133 # 10134 # 10135 # 10136 # 10137 # 10138 # 10139 # 10140 # 10141 # 10142 # 10143 # 10144 # 10145 # 10146 # 10147 # 10148 # 10149 # 10150 # 10151 # 10152 # 10153 # 10154 # 10155 # 10156 # 10157 # 10158 # 10159 # 10160 # 10161 # 10162 # 10163 # 10182 #AC_MSG_CHECKING([for rappture.h]) 10183 #RAPPTURE_DIR="" 10184 #if test "x$rappture_dir" != "x" ; then 10185 # # 10186 # # Verify that a rappture.h file exists in the directory specified 10187 # # by --with-rappture. 10188 # # 10189 # if test -r "$rappture_dir/include/rappture.h" ; then 10190 # RAPPTURE_DIR="$rappture_dir" 10191 # fi 10192 #else 10193 # # 10194 # # Otherwise, search for the rappture.h include file... 10195 # # 1. Search previously named locations. 10196 # # 10197 # for dir in \ 10198 # $prefix \ 10199 # $exec_prefix 10200 # do 10201 # if test -r "$dir/include/rappture.h" ; then 10202 # RAPPTURE_DIR="$dir" 10203 # break 10204 # fi 10205 # done 10206 # # 10207 # # 2. Search source directories. 10208 # # 10209 # if test "x$RAPPTURE_DIR" = "x" ; then 10210 # for dir in \ 10211 # `ls -dr ../rappture 2>/dev/null` \ 10212 # `ls -dr ../../rappture 2>/dev/null` \ 10213 # `ls -dr ../../../rappture 2>/dev/null` \ 10214 # `ls -dr C\:/opt/rappture 2>/dev/null` \ 10215 # `ls -dr /opt/rappture 2>/dev/null` 10216 # do 10217 # if test -r "$dir/include/rappture.h" ; then 10218 # RAPPTURE_DIR="$dir" 10219 # break 10220 # fi 10221 # done 10222 # fi 10223 #fi 10224 #AC_MSG_RESULT([${RAPPTURE_DIR}]) 10164 10225 # 10165 # 10166 # 10167 # 10168 # 10169 # 10226 #if test "x$RAPPTURE_DIR" = "x" ; then 10227 # echo "can't find RAPPTURE include file \"rappture.h\"" 10228 # echo "use --with-rappture=DIR to specify the location of rappture" 10229 # exit 1 10230 #fi 10170 10231 10171 10232 10172 10233 10173 10234 #-------------------------------------------------------------------- 10174 # Look for scew.h on the normal include path. If not found, look 10175 # for it in the --with-scew directory. 10235 # Default Rappture include path. 10176 10236 #-------------------------------------------------------------------- 10237 ALT_DIR="../../" 10177 10238 # AC_MSG_CHECKING([for alternate paths]) 10178 10239 # ALT_DIR="" … … 11100 11161 esac 11101 11162 11163 if test x"$ac_file" != x-; then 11164 { echo "$as_me:$LINENO: creating $ac_file" >&5 11165 echo "$as_me: creating $ac_file" >&6;} 11166 rm -f "$ac_file" 11167 fi 11102 11168 # Let's still pretend it is `configure' which instantiates (i.e., don't 11103 11169 # use $as_me), people would be surprised to read: … … 11138 11204 esac 11139 11205 done` || { (exit 1); exit 1; } 11140 11141 if test x"$ac_file" != x-; then11142 { echo "$as_me:$LINENO: creating $ac_file" >&511143 echo "$as_me: creating $ac_file" >&6;}11144 rm -f "$ac_file"11145 fi11146 11206 _ACEOF 11147 11207 cat >>$CONFIG_STATUS <<_ACEOF -
trunk/src/tcl/configure.in
r708 r718 270 270 #-------------------------------------------------------------------- 271 271 RAPPTURE_DIR=$prefix 272 # 273 # 274 # 275 # 276 # 277 # 278 # 279 # 280 # 281 # 282 # 283 # 284 # 285 # 286 # 287 # 288 # 289 # 290 # 291 # 292 # 293 # 294 # 295 # 296 # 297 # 298 # 299 # 300 # 301 # 302 # 303 # 304 # 305 # `ls -dr /opt/rappture 2>/dev/null`306 # 307 # 308 # 309 # 310 # 311 # 312 # 313 # 314 # 315 # 316 # 317 # 318 # 319 # 320 # 272 #AC_MSG_CHECKING([for rappture.h]) 273 #RAPPTURE_DIR="" 274 #if test "x$rappture_dir" != "x" ; then 275 # # 276 # # Verify that a rappture.h file exists in the directory specified 277 # # by --with-rappture. 278 # # 279 # if test -r "$rappture_dir/include/rappture.h" ; then 280 # RAPPTURE_DIR="$rappture_dir" 281 # fi 282 #else 283 # # 284 # # Otherwise, search for the rappture.h include file... 285 # # 1. Search previously named locations. 286 # # 287 # for dir in \ 288 # $prefix \ 289 # $exec_prefix 290 # do 291 # if test -r "$dir/include/rappture.h" ; then 292 # RAPPTURE_DIR="$dir" 293 # break 294 # fi 295 # done 296 # # 297 # # 2. Search source directories. 298 # # 299 # if test "x$RAPPTURE_DIR" = "x" ; then 300 # for dir in \ 301 # `ls -dr ../rappture 2>/dev/null` \ 302 # `ls -dr ../../rappture 2>/dev/null` \ 303 # `ls -dr ../../../rappture 2>/dev/null` \ 304 # `ls -dr C\:/opt/rappture 2>/dev/null` \ 305 # `ls -dr /opt/rappture 2>/dev/null` 306 # do 307 # if test -r "$dir/include/rappture.h" ; then 308 # RAPPTURE_DIR="$dir" 309 # break 310 # fi 311 # done 312 # fi 313 #fi 314 #AC_MSG_RESULT([${RAPPTURE_DIR}]) 315 # 316 #if test "x$RAPPTURE_DIR" = "x" ; then 317 # echo "can't find RAPPTURE include file \"rappture.h\"" 318 # echo "use --with-rappture=DIR to specify the location of rappture" 319 # exit 1 320 #fi 321 321 322 322 AC_SUBST(RAPPTURE_DIR) 323 323 324 324 #-------------------------------------------------------------------- 325 # Look for scew.h on the normal include path. If not found, look326 # for it in the --with-scew directory.327 #-------------------------------------------------------------------- 325 # Default Rappture include path. 326 #-------------------------------------------------------------------- 327 ALT_DIR="../../" 328 328 # AC_MSG_CHECKING([for alternate paths]) 329 329 # ALT_DIR=""
Note: See TracChangeset
for help on using the changeset viewer.