Changeset 2179 for branches/blt4/gui

Timestamp:

Mar 30, 2011 9:49:25 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui

Files:

• configure (modified) (9 diffs)
• configure.in (modified) (6 diffs)
• src/Makefile.in (modified) (2 diffs)

branches/blt4/gui/configure

@@ -605 +605 @@
 LIBOBJS
 TK_VERSION
+TK_INC_SPEC
+TK_LIB_SPEC
 TCL_LIB_SPEC
 TCL_INC_SPEC
@@ -713 +715 @@
 enable_gui
 with_tclsh
+with_tk
 '
       ac_precious_vars='build_alias
@@ -1351 +1354 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-tclsh=DIR        location of tclsh [default=yes]
+  --with-tcl=DIR          path of tclConfig.sh [default=yes]
+  --with-tk=DIR           path of tkConfig.sh [default=yes]
 
 Some influential environment variables:
@@ -5546 +5551 @@
 
 
-gui_with_tcl=""
+with_tcl=""
+with_tk=""
 
 make_command=""
@@ -5586 +5592 @@
 
 
+with_tcl="yes"
+
+# Check whether --with-tk was given.
+if test "${with_tk+set}" = set; then :
+  withval=$with_tk;
+else
+  with_tcl="yes"
+fi
+
+
+with_tk="yes"
+
+# Check whether --with-tk was given.
+if test "${with_tk+set}" = set; then :
+  withval=$with_tk;
+else
+  with_tk=yes
+fi
+
 TCLSH=
+
 # -----------------------------------------------------------------------
 #
@@ -5592 +5618 @@
 #
 # -----------------------------------------------------------------------
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclConfig.sh" >&5
 $as_echo_n "checking for tclConfig.sh... " >&6; }
 tcl_config_sh=""
-if test "x$gui_with_tcl" != "x" ; then
+if test "$with_tcl" != "yes" ; then
 
   # Verify that a tclConfig.sh file exists in the directory specified
@@ -5602 +5627 @@
 
   for dir in \
-   $gui_with_tcl
+        $with_tcl
   do
     if test -r "$dir/tclConfig.sh" ; then
@@ -5641 +5666 @@
 fi
 . ${tcl_config_sh}
-TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
+
+
+# -----------------------------------------------------------------------
+#
+#       Find the Tcl build configuration file "tclConfig.sh"
+#
+# -----------------------------------------------------------------------
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkConfig.sh" >&5
+$as_echo_n "checking for tkConfig.sh... " >&6; }
+tk_config_sh=""
+if test "$with_tk" != "yes" ; then
+
+  # Verify that a tclConfig.sh file exists in the directory specified
+  # by --with-tk.
+
+  for dir in \
+        $with_tk \
+        $with_tcl \
+  do
+    if test -r "$dir/tkConfig.sh" ; then
+      tcl_config_sh="$dir/tkConfig.sh"
+      break
+    elif test -r "$dir/lib/tkConfig.sh" ; then
+      tcl_config_sh="$dir/lib/tkConfig.sh"
+      break
+    fi
+  done
+else
+
+  # Otherwise, search for Tcl configuration file.
+
+  #  1. Search previously named locations.
+
+  for dir in \
+   $prefix \
+   $exec_prefix \
+  do
+    if test -r "$dir/tkConfig.sh" ; then
+      tcl_config_sh="$dir/tkConfig.sh"
+      break
+    elif test -r "$dir/lib/tkConfig.sh" ; then
+      tcl_config_sh="$dir/lib/tkConfig.sh"
+      break
+    fi
+  done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tk_config_sh}" >&5
+$as_echo "${tk_config_sh}" >&6; }
+
+if test "x$tk_config_sh" = "x" ; then
+  echo "can't find Tk configuration script \"tkConfig.sh\""
+  exit 1
+fi
+. ${tk_config_sh}
+
 
 case $target in
