Changeset 6137

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:

• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)
• gui/configure (modified) (2 diffs)
• gui/configure.in (modified) (1 diff)
• gui/src/Makefile.in (modified) (2 diffs)

trunk/configure

@@ -630 +630 @@
 TK_XLIBSW
 TK_VERSION
+TK_SRC_DIR
 TK_LIB_SPEC
 TK_INC_SPEC
 TCL_VERSION
+TCL_SRC_DIR
 TCL_SHLIB_SUFFIX
 TCL_SHLIB_LDFLAGS
@@ -7349 +7351 @@
 done
 
+TK_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tkconfig="${dir}/tkConfig.sh"
+  if test -f "$tkconfig" ; then
+    . $tkconfig
+    break
+  fi
+done
+
 
 # Check whether --with-ffmpeg was given.
@@ -10137 +10150 @@
 
 MAKE=${make_command}
+
+
 
 

trunk/configure.in

@@ -151 +151 @@
   if test -f "$tclconfig" ; then
     . $tclconfig
+    break
+  fi
+done
+
+TK_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tkconfig="${dir}/tkConfig.sh"
+  if test -f "$tkconfig" ; then
+    . $tkconfig
     break
   fi
@@ -451 +462 @@
 AC_SUBST(TCL_SHLIB_LDFLAGS)
 AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_SRC_DIR)
 AC_SUBST(TK_VERSION)
 AC_SUBST(TK_XLIBSW)

trunk/gui/configure

@@ -589 +589 @@
 TK_VERSION
 TK_XLIBSW
+TK_SRC_DIR
 TK_LIB_SPEC
 TK_INC_SPEC
 TCL_VERSION
 TCL_STLIB_LD
+TCL_SRC_DIR
 TCL_SHLIB_SUFFIX
 TCL_SHLIB_LDFLAGS
@@ -3153 +3155 @@
 
 
+
+
 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"
 

trunk/gui/configure.in

@@ -163 +163 @@
 AC_SUBST(TCL_SHLIB_LDFLAGS)
 AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_STLIB_LD)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_SRC_DIR)
 AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)

trunk/gui/src/Makefile.in

@@ -26 +26 @@
 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
 CFLAGS          = @CFLAGS@ -fPIC
+TCL_SRC_DIR     = @TCL_SRC_DIR@
 TCL_VERSION     = @TCL_VERSION@
-TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+TK_SRC_DIR      = @TK_SRC_DIR@
 TK_LIB_SPEC     = @TK_LIB_SPEC@
-TK_XLIBSW       = @TK_XLIBSW@
+TK_XLIBSW       = @TK_XLIBSW@
+TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
 VTK_VERSION     = @VTK_VERSION@
 VTK_TCL_DIR     = @VTK_TCL_DIR@
@@ -95 +97 @@
 
 RpListbox.o: RpListbox.c
-        $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $? 
+        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $? 
 .cc.o:
         $(CXX) $(CXX_SWITCHES) -c $?