[Nscldaq-cvscommits] SF.net SVN: nscldaq:[3098] trunk/libtclplus/m4/tcl.m4

[<ro...@us...>]

Revision: 3098
          http://sourceforge.net/p/nscldaq/code/3098
Author:   ron-fox
Date:     2013-05-09 17:54:56 +0000 (Thu, 09 May 2013)
Log Message:
-----------
Add /usr/lib{tclverson} to locations checked for tclConfig.sh

Modified Paths:
--------------
    trunk/libtclplus/m4/tcl.m4

Modified: trunk/libtclplus/m4/tcl.m4
===================================================================
--- trunk/libtclplus/m4/tcl.m4	2013-05-09 17:27:31 UTC (rev 3097)
+++ trunk/libtclplus/m4/tcl.m4	2013-05-09 17:54:56 UTC (rev 3098)
@@ -61,7 +61,25 @@
     # Do we know where to get a tclsh?
     if test "${TCLSH}" != "unknown"; then
       AC_MSG_CHECKING([where Tcl says it lives])
-      TclLibBase=`echo puts \\\$tcl_library | ${TCLSH} | sed -e 's,[^/]*$,,'`
+      #
+      # See if Tcl can tell us where it is:
+      #
+      tclClaims=`echo puts \\\$tcl_library | ${TCLSH} | sed -e 's,[^/]*$,,'`
+      AC_MSG_CHECKING([$tclClaims])
+      if test -f $tclClaims/tclConfig.sh; then
+        TclLibBase=${tclClaims}
+      else
+          #If not try /usr/lib/tcl$version where some (debian e.g.) put it:
+	  
+	  version=`echo puts \\\$tcl_version | ${TCLSH}`
+          libloc=/usr/lib/tcl${version}
+          AC_MSG_CHECKING($libloc)
+          if test -f $libloc/tclConfig.sh; then
+             TclLibBase=$libloc
+          else 
+             AC_MSG_ERROR([Can't find tclConfig.sh you'll need to use --with-tclconfig to tell me where it is])
+          fi
+      fi
       AC_MSG_RESULT($TclLibBase)
     fi
   fi

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