diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-09-14 17:32:54 -0700 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-09-14 17:32:54 -0700 |
| commit | f618a6999041614181272cc95afd290f19e30c6c (patch) | |
| tree | 3d0b2bca7023f9a744783ffa9f2e039044eb7984 | |
| parent | cb4a23b2df066b316bc8c427e1849826e4341e95 (diff) | |
| download | swig-f618a6999041614181272cc95afd290f19e30c6c.tar.gz | |
Better detection of Ruby shared library extension
Use Config to detect dll extension (needs to be .so for Ruby 1.9 on Cygwin)
| -rw-r--r-- | Examples/Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index df754427c..5607feb9e 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -913,6 +913,7 @@ RUBY_INCLUDE= @RUBYINCLUDE@ RUBY_LIB = @RUBYLIB@ RUBY_DLNK = @RUBYDYNAMICLINKING@ RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) +RUBY_SO = @RUBYSO@ RUBY = @RUBY@ RUBY_SCRIPT = $(RUNME).rb @@ -924,7 +925,7 @@ RUBY_SCRIPT = $(RUNME).rb ruby: $(SRCS) $(SWIG) -ruby $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) + $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(RUBY_SO) # ----------------------------------------------------------------- # Build a C++ dynamically loadable module @@ -933,7 +934,7 @@ ruby: $(SRCS) ruby_cpp: $(SRCS) $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(RUBY_SO) # ----------------------------------------------------------------- # Build statically linked Ruby interpreter diff --git a/configure.ac b/configure.ac index 5b6441b86..c4db3ce98 100644 --- a/configure.ac +++ b/configure.ac @@ -1399,6 +1399,7 @@ if test -n "$RUBY"; then esac RUBYCCDLFLAGS=`($RUBY -rrbconfig -e 'print Config::CONFIG[["CCDLFLAGS"]]') 2>/dev/null` + RUBYSO=.`($RUBY -rrbconfig -e 'print Config::CONFIG[["DLEXT"]]') 2>/dev/null` else AC_MSG_RESULT(could not figure out how to run ruby) RUBYINCLUDE="-I/usr/local/lib/ruby/1.4/arch" @@ -1416,6 +1417,7 @@ AC_SUBST(RUBYINCLUDE) AC_SUBST(RUBYLIB) AC_SUBST(RUBYLINK) AC_SUBST(RUBYCCDLFLAGS) +AC_SUBST(RUBYSO) AC_SUBST(RUBYDYNAMICLINKING) #------------------------------------------------------------------------- |