File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed
Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -209,7 +209,7 @@ all: @SWIG_WRAP@ binaries libraries
209209wrap : $(SWIGOUTPUT )
210210
211211$(SWIGOUTPUT ) : $(SWIGINTERFACE )
212- $(SWIG ) -tcl -c++ -namespace - pkgversion $(PACKAGE_VERSION ) -module $(PACKAGE_NAME ) -o $(SWIGOUTPUT ) $(SWIGINTERFACE )
212+ $(SWIG ) -tcl -pkgversion $(PACKAGE_VERSION ) -module $(PACKAGE_NAME ) -o $(SWIGOUTPUT ) $(SWIGINTERFACE )
213213
214214# ========================================================================
215215# The binaries target builds executable programs, Windows .dll's, unix
Original file line number Diff line number Diff line change @@ -3027,6 +3027,10 @@ AC_DEFUN([TEA_ADD_SWIGINTERFACE], [
30273027 AC_CHECK_PROG ( SWIG_CHECK ,swig ,yes )
30283028 AS_IF ( [ test x"$SWIG_CHECK" != x"yes"] , [ AC_MSG_ERROR ( [ Swig is requred to compile this.] ) ] )
30293029 SWIG="swig"
3030+
3031+ if test "x$TEA_CXX" != "x"; then
3032+ SWIG="$SWIG -c++"
3033+ fi
30303034
30313035 # check for existence - allows for generic/win/unix VPATH
30323036 # To add more dirs here (like 'src'), you have to update VPATH
@@ -3044,7 +3048,13 @@ AC_DEFUN([TEA_ADD_SWIGINTERFACE], [
30443048 PKG_SOURCES="$PKG_SOURCES $1 "
30453049 # this assumes it is in a VPATH dir
30463050 SWIGBASE=${PACKAGE_NAME}_wrap
3047- SWIGOUTPUT=${srcdir}/generic/${SWIGBASE}.cpp
3051+ SWIGOUTPUT="${srcdir}/generic/${SWIGBASE}"
3052+ if test "x$TEA_CXX" != "x"; then
3053+ SWIGOUTPUT="${SWIGOUTPUT}.cpp"
3054+ else
3055+ SWIGOUTPUT="${SWIGOUTPUT}.c"
3056+ fi
3057+
30483058 # handle user calling this before or after TEA_SETUP_COMPILER
30493059 if test x"${OBJEXT}" != x ; then
30503060 SWIGOBJECT="${SWIGBASE}.${OBJEXT}"
You can’t perform that action at this time.
0 commit comments