From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon, 18 Oct 2004 20:23:32 +0000 (+0000)
Subject: Link to the correct Ruby shared object.
X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=commitdiff_plain;h=2962de7235c7fa00db16fcfc707fae0c977b4cbc

Link to the correct Ruby shared object.
---

diff --git a/m4/ac_ruby_ext.m4 b/m4/ac_ruby_ext.m4
index 90a3383..da81116 100644
--- a/m4/ac_ruby_ext.m4
+++ b/m4/ac_ruby_ext.m4
@@ -40,6 +40,11 @@ AC_DEFUN([AC_RUBY_EXT], [
 		AC_MSG_ERROR(Ruby site extension path not found)
 	fi
 
+	AC_MSG_CHECKING(for Ruby shared library)
+	RUBYLIB=`($rubybin -rmkmf -e 'print Config::CONFIG[["LIBRUBYARG_SHARED"]]') 2> /dev/null`
+	AC_MSG_RESULT([$RUBYLIB])
+
+	AC_SUBST(RUBYLIB)
 	AC_SUBST(RUBYLIBDIR)
 	AC_SUBST(RUBYDIR)
 	AC_SUBST(RUBYSITEDIR)
diff --git a/src/ecore/Makefile.am b/src/ecore/Makefile.am
index 78a0790..be693de 100644
--- a/src/ecore/Makefile.am
+++ b/src/ecore/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 109 2004-09-01 20:33:15Z tilman $
+## $Id: Makefile.am 120 2004-10-18 20:23:32Z tilman $
 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR)
@@ -12,5 +12,5 @@ ecore_la_SOURCES = rb_ecore.c rb_ecore.h \
                    rb_event_handler.c rb_event_handler.h \
                    rb_fd_handler.c rb_fd_handler.h
 
-ecore_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)
+ecore_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ECORE_LIBS)
 ecore_la_LDFLAGS = -module -avoid-version
diff --git a/src/ecore_evas/Makefile.am b/src/ecore_evas/Makefile.am
index 83c84b0..9818ce8 100644
--- a/src/ecore_evas/Makefile.am
+++ b/src/ecore_evas/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $
+## $Id: Makefile.am 120 2004-10-18 20:23:32Z tilman $
 
 AM_CFLAGS = $(ECORE_CFLAGS) $(EVAS_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -12,7 +12,7 @@ ecore_evas_la_SOURCES = rb_ecore_evas_main.c rb_ecore_evas_main.h \
                         rb_gl_x11.c rb_gl_x11.h \
                         rb_fb.c rb_fb.h
 
-ecore_evas_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS) $(EVAS_LIBS)
+ecore_evas_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ECORE_LIBS) $(EVAS_LIBS)
 ecore_evas_la_LDFLAGS = -module -avoid-version
 
 pkgincludedir = $(RUBYSITEDIR)/ecore
diff --git a/src/ecore_job/Makefile.am b/src/ecore_job/Makefile.am
index 30a0379..1c31c3c 100644
--- a/src/ecore_job/Makefile.am
+++ b/src/ecore_job/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $
+## $Id: Makefile.am 120 2004-10-18 20:23:32Z tilman $
 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR)
@@ -9,5 +9,5 @@ extdir = $(RUBYSITEDIR)
 ecore_job_la_SOURCES = rb_ecore_job.c rb_ecore_job.h \
                        rb_job.c rb_job.h
 
-ecore_job_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)
+ecore_job_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ECORE_LIBS)
 ecore_job_la_LDFLAGS = -module -avoid-version
diff --git a/src/ecore_x/Makefile.am b/src/ecore_x/Makefile.am
index 064506d..71b5eec 100644
--- a/src/ecore_x/Makefile.am
+++ b/src/ecore_x/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 98 2004-08-26 13:12:55Z tilman $
+## $Id: Makefile.am 120 2004-10-18 20:23:32Z tilman $
 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -10,7 +10,7 @@ ecore_x_la_SOURCES = rb_ecore_x.c rb_ecore_x.h \
                      rb_window.c rb_window.h \
                      rb_cursor.c rb_cursor.h
 
-ecore_x_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)
+ecore_x_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ECORE_LIBS)
 ecore_x_la_LDFLAGS = -module -avoid-version
 
 pkgincludedir = $(RUBYSITEDIR)/ecore