- Timestamp:
- Mar 20, 2016, 2:57:39 AM (8 years ago)
- Location:
- branches/1.6
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.6
-
branches/1.6/configure
r6158 r6160 630 630 TK_XLIBSW 631 631 TK_VERSION 632 TK_SRC_DIR 632 633 TK_LIB_SPEC 633 634 TK_INC_SPEC 634 635 TCL_VERSION 636 TCL_SRC_DIR 635 637 TCL_SHLIB_SUFFIX 636 638 TCL_SHLIB_LDFLAGS … … 7349 7351 done 7350 7352 7353 TK_VERSION="8.4" 7354 for dir in \ 7355 ${exec_prefix} \ 7356 ${exec_prefix}/lib ; do 7357 tkconfig="${dir}/tkConfig.sh" 7358 if test -f "$tkconfig" ; then 7359 . $tkconfig 7360 break 7361 fi 7362 done 7363 7351 7364 7352 7365 # Check whether --with-ffmpeg was given. … … 10137 10150 10138 10151 MAKE=${make_command} 10152 10153 10139 10154 10140 10155 -
branches/1.6/configure.in
r6158 r6160 151 151 if test -f "$tclconfig" ; then 152 152 . $tclconfig 153 break 154 fi 155 done 156 157 TK_VERSION="8.4" 158 for dir in \ 159 ${exec_prefix} \ 160 ${exec_prefix}/lib ; do 161 tkconfig="${dir}/tkConfig.sh" 162 if test -f "$tkconfig" ; then 163 . $tkconfig 153 164 break 154 165 fi … … 451 462 AC_SUBST(TCL_SHLIB_LDFLAGS) 452 463 AC_SUBST(TCL_SHLIB_SUFFIX) 464 AC_SUBST(TCL_SRC_DIR) 453 465 AC_SUBST(TCL_VERSION) 454 466 AC_SUBST(TK_INC_SPEC) 455 467 AC_SUBST(TK_LIB_SPEC) 468 AC_SUBST(TK_SRC_DIR) 456 469 AC_SUBST(TK_VERSION) 457 470 AC_SUBST(TK_XLIBSW) -
branches/1.6/gui/configure
r6131 r6160 589 589 TK_VERSION 590 590 TK_XLIBSW 591 TK_SRC_DIR 591 592 TK_LIB_SPEC 592 593 TK_INC_SPEC 593 594 TCL_VERSION 594 595 TCL_STLIB_LD 596 TCL_SRC_DIR 595 597 TCL_SHLIB_SUFFIX 596 598 TCL_SHLIB_LDFLAGS … … 3153 3155 3154 3156 3157 3158 3155 3159 ac_config_files="$ac_config_files Makefile pkgIndex.tcl apps/Makefile apps/about apps/encodedata apps/rappture apps/rappture-csh.env apps/rappture.env apps/rappture.use apps/rerun apps/simsim apps/xmldiff scripts/Makefile src/Makefile" 3156 3160 -
branches/1.6/gui/configure.in
r6131 r6160 163 163 AC_SUBST(TCL_SHLIB_LDFLAGS) 164 164 AC_SUBST(TCL_SHLIB_SUFFIX) 165 AC_SUBST(TCL_SRC_DIR) 165 166 AC_SUBST(TCL_STLIB_LD) 166 167 AC_SUBST(TCL_VERSION) 167 168 AC_SUBST(TK_INC_SPEC) 168 169 AC_SUBST(TK_LIB_SPEC) 170 AC_SUBST(TK_SRC_DIR) 169 171 AC_SUBST(TK_XLIBSW) 170 172 AC_SUBST(TK_VERSION) -
branches/1.6/gui/src/Makefile.in
r4515 r6160 26 26 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@ 27 27 CFLAGS = @CFLAGS@ -fPIC 28 TCL_SRC_DIR = @TCL_SRC_DIR@ 28 29 TCL_VERSION = @TCL_VERSION@ 29 TCLTK_SRCS = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix30 30 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 31 TK_SRC_DIR = @TK_SRC_DIR@ 31 32 TK_LIB_SPEC = @TK_LIB_SPEC@ 32 TK_XLIBSW = @TK_XLIBSW@ 33 TK_XLIBSW = @TK_XLIBSW@ 34 TCLTK_INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix 33 35 VTK_VERSION = @VTK_VERSION@ 34 36 VTK_TCL_DIR = @VTK_TCL_DIR@ … … 95 97 96 98 RpListbox.o: RpListbox.c 97 $(CC) $(CC_SWITCHES) $(TCLTK_ SRCS) -c $?99 $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $? 98 100 .cc.o: 99 101 $(CXX) $(CXX_SWITCHES) -c $?
Note: See TracChangeset
for help on using the changeset viewer.