[brlcad-commits] SF.net SVN: brlcad:[33522] brlcad/trunk/src/libtclcad/tclcadAutoPath.c

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

Revision: 33522
          http://brlcad.svn.sourceforge.net/brlcad/?rev=33522&view=rev
Author:   brlcad
Date:     2009-01-10 19:20:16 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
add some protections so that the user can still manually override ITCL_LIBRARY and ITK_LIBRARY and have the values respected.  we do only respect it, though, if we find an itcl.tcl and itk.tcl file there otherwise the automatic searching still tries to find a match.

Modified Paths:
--------------
    brlcad/trunk/src/libtclcad/tclcadAutoPath.c

Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c	2009-01-10 19:07:34 UTC (rev 33521)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c	2009-01-10 19:20:16 UTC (rev 33522)
@@ -404,6 +404,24 @@
 
     /*    printf("AUTO_PATH IS %s\n", bu_vls_addr(&auto_path)); */
 
+    /* see if user already set ITCL_LIBRARY override */
+    library_path = getenv("ITCL_LIBRARY");
+    if (!found_itcl_tcl && library_path) {
+	snprintf(buffer, MAX_BUF, "%s%citcl.tcl", library_path, BU_DIR_SEPARATOR);
+	if (bu_file_exists(buffer)) {
+	    found_itcl_tcl=1;
+	}
+    }
+
+    /* see if user already set ITK_LIBRARY override */
+    library_path = getenv("ITK_LIBRARY");
+    if (!found_itk_tcl && library_path) {
+	snprintf(buffer, MAX_BUF, "%s%citk.tcl", library_path, BU_DIR_SEPARATOR);
+	if (bu_file_exists(buffer)) {
+	    found_itk_tcl=1;
+	}
+    }
+
     /* iterate over the auto_path list and modify the real Tcl auto_path */
     for (srcpath = strtok(bu_vls_addr(&auto_path), pathsep);
 	 srcpath;


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