Changeset 2690 for branches/blt4/gui/configure.in

Timestamp:

Nov 17, 2011, 8:40:07 AM (13 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/configure.in (modified) (10 diffs)

branches/blt4/gui/configure.in

@@ -2 +2 @@
 AC_INIT([RapptureGUI],[1.1],[rappture@nanohub.org])
 AC_CONFIG_AUX_DIR(cf)
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -20 +19 @@
 fi
 AC_CANONICAL_TARGET
+AC_SUBST(LIB_SEARCH_DIRS)
 
 AC_PROG_INSTALL
@@ -32 +32 @@
 SC_ENABLE_SHARED
 
-with_tcl=""
-with_tk=""
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(STLIB_LD)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LDFLAGS)
+AC_SUBST(SHLIB_SUFFIX)
+
+gui_with_tcl=""
 
 make_command=""
@@ -46 +53 @@
   AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE])
 fi
+AC_SUBST(MAKE, ${make_command})
 
 AC_ARG_ENABLE(
@@ -57 +65 @@
     ENABLE_GUI="yes"
 fi
+AC_SUBST(ENABLE_GUI)
 
 with_tclsh="yes"
@@ -66 +75 @@
     [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=
-
 # -----------------------------------------------------------------------
 #
@@ -88 +81 @@
 #
 # -----------------------------------------------------------------------
+
 AC_MSG_CHECKING([for tclConfig.sh])
 tcl_config_sh=""
-if test "$with_tcl" != "yes" ; then
+if test "x$gui_with_tcl" != "x" ; then
 
   # Verify that a tclConfig.sh file exists in the directory specified 
   # by --with-tcl. 
 
-  for dir in $with_tcl ; do
+  for dir in \
+   $gui_with_tcl 
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -110 +106 @@
   #  1. Search previously named locations.
 
-  for dir in $prefix $exec_prefix $gui_cv_tcl_lib ; do
+  for dir in \
+   $prefix \
+   $exec_prefix \
+   $gui_cv_tcl_lib 
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -128 +128 @@
 fi
 . ${tcl_config_sh}
-
-
-# -----------------------------------------------------------------------
-#
-#       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
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_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
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_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}
+TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
 case $target in
@@ -193 +146 @@
 
 AC_MSG_RESULT([${TCLSH}])
+AC_SUBST(TCLSH)
 
-AC_SUBST(CFLAGS_DEBUG)
-AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(ENABLE_GUI)
-AC_SUBST(LIB_SEARCH_DIRS)
-AC_SUBST(MAKE, ${make_command})
-AC_SUBST(SHLIB_CFLAGS, ${TCL_SHLIB_CFLAGS})
-AC_SUBST(SHLIB_LD, ${TCL_SHLIB_LD})
-AC_SUBST(SHLIB_LDFLAGS, ${TCL_SHLIB_LDFLAGS})
-AC_SUBST(SHLIB_SUFFIX, ${TCL_SHLIB_SUFFIX})
-AC_SUBST(STLIB_LD, ${TCL_STLIB_LD})
-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/tkConfig.sh" ; then 
+  . ${exec_prefix}/lib/tkConfig.sh      
+fi
 AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TK_INC_SPEC)
-AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)