[brlcad-commits] SF.net SVN: brlcad: [29957] brlcad/trunk/configure.ac

[<br...@us...>]

Revision: 29957
          http://brlcad.svn.sourceforge.net/brlcad/?rev=29957&view=rev
Author:   brlcad
Date:     2008-01-16 06:36:05 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
only look for the tclConfig.sh and tkConfig.sh files if we're not building tcl or tk and need to load the config, otherwise having TCL_BIN_DIR set isn't too useful (the --with/--without flags are still available).  this should fix the configure exit being encountered on some systems when a system tcl/tk isn't already installed (i.e., the WARNING: Can't find Tcl configuration definitions 'error')

Modified Paths:
--------------
    brlcad/trunk/configure.ac

Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac	2008-01-16 14:29:39 UTC (rev 29956)
+++ brlcad/trunk/configure.ac	2008-01-16 14:36:05 UTC (rev 29957)
@@ -649,15 +649,7 @@
 dnl automatically scan /usr/local (e.g. BSD uses /usr/local for ports)
 BC_SEARCH_DIRECTORY([/usr/local])
 
-dnl find tclConfig.sh, add --with-tcl option, don't cache result for AC_CONFIG_SUBDIRS
-SC_PATH_TCLCONFIG
-unset ac_cv_c_tclconfig
 
-dnl find tkConfig.sh, add --with-tk option, don't cache result for AC_CONFIG_SUBDIRS
-SC_PATH_TKCONFIG
-unset ac_cv_c_tkconfig
-
-
 ###
 # argument sanity checks and meta-argument settings
 # here go checks to warn or abort when conflicting options specified
@@ -2602,6 +2594,11 @@
 else
     AC_MSG_RESULT(no)
 
+    dnl find tclConfig.sh, add --with-tcl option, don't cache result for AC_CONFIG_SUBDIRS
+    SC_PATH_TCLCONFIG
+    # keep TCL_BIN_DIR, don't keep ac_cv_c_tclconfig
+    unset ac_cv_c_tclconfig
+
     dnl If we're using the system Tcl, then we need to load
     dnl tclConfig.sh to get the TCL_VERSION and other vars.
     SC_LOAD_TCLCONFIG
@@ -2712,6 +2709,11 @@
 else
     AC_MSG_RESULT(no)
 
+    dnl find tkConfig.sh, add --with-tk option, don't cache result for AC_CONFIG_SUBDIRS
+    SC_PATH_TKCONFIG
+    # keep TK_BIN_DIR, don't keep ac_cv_c_tkconfig
+    unset ac_cv_c_tkconfig
+
     dnl If we're using the system Tk, then we need to load
     dnl tkConfig.sh to get the TK_VERSION and other vars.
     SC_LOAD_TKCONFIG


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.