[Swig-cvs] SF.net SVN: swig:[10683] trunk

[<wsf...@us...>]

Revision: 10683
          http://swig.svn.sourceforge.net/swig/?rev=10683&view=rev
Author:   wsfulton
Date:     2008-07-19 22:45:54 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
Fix building of Tcl examples/test-suite on Mac OSX

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Examples/Makefile.in
    trunk/configure.in

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2008-07-19 18:08:06 UTC (rev 10682)
+++ trunk/CHANGES.current	2008-07-19 22:45:54 UTC (rev 10683)
@@ -1,6 +1,9 @@
 Version 1.3.37 (in progress)
 =============================
 
+2008-07-19: wsfulton
+            Fix building of Tcl examples/test-suite on Mac OSX reported by Gideon Simpson.
+
 2008-07-17: wsfulton
             Fix SF #2019156 Configuring with --without-octave or --without-alllang
             did not disable octave.

Modified: trunk/Examples/Makefile.in
===================================================================
--- trunk/Examples/Makefile.in	2008-07-19 18:08:06 UTC (rev 10682)
+++ trunk/Examples/Makefile.in	2008-07-19 22:45:54 UTC (rev 10683)
@@ -96,6 +96,8 @@
 # Extra Tcl specific dynamic linking options
 TCL_DLNK   = @TCLDYNAMICLINKING@
 TCL_SO     = @TCL_SO@
+TCLLDSHARED = @TCLLDSHARED@
+TCLCXXSHARED = @TCLCXXSHARED@
 
 # -----------------------------------------------------------
 # Build a new version of the tclsh shell
@@ -134,7 +136,7 @@
 tcl:  $(SRCS)
 	$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE)
-	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
+	$(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
 
 # -----------------------------------------------------------
 # Build a Tcl7.5 dynamic loadable module for C++
@@ -143,7 +145,7 @@
 tcl_cpp: $(SRCS)
 	$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
 	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE)
-	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
+	$(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
 
 # -----------------------------------------------------------------
 # Cleaning the Tcl examples

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-07-19 18:08:06 UTC (rev 10682)
+++ trunk/configure.in	2008-07-19 22:45:54 UTC (rev 10683)
@@ -533,14 +533,27 @@
 # Cygwin (Windows) needs the library for dynamic linking
 case $host in
 *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";;
-*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";;
 *)TCLDYNAMICLINKING="";;
 esac
+
+case $host in
+*-*-darwin*) 
+    TCLLDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace'
+    TCLCXXSHARED='$(CXX) -dynamiclib -undefined suppress -flat_namespace'
+    ;;
+*)
+    TCLLDSHARED='$(LDSHARED)'
+    TCLCXXSHARED='$(CXXSHARED)'
+    ;;
+esac
+
 fi
 
 AC_SUBST(TCLINCLUDE)
 AC_SUBST(TCLLIB)
 AC_SUBST(TCLDYNAMICLINKING)
+AC_SUBST(TCLLDSHARED)
+AC_SUBST(TCLCXXSHARED)
 
 #----------------------------------------------------------------
 # Look for Python


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