Look for the directory where libruby.so lives.
authorTilman Sauerbeck <tilman@code-monkey.de>
Mon, 16 Aug 2004 18:17:19 +0000 (18:17 +0000)
committerTilman Sauerbeck <tilman@code-monkey.de>
Mon, 16 Aug 2004 18:17:19 +0000 (18:17 +0000)
m4/ac_ruby_ext.m4
src/Makefile.am
src/esmart_container/Makefile.am
src/esmart_draggies/Makefile.am
src/esmart_trans_x11/Makefile.am

index 17f62590952d06d222a5e06e7b3080694c6abf57..90a3383846ac8a692e255c04b5e614d7bf6e3891 100644 (file)
@@ -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)
 ])
index 68278804792ca29c9efd39314630726082de3125..3808f55ed2a7115f9e090512e8cd58ab62c22ba6 100644 (file)
@@ -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
index 5e30042a3c9608ded0dd213dd230cf4b336cd62e..cdec71afffd69c80d2161f522428b0d9d8349c86 100644 (file)
@@ -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
index 51a611270641e51a5cd7311d26392045ba4c8ab1..ac9dcb949095fe6834e743cf654f8d1887961ab4 100644 (file)
@@ -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
index 2acda03caef50d127e528e70eb214469b6574870..34ffe4706ac48768857bf373cccf16a39356b487 100644 (file)
@@ -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