@@ -5666 +5746 @@
 
 
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
-  . ${exec_prefix}/lib/tclConfig.sh
-fi
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
-  . ${exec_prefix}/lib/tkConfig.sh
-fi
+
+
 
 

branches/blt4/gui/configure.in

@@ -40 +40 @@
 AC_SUBST(SHLIB_SUFFIX)
 
-gui_with_tcl=""
+with_tcl=""
+with_tk=""
 
 make_command=""
@@ -75 +76 @@
     [with_tclsh=yes])
 
+with_tcl="yes"
+AC_ARG_WITH(
+    [tk],
+    [AS_HELP_STRING([--with-tcl[=DIR]],
+        [path of tclConfig.sh @<:@default=yes@:>@])],
+    [],
+    [with_tcl="yes"])
+
+with_tk="yes"
+AC_ARG_WITH(
+    [tk],
+    [AS_HELP_STRING([--with-tk[=DIR]],
+        [path of tkConfig.sh @<:@default=yes@:>@])],
+    [],
+    [with_tk=yes])
 TCLSH=
+
 # -----------------------------------------------------------------------
 #
@@ -81 +98 @@
 #
 # -----------------------------------------------------------------------
-
 AC_MSG_CHECKING([for tclConfig.sh])
 tcl_config_sh=""
-if test "x$gui_with_tcl" != "x" ; then
+if test "$with_tcl" != "yes" ; then
 
   # Verify that a tclConfig.sh file exists in the directory specified 
@@ -90 +106 @@
 
   for dir in \
-   $gui_with_tcl 
+        $with_tcl 
   do
     if test -r "$dir/tclConfig.sh" ; then
@@ -128 +144 @@
 fi
 . ${tcl_config_sh}
-TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
+
+
+# -----------------------------------------------------------------------
+#
+#       Find the Tcl build configuration file "tclConfig.sh"
+#
+# -----------------------------------------------------------------------
+AC_MSG_CHECKING([for tkConfig.sh])
+tk_config_sh=""
+if test "$with_tk" != "yes" ; then
+
+  # Verify that a tclConfig.sh file exists in the directory specified 
+  # by --with-tk. 
+
+  for dir in \
+        $with_tk \
+        $with_tcl \
+  do
+    if test -r "$dir/tkConfig.sh" ; then
+      tcl_config_sh="$dir/tkConfig.sh"
+      break
+    elif test -r "$dir/lib/tkConfig.sh" ; then
+      tcl_config_sh="$dir/lib/tkConfig.sh"
+      break
+    fi
+  done
+else 
+
+  # Otherwise, search for Tcl configuration file.  
+
+  #  1. Search previously named locations.
+
+  for dir in \
+   $prefix \
+   $exec_prefix \
+  do
+    if test -r "$dir/tkConfig.sh" ; then
+      tcl_config_sh="$dir/tkConfig.sh"
+      break
+    elif test -r "$dir/lib/tkConfig.sh" ; then
+      tcl_config_sh="$dir/lib/tkConfig.sh"
+      break
+    fi
+  done
+fi
+
+AC_MSG_RESULT([${tk_config_sh}])
+
+if test "x$tk_config_sh" = "x" ; then
+  echo "can't find Tk configuration script \"tkConfig.sh\""
+  exit 1
+fi
+. ${tk_config_sh}
+
 
 case $target in
@@ -148 +217 @@
 AC_SUBST(TCLSH)
 
+
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
-
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 
-  . ${exec_prefix}/lib/tclConfig.sh
-fi
-if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 
-  . ${exec_prefix}/lib/tkConfig.sh      
-fi
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_VERSION)

branches/blt4/gui/src/Makefile.in

@@ -28 +28 @@
 TCL_VERSION     = @TCL_VERSION@
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+TK_LIB_SPEC     = @TK_LIB_SPEC@
 
 CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
@@ -46 +47 @@
 LIBS            = \
                 -L../../src/core -lrappture \
-                -L$(libdir) -ltcl8.4 -ltk8.4 -lm
+                -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) -lm
 
 OBJS            = \