diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2021-04-28 00:04:50 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2021-04-28 00:04:50 +0100 |
commit | 5f8768daed3e19ebe2b26447bd3a42813efc316d (patch) | |
tree | 9c43e9ed35f9de32e7a5b16da8269af6e1c1f7aa | |
parent | 429288fa1c753dcb2d34f363e51c3b924ac173bb (diff) | |
download | swig-5f8768daed3e19ebe2b26447bd3a42813efc316d.tar.gz |
Support testing on AIX for tcl
Contributed by Tony Reix
Closes #1922
-rw-r--r-- | Examples/Makefile.in | 5 | ||||
-rw-r--r-- | configure.ac | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 838350921..34296c56d 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -165,6 +165,7 @@ TCL_SO = @TCL_SO@ TCLLDSHARED = @TCLLDSHARED@ TCLCXXSHARED = @TCLCXXSHARED@ TCL_SCRIPT = $(SRCDIR)$(RUNME).tcl +TCL_LINK = @TCLLINK@ # ----------------------------------------------------------- # Build a new version of the tclsh shell @@ -187,7 +188,7 @@ tclsh_cpp: $(SRCDIR_SRCS) tcl: $(SRCDIR_SRCS) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -o $(ISRCS) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCLLDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCLLDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCL_LINK) # ----------------------------------------------------------- # Build a Tcl7.5 dynamic loadable module for C++ @@ -196,7 +197,7 @@ tcl: $(SRCDIR_SRCS) tcl_cpp: $(SRCDIR_SRCS) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -o $(ICXXSRCS) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) - $(TCLCXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) + $(TCLCXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCL_LINK) # ----------------------------------------------------------------- # Run Tcl example diff --git a/configure.ac b/configure.ac index 180515dfe..23d0a3731 100644 --- a/configure.ac +++ b/configure.ac @@ -503,6 +503,7 @@ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) TCLINCLUDE= TCLLIB= TCLPACKAGE= +TCLLINK= AC_ARG_WITH(tclconfig, AS_HELP_STRING([--without-tcl], [Disable Tcl]) AS_HELP_STRING([--with-tclconfig=path], [Set location of tclConfig.sh]), [with_tclconfig="$withval"], [with_tclconfig=]) @@ -595,7 +596,7 @@ fi AC_MSG_CHECKING(for Tcl library) if test -z "$TCLLIB"; then -dirs="/usr/local/lib /usr/lib /opt/local/lib" +dirs="/usr/local/lib /usr/lib /opt/local/lib /opt/freeware/lib" for i in $dirs ; do if test -r $i/libtcl.a; then AC_MSG_RESULT($i) @@ -613,9 +614,16 @@ fi # Cygwin (Windows) needs the library for dynamic linking case $host in *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; +*-*-aix*) TCLDYNAMICLINKING="$TCLLIB";; *)TCLDYNAMICLINKING="";; esac +# AIX needs -ltcl for linking at test time +case $host in +*-*-aix*) TCLLINK="-ltcl";; +*)TCLLINK="";; +esac + case $host in *-*-darwin*) TCLLDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace' @@ -634,6 +642,7 @@ AC_SUBST(TCLLIB) AC_SUBST(TCLDYNAMICLINKING) AC_SUBST(TCLLDSHARED) AC_SUBST(TCLCXXSHARED) +AC_SUBST(TCLLINK) #---------------------------------------------------------------- # Look for Python |