From c8b9eb374cbdd302010c5b6250b16a8b83572174 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon, 16 Aug 2004 18:17:19 +0000
Subject: [PATCH] Look for the directory where libruby.so lives.

---
 m4/ac_ruby_ext.m4                | 14 ++++++++++++--
 src/Makefile.am                  |  4 ++--
 src/esmart_container/Makefile.am |  5 +++--
 src/esmart_draggies/Makefile.am  |  5 +++--
 src/esmart_trans_x11/Makefile.am |  5 +++--
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/m4/ac_ruby_ext.m4 b/m4/ac_ruby_ext.m4
index 17f6259..90a3383 100644
--- a/m4/ac_ruby_ext.m4
+++ b/m4/ac_ruby_ext.m4
@@ -13,13 +13,22 @@ AC_DEFUN([AC_RUBY_EXT], [
 	fi
 
 	AC_MSG_CHECKING(for Ruby library path)
+	RUBYLIBDIR=`($rubybin -rmkmf -e 'print Config::CONFIG[["libdir"]]') 2> /dev/null`
+	if test -d "$RUBYLIBDIR"; then
+		AC_MSG_RESULT([$RUBYLIBDIR])
+	else
+		AC_MSG_RESULT(not found)
+		AC_MSG_ERROR(Ruby library path not found)
+	fi
+
+	AC_MSG_CHECKING(for Ruby extension path)
 
 	RUBYDIR=`($rubybin -rmkmf -e 'print Config::CONFIG[["archdir"]]') 2> /dev/null`
 	if test -d "$RUBYDIR"; then
 		AC_MSG_RESULT([$RUBYDIR])
 	else
 		AC_MSG_RESULT(not found)
-		AC_MSG_ERROR(Ruby library path not found)
+		AC_MSG_ERROR(Ruby extension path not found)
 	fi
 
 	AC_MSG_CHECKING(for Ruby site library path)
@@ -28,9 +37,10 @@ AC_DEFUN([AC_RUBY_EXT], [
 		AC_MSG_RESULT([$RUBYSITEDIR])
 	else
 		AC_MSG_RESULT(not found)
-		AC_MSG_ERROR(Ruby site library path not found)
+		AC_MSG_ERROR(Ruby site extension path not found)
 	fi
 
+	AC_SUBST(RUBYLIBDIR)
 	AC_SUBST(RUBYDIR)
 	AC_SUBST(RUBYSITEDIR)
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6827880..3808f55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 36 2004-07-25 10:45:47Z tilman $
+## $Id: Makefile.am 75 2004-08-16 18:17:19Z 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 = -lruby $(ESMART_LIBS)
+esmart_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS)
 esmart_la_LDFLAGS = -module -avoid-version
diff --git a/src/esmart_container/Makefile.am b/src/esmart_container/Makefile.am
index 5e30042..cdec71a 100644
--- a/src/esmart_container/Makefile.am
+++ b/src/esmart_container/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 36 2004-07-25 10:45:47Z tilman $
+## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $
 
 AM_CFLAGS = $(ESMART_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -8,5 +8,6 @@ extdir = $(RUBYSITEDIR)
 
 esmart_container_la_SOURCES = rb_esmart_container.c
 
-esmart_container_la_LIBADD = -lruby $(ESMART_LIBS) -lesmart_container
+esmart_container_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(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 51a6112..ac9dcb9 100644
--- a/src/esmart_draggies/Makefile.am
+++ b/src/esmart_draggies/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 36 2004-07-25 10:45:47Z tilman $
+## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $
 
 AM_CFLAGS = $(ESMART_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -8,5 +8,6 @@ extdir = $(RUBYSITEDIR)
 
 esmart_draggies_la_SOURCES = rb_esmart_draggies.c
 
-esmart_draggies_la_LIBADD = -lruby $(ESMART_LIBS) -lesmart_draggies
+esmart_draggies_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(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 2acda03..34ffe47 100644
--- a/src/esmart_trans_x11/Makefile.am
+++ b/src/esmart_trans_x11/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 36 2004-07-25 10:45:47Z tilman $
+## $Id: Makefile.am 75 2004-08-16 18:17:19Z tilman $
 
 AM_CFLAGS = $(ESMART_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -8,5 +8,6 @@ extdir = $(RUBYSITEDIR)
 
 esmart_trans_x11_la_SOURCES = rb_esmart_trans_x11.c
 
-esmart_trans_x11_la_LIBADD = -lruby $(ESMART_LIBS) -lesmart_trans_x11
+esmart_trans_x11_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ESMART_LIBS) \
+                             -lesmart_trans_x11
 esmart_trans_x11_la_LDFLAGS = -module -avoid-version
-- 
2.30.2