made guessconfig add use bash (not sh) and return a CPU as i386-32 or i386-64 (was just i386)

default python to 2.5

source/nan_compile.mk

@@ -184,7 +184,8 @@ ifeq ($(OS),solaris)
     REL_CFLAGS	+= -O1
     REL_CCFLAGS += -O1
     NAN_DEPEND = true
-  ifeq ($(CPU),sparc)
+  #ifeq ($(CPU),sparc)
+   ifeq ($(CPU),$(findstring $(CPU), "sparc"))
     OPENGL_HEADERS = /usr/openwin/share/include
     CPPFLAGS += -DSUN_OGL_NO_VERTEX_MACROS
     JAVA_HEADERS = /usr/java/include

source/nan_definitions.mk

@@ -142,7 +142,9 @@ endif
 			endif
         else
           ifeq ($(OS), solaris)
-              export NAN_OPENEXR ?= /usr/local
+              # this only exists at the moment for i386-64 CPU Types at the moment
+              export NAN_OPENEXR ?= $(LCGDIR)/openexr
+
               export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a $(NAN_OPENEXR)/lib/libIlmThread.a -lrt
           else
             export NAN_OPENEXR ?= /usr/local
@@ -469,8 +471,8 @@ endif
 
     export ID = $(shell /usr/ucb/whoami)
     export HOST = $(shell hostname)
-    export NAN_PYTHON ?= /usr/local
-    export NAN_PYTHON_VERSION ?= 2.3
+    export NAN_PYTHON ?= $(LCGDIR)/python
+    export NAN_PYTHON_VERSION ?= 2.5
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= $(LCGDIR)/openal 

source/nan_link.mk

@@ -117,9 +117,9 @@ ifeq ($(OS),openbsd)
 endif
 
 ifeq ($(OS),solaris)
-    ifeq ($(CPU), i386)
-        LLIBS = -L/usr/X11/lib
-    endif 
+    ifeq (i386, $(findstring i386, $(CPU)))
+        LLIBS = -L/usr/X11/lib -lrt
+    endif
     LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
     DYNLDFLAGS = -shared $(LDFLAGS)
 endif