Ignore:
Timestamp:
Mar 20, 2016 2:55:09 AM (8 years ago)
Author:
ldelgass
Message:

merge r6079 from trunk

Location:
branches/1.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.6

    • Property svn:mergeinfo changed
      /trunkmerged: 6079
  • branches/1.6/configure.in

    r6131 r6158  
    401401AC_SUBST(MKOCTFILE2)
    402402AC_SUBST(MKOCTFILE3)
    403 AC_SUBST(SVN_VERSION)
    404 AC_SUBST(SVN_URL)
    405403AC_SUBST(OCTAVE_VERSION)
    406404AC_SUBST(OCTAVE_VERSION_MAJOR)
     
    442440AC_SUBST(SIZEOF_VOID_P)
    443441AC_SUBST(STLIB_LD)
     442AC_SUBST(SVN_URL)
     443AC_SUBST(SVN_VERSION)
    444444AC_SUBST(TCLSH)
     445AC_SUBST(TCL_CFLAGS_DEBUG)
     446AC_SUBST(TCL_CFLAGS_OPTIMIZE)
    445447AC_SUBST(TCL_INC_SPEC)
    446448AC_SUBST(TCL_LIB_SPEC)
    447 AC_SUBST(TCL_CFLAGS_DEBUG)
    448 AC_SUBST(TCL_CFLAGS_OPTIMIZE)
    449449AC_SUBST(TCL_SHLIB_CFLAGS)
    450450AC_SUBST(TCL_SHLIB_LD)
     
    452452AC_SUBST(TCL_SHLIB_SUFFIX)
    453453AC_SUBST(TCL_VERSION)
    454 AC_SUBST(TCL_VERSION)
    455454AC_SUBST(TK_INC_SPEC)
    456455AC_SUBST(TK_LIB_SPEC)
    457 AC_SUBST(TCL_CFLAGS_DEBUG)
    458 AC_SUBST(TCL_SHLIB_CFLAGS)
    459 AC_SUBST(TCL_SHLIB_SUFFIX)
    460 AC_SUBST(TCL_SHLIB_LD)
    461 AC_SUBST(TCL_SHLIB_LDFLAGS)
     456AC_SUBST(TK_VERSION)
    462457AC_SUBST(TK_XLIBSW)
    463 AC_SUBST(TK_VERSION)
    464458AC_SUBST(VTK_TCL_DIR)
    465459AC_SUBST(VTK_VERSION)
Note: See TracChangeset for help on using the changeset viewer.