Detect gem installed narray upon configure

shogun-toolbox · Nov 22, 2011 · 1f4a30c · 1f4a30c
1 parent 5e4eb1a
commit 1f4a30c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Makefile.template b/src/Makefile.template
@@ -303,7 +303,7 @@ install-java_modular: $(TEMPLATE_TARGET)
 
 install-ruby_modular: $(TEMPLATE_TARGET)
 	install -d -m755 "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)"
-	install -m755 modshogun.$(EXT_LIB) "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)"
+	install -m755 modshogun.$(EXT_LIB) "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)/modshogun.$(EXT_LIB_SWIG_RUBY_MODULAR)"
 
 install-lua_modular: $(TEMPLATE_TARGET)
 	install -d -m755 "$(DESTDIR)/$(LUA_EXTENSIONS_INSTALL_DIR)"

diff --git a/src/configure b/src/configure
@@ -29,6 +29,7 @@ EXT_IF_SWIG=.py
 EXT_OBJ_SWIG=_wrap.cxx.o
 EXT_LIB=so
 EXT_LIB_SWIG_PYTHON_MODULAR=
+EXT_LIB_SWIG_RUBY_MODULAR=so
 EXT_DOXY=.doxy
 EXT_SWIG_DOXY=_doxygen.i
 SWIGFLAGS="-w473 -w454 -w312 -w325 -fvirtual"
@@ -707,7 +708,9 @@ EOF
 			fi
 			EXT_IF_SWIG_RUBY_MODULAR='stop'
 			PRE_LIB_SWIG_RUBY_MODULAR=
-			EXT_LIB_SWIG_RUBY_MODULAR=.so
+			if darwin ; then
+				EXT_LIB_SWIG_RUBY_MODULAR=bundle
+			fi
 			SWIGFLAGS_RUBY_MODULAR="-c++ -ruby"
 
 cat >$TMPRUBY << EOF
@@ -774,10 +777,14 @@ int main(void)
 }
 EOF
 
-		if test -f "$RUBY_LIBRARY_DIR"/narray.so ; then
-			LINKFLAGS_NARRAY="$RUBY_LIBRARY_DIR"/narray.so
+		if test -f "$RUBY_LIBRARY_DIR"/narray.${EXT_LIB_SWIG_RUBY_MODULAR} ; then
+			LINKFLAGS_NARRAY="$RUBY_LIBRARY_DIR"/narray.${EXT_LIB_SWIG_RUBY_MODULAR}
+		elif gem list narray 2>&1 | grep -q narray
+		then
+			LINKFLAGS_NARRAY="$(dirname `gem which narray`)/narray.${EXT_LIB_SWIG_RUBY_MODULAR}"
+			INCLUDES_RUBY="-I$(dirname `gem which narray`) $INCLUDES_RUBY"
 		else
-			LINKFLAGS_NARRAY="$RUBY_VENDOR_LIBRARY_DIR"/narray.so
+			LINKFLAGS_NARRAY="$RUBY_VENDOR_LIBRARY_DIR"/narray.${EXT_LIB_SWIG_RUBY_MODULAR}
 		fi
 
 		echocheck "Ruby NArray Developer Files"