Changeset 6127 for branches/1.5/gui/configure

Timestamp:

Mar 15, 2016, 2:56:40 PM (9 years ago)

Author:

ldelgass

Message:

Merge r6052:6053,r6066:6069,r6080 from trunk

Location:

branches/1.5

Files:

• . (modified) (1 prop)
• gui/configure (modified) (5 diffs)

branches/1.5/gui/configure

@@ -587 +587 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-TCL_SHLIB_SUFFIX
-TCL_SHLIB_LDFLAGS
-TCL_SHLIB_CFLAGS
-TCL_SHLIB_LD
-TCL_STLIB_LD
-TCL_CFLAGS_OPTIMIZE
-TCL_CFLAGS_DEBUG
 TK_VERSION
 TK_XLIBSW
@@ -599 +592 @@
 TK_INC_SPEC
 TCL_VERSION
+TCL_STLIB_LD
+TCL_SHLIB_SUFFIX
+TCL_SHLIB_LDFLAGS
+TCL_SHLIB_LD
+TCL_SHLIB_CFLAGS
 TCL_LIB_SPEC
 TCL_INC_SPEC
+TCL_CFLAGS_OPTIMIZE
+TCL_CFLAGS_DEBUG
+SVN_VERSION
+SVN_URL
+INSTALL_PREFIX
 TCLSH
 ENABLE_GUI
@@ -1823 +1826 @@
 fi
 
+INSTALL_PREFIX=$prefix
+
 if test "${libdir}" != "${prefix}/lib"; then
     LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
@@ -3003 +3008 @@
 #SC_ENABLE_SHARED
 
+SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
+SVN_URL=`readlink -e $srcdir | xargs svn info | sed -ne 's/^URL: //p'`
+
 gui_with_tcl=""
 
@@ -3125 +3133 @@
   . ${exec_prefix}/lib/tkConfig.sh
 fi
+
+
+
+