Merge pull request #6 from kkaempf/master

Ruby: fix initialization

swig/ruby/CMakeLists.txt

@@ -27,7 +27,7 @@ ADD_CUSTOM_COMMAND (
 ADD_LIBRARY( yui_ruby SHARED ${SWIG_OUTPUT} )
 INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${LIBYUI_INCLUDE_DIR} )
 
-SET_TARGET_PROPERTIES( yui_ruby PROPERTIES PREFIX "" OUTPUT_NAME "yui")
+SET_TARGET_PROPERTIES( yui_ruby PROPERTIES PREFIX "" OUTPUT_NAME "_yui")
 
 TARGET_LINK_LIBRARIES( yui_ruby ${LIBYUI_LIBRARY} )
 TARGET_LINK_LIBRARIES( yui_ruby ${RUBY_LIBRARY} )

swig/ruby/extconf.rb

@@ -1,19 +1,19 @@
 #
 # extconf.rb for yui Gem
 #
-require 'rbconfig'
-Config::MAKEFILE_CONFIG['CC'] = 'g++'
+
 require 'mkmf'
 # $CFLAGS = "#{$CFLAGS} -Werror"
 
+Config::CONFIG['CC'] = "g++"
+Config::CONFIG['CPP'] = "g++ -E"
+
 have_library('stdc++')
 
-unless have_library('libyui', 'YUI::ui')
+unless have_library('yui', 'YUI::widgetFactory', 'yui/YUI.h')
   STDERR.puts "Cannot find libyui"
   STDERR.puts "Is libyui-devel installed ?"
 end
 find_header 'YUI.h', '/usr/include/yui'
 
-$CPPFLAGS = "-I/usr/include/yui -I.."
-
 create_makefile('_yui')

swig/yui.i

@@ -16,6 +16,19 @@
 #include <sstream>
 #include <stdexcept>
 
+#if defined(SWIGRUBY)
+
+extern "C" {
+/* Init_ for the %module, defined by Swig */
+SWIGEXPORT void Init_yui(void);
+
+/* Init_ for the .so lib, called by Ruby */
+SWIGEXPORT void Init__yui(void) {
+  Init_yui();
+  }
+}
+#endif
+
 #define YUILogComponent "bindings"
 #include "yui/YUILog.h"