Changeset 6157

Timestamp:

Mar 20, 2016, 2:53:27 AM (9 years ago)

Author:

ldelgass

Message:

merge r6079 from trunk

Location:

branches/1.5

Files:

• . (modified) (1 prop)
• configure (modified) (4 diffs)
• configure.in (modified) (3 diffs)

branches/1.5/configure

@@ -628 +628 @@
 VTK_VERSION
 VTK_TCL_DIR
+TK_XLIBSW
 TK_VERSION
-TK_XLIBSW
 TK_LIB_SPEC
 TK_INC_SPEC
@@ -637 +637 @@
 TCL_SHLIB_LD
 TCL_SHLIB_CFLAGS
+TCL_LIB_SPEC
+TCL_INC_SPEC
 TCL_CFLAGS_OPTIMIZE
 TCL_CFLAGS_DEBUG
-TCL_LIB_SPEC
-TCL_INC_SPEC
+SVN_VERSION
+SVN_URL
 SIZEOF_VOID_P
 SIZEOF_LONG_LONG
@@ -672 +674 @@
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
-SVN_URL
-SVN_VERSION
 MKOCTFILE3
 MKOCTFILE2
@@ -10204 +10204 @@
 
 
-
-
-
-
-
-
 ac_configure_args="--disable-threads --enable-shared"
 

branches/1.5/configure.in

@@ -401 +401 @@
 AC_SUBST(MKOCTFILE2)
 AC_SUBST(MKOCTFILE3)
-AC_SUBST(SVN_VERSION)
-AC_SUBST(SVN_URL)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)
@@ -442 +440 @@
 AC_SUBST(SIZEOF_VOID_P)
 AC_SUBST(STLIB_LD)
+AC_SUBST(SVN_URL)
+AC_SUBST(SVN_VERSION)
 AC_SUBST(TCLSH)
+AC_SUBST(TCL_CFLAGS_DEBUG)
+AC_SUBST(TCL_CFLAGS_OPTIMIZE)
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
-AC_SUBST(TCL_CFLAGS_DEBUG)
-AC_SUBST(TCL_CFLAGS_OPTIMIZE)
 AC_SUBST(TCL_SHLIB_CFLAGS)
 AC_SUBST(TCL_SHLIB_LD)
@@ -452 +452 @@
 AC_SUBST(TCL_SHLIB_SUFFIX)
 AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TCL_CFLAGS_DEBUG)
-AC_SUBST(TCL_SHLIB_CFLAGS)
-AC_SUBST(TCL_SHLIB_SUFFIX)
-AC_SUBST(TCL_SHLIB_LD)
-AC_SUBST(TCL_SHLIB_LDFLAGS)
+AC_SUBST(TK_VERSION)
 AC_SUBST(TK_XLIBSW)
-AC_SUBST(TK_VERSION)
 AC_SUBST(VTK_TCL_DIR)
 AC_SUBST(VTK_VERSION)