From d702dd92a5fae3239cf73d0b4a7544dfa14df55f Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 18 Oct 2004 20:24:05 +0000 Subject: [PATCH] Link to the correct Ruby shared object. --- m4/ac_ruby_ext.m4 | 5 +++++ src/Makefile.am | 4 ++-- src/esmart_container/Makefile.am | 4 ++-- src/esmart_draggies/Makefile.am | 4 ++-- src/esmart_trans_x11/Makefile.am | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) 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/Makefile.am b/src/Makefile.am index 3808f55..23af9f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $ +## $Id: Makefile.am 121 2004-10-18 20:24:05Z tilman $ SUBDIRS = esmart_container esmart_draggies esmart_trans_x11 @@ -10,5 +10,5 @@ extdir = $(RUBYSITEDIR) esmart_la_SOURCES = rb_esmart.c rb_esmart.h -esmart_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS) +esmart_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ESMART_LIBS) esmart_la_LDFLAGS = -module -avoid-version diff --git a/src/esmart_container/Makefile.am b/src/esmart_container/Makefile.am index cdec71a..87a61a3 100644 --- a/src/esmart_container/Makefile.am +++ b/src/esmart_container/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $ +## $Id: Makefile.am 121 2004-10-18 20:24:05Z tilman $ AM_CFLAGS = $(ESMART_CFLAGS) INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR) @@ -8,6 +8,6 @@ extdir = $(RUBYSITEDIR) esmart_container_la_SOURCES = rb_esmart_container.c -esmart_container_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS) \ +esmart_container_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ESMART_LIBS) \ -lesmart_container esmart_container_la_LDFLAGS = -module -avoid-version diff --git a/src/esmart_draggies/Makefile.am b/src/esmart_draggies/Makefile.am index ac9dcb9..2e71483 100644 --- a/src/esmart_draggies/Makefile.am +++ b/src/esmart_draggies/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $ +## $Id: Makefile.am 121 2004-10-18 20:24:05Z tilman $ AM_CFLAGS = $(ESMART_CFLAGS) INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR) @@ -8,6 +8,6 @@ extdir = $(RUBYSITEDIR) esmart_draggies_la_SOURCES = rb_esmart_draggies.c -esmart_draggies_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS) \ +esmart_draggies_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ESMART_LIBS) \ -lesmart_draggies esmart_draggies_la_LDFLAGS = -module -avoid-version diff --git a/src/esmart_trans_x11/Makefile.am b/src/esmart_trans_x11/Makefile.am index 34ffe47..a615abf 100644 --- a/src/esmart_trans_x11/Makefile.am +++ b/src/esmart_trans_x11/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $ +## $Id: Makefile.am 121 2004-10-18 20:24:05Z tilman $ AM_CFLAGS = $(ESMART_CFLAGS) INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR) @@ -8,6 +8,6 @@ extdir = $(RUBYSITEDIR) esmart_trans_x11_la_SOURCES = rb_esmart_trans_x11.c -esmart_trans_x11_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS) \ +esmart_trans_x11_la_LIBADD = -L$(RUBYLIBDIR) $(RUBYLIB) $(ESMART_LIBS) \ -lesmart_trans_x11 esmart_trans_x11_la_LDFLAGS = -module -avoid-version -- 2.30.2