[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl:[2070] trunk/SpecTcl

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

Revision: 2070
          http://sourceforge.net/p/nsclspectcl/code/2070
Author:   ron-fox
Date:     2013-03-26 16:59:21 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
*  Issue #1697 - Search for Motif in arch specific libs too.
*  Fix redefinition of i in Spectrum formatting.

Modified Paths:
--------------
    trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp
    trunk/SpecTcl/configure.ac

Modified: trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp
===================================================================
--- trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp	2013-02-16 16:22:34 UTC (rev 2069)
+++ trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp	2013-03-26 16:59:21 UTC (rev 2070)
@@ -411,10 +411,10 @@
     Delimeter = '(';
     for (UInt_t i = 0; i < Parameters.size(); i++) {
       FindById p(Parameters[i]);
-      ParameterDictionaryIterator i = rDict.FindMatch(p);
+      ParameterDictionaryIterator pD = rDict.FindMatch(p);
       string name;
-      if (i != rDict.end()) {
-	name =  i->second.getName();
+      if (pD != rDict.end()) {
+	name =  pD->second.getName();
       }
       else {
 	name = "*UNKNOWN*";
@@ -427,10 +427,10 @@
     for (UInt_t i = 0; i < spectrumDef.vyParameters.size(); i++) {
       UInt_t   pnum = spectrumDef.vyParameters[i];
       FindById p(pnum);
-      ParameterDictionaryIterator i = rDict.FindMatch(p);
+      ParameterDictionaryIterator pD = rDict.FindMatch(p);
       string name;
-      if (i != rDict.end()) {
-	name =  i->second.getName();
+      if (pD != rDict.end()) {
+	name =  pD->second.getName();
       }
       else {
 	name = "*UNKNOWN*";
@@ -445,9 +445,9 @@
     for(UInt_t i = 0; i < Parameters.size(); i++) {
       UInt_t pnum = Parameters[i];
       FindById p(pnum);
-      ParameterDictionaryIterator i = rDict.FindMatch(p);
-      if(i != rDict.end()) {
-	rStream << Delimeter << Quote << (*i).second.getName() << Quote;
+      ParameterDictionaryIterator pD = rDict.FindMatch(p);
+      if(pD != rDict.end()) {
+	rStream << Delimeter << Quote << (*pD).second.getName() << Quote;
       }
       else {
 	rStream << Delimeter << (pnum == UINT_MAX ? Quote+Quote : "*UNKNOWN*");

Modified: trunk/SpecTcl/configure.ac
===================================================================
--- trunk/SpecTcl/configure.ac	2013-02-16 16:22:34 UTC (rev 2069)
+++ trunk/SpecTcl/configure.ac	2013-03-26 16:59:21 UTC (rev 2070)
@@ -175,6 +175,7 @@
 #  If in /usr/include we don't need anything:
 
 
+
 if test $motif_h_found = no
 then
    motif_header_dirs="/usr/include/X11 /usr/include/X11R6 /usr/X11/include /usr/X11R6/include /usr/include /sw/include /usr/local/include"
@@ -216,13 +217,35 @@
 #   /usr/lib                 (e.g. OSF1).
 #   /sw/lib                  (Darwin lesstif installation).
 #   /usr/local/lesstif/lib   (normal lesstif install wo links?).
+#      Architecture specific place in linux.
 #
 #  In this case assume we need an -rpath unless the extension is .dylib in which case 
 #  it's OS-X which doesn't require that sort of frippery.
-#   
+#
+libsysdir=""
+if test "$host_os" == "linux-gnu"
+then
+   kernel_full_version="$(uname -r)"
+   kernel_version="$(echo $kernel_full_version | cut -f1,2 -d.)"
+   AC_MSG_RESULT([Building on $host_os kernel $kernel_version])  
 
+   arch="$(uname -m)"
+   case $arch in
+       i[[3456]]86)
+           libsysdir="/usr/lib/i386-linux-gnu"
+           ;;
+       x86_64)
+           libsysdir="/usr/lib/x86_64-linux-gnu"
+           ;;
+       *)
+
+           ;;
+   esac
+fi
+   
+
 libexts=".so .dylib .a"        # prefer shared libs to static.
-motiflibdirs="/usr/X11/lib /usr/X11R6/lib  /sw/lib /usr/local/lesstif/lib /usr/lib"
+motiflibdirs="/usr/X11/lib /usr/X11R6/lib  /sw/lib /usr/local/lesstif/lib /usr/lib $libsysdir"
 motif_libdir=""
 motif_lib_found="no"
 Motif_Rpath=""

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