Changeset 6137 for trunk


Ignore:
Timestamp:
Mar 17, 2016 11:11:49 PM (8 years ago)
Author:
ldelgass
Message:

Don't hard-code path to Tcl/Tk? sources (merged by hand from r6136)

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r6129 r6137  
    630630TK_XLIBSW
    631631TK_VERSION
     632TK_SRC_DIR
    632633TK_LIB_SPEC
    633634TK_INC_SPEC
    634635TCL_VERSION
     636TCL_SRC_DIR
    635637TCL_SHLIB_SUFFIX
    636638TCL_SHLIB_LDFLAGS
    … …  
    73497351done
    73507352
     7353TK_VERSION="8.4"
     7354for 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
     7362done
     7363
    73517364
    73527365# Check whether --with-ffmpeg was given.
    … …  
    1013710150
    1013810151MAKE=${make_command}
     10152
     10153
    1013910154
    1014010155

  • trunk/configure.in

    r6129 r6137  
    151151  if test -f "$tclconfig" ; then
    152152    . $tclconfig
     153    break
     154  fi
     155done
     156
     157TK_VERSION="8.4"
     158for dir in \
     159 ${exec_prefix} \
     160 ${exec_prefix}/lib ; do
     161  tkconfig="${dir}/tkConfig.sh"
     162  if test -f "$tkconfig" ; then
     163    . $tkconfig
    153164    break
    154165  fi
    … …  
    451462AC_SUBST(TCL_SHLIB_LDFLAGS)
    452463AC_SUBST(TCL_SHLIB_SUFFIX)
     464AC_SUBST(TCL_SRC_DIR)
    453465AC_SUBST(TCL_VERSION)
    454466AC_SUBST(TK_INC_SPEC)
    455467AC_SUBST(TK_LIB_SPEC)
     468AC_SUBST(TK_SRC_DIR)
    456469AC_SUBST(TK_VERSION)
    457470AC_SUBST(TK_XLIBSW)

  • trunk/gui/configure

    r6129 r6137  
    589589TK_VERSION
    590590TK_XLIBSW
     591TK_SRC_DIR
    591592TK_LIB_SPEC
    592593TK_INC_SPEC
    593594TCL_VERSION
    594595TCL_STLIB_LD
     596TCL_SRC_DIR
    595597TCL_SHLIB_SUFFIX
    596598TCL_SHLIB_LDFLAGS
    … …  
    31533155
    31543156
     3157
     3158
    31553159ac_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"
    31563160

  • trunk/gui/configure.in

    r6129 r6137  
    163163AC_SUBST(TCL_SHLIB_LDFLAGS)
    164164AC_SUBST(TCL_SHLIB_SUFFIX)
     165AC_SUBST(TCL_SRC_DIR)
    165166AC_SUBST(TCL_STLIB_LD)
    166167AC_SUBST(TCL_VERSION)
    167168AC_SUBST(TK_INC_SPEC)
    168169AC_SUBST(TK_LIB_SPEC)
     170AC_SUBST(TK_SRC_DIR)
    169171AC_SUBST(TK_XLIBSW)
    170172AC_SUBST(TK_VERSION)

  • trunk/gui/src/Makefile.in

    r4212 r6137  
    2626LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
    2727CFLAGS          = @CFLAGS@ -fPIC
     28TCL_SRC_DIR     = @TCL_SRC_DIR@
    2829TCL_VERSION     = @TCL_VERSION@
    29 TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
    3030TCL_LIB_SPEC    = @TCL_LIB_SPEC@
     31TK_SRC_DIR      = @TK_SRC_DIR@
    3132TK_LIB_SPEC     = @TK_LIB_SPEC@
    32 TK_XLIBSW       = @TK_XLIBSW@
     33TK_XLIBSW       = @TK_XLIBSW@
     34TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
    3335VTK_VERSION     = @VTK_VERSION@
    3436VTK_TCL_DIR     = @VTK_TCL_DIR@
    … …  
    9597
    9698RpListbox.o: RpListbox.c
    97         $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $?
     99        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $?
    98100.cc.o:
    99101        $(CXX) $(CXX_SWITCHES) -c $?
Note: See TracChangeset for help on using the changeset viewer.