Look for the directory where libruby.so lives.

diff --git a/m4/ac_ruby_ext.m4 b/m4/ac_ruby_ext.m4
index 17f62590952d06d222a5e06e7b3080694c6abf57..90a3383846ac8a692e255c04b5e614d7bf6e3891 100644 (file)
--- 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)
        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)
 
        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)
        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_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
 
        fi
 

+       AC_SUBST(RUBYLIBDIR)

        AC_SUBST(RUBYDIR)
        AC_SUBST(RUBYSITEDIR)
 ])
        AC_SUBST(RUBYDIR)
        AC_SUBST(RUBYSITEDIR)
 ])

diff --git a/src/ecore/Makefile.am b/src/ecore/Makefile.am
index 3279d17b77a7c599b6160f21bc23c03560a682c3..7c85427d3c4391b6f7ef87f2f3f342f48a058b7c 100644 (file)
--- a/src/ecore/Makefile.am
+++ b/src/ecore/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 9 2004-06-19 19:53:47Z tilman $
+## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $

 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR)
 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR)


@@ -10,5 +10,5 @@ ecore_la_SOURCES = rb_ecore.c rb_ecore.h \
                    rb_idler.c rb_idler.h \
                    rb_timer.c rb_timer.h
 
                    rb_idler.c rb_idler.h \
                    rb_timer.c rb_timer.h
 

-ecore_la_LIBADD = -lruby $(ECORE_LIBS)
+ecore_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)

 ecore_la_LDFLAGS = -module -avoid-version
 ecore_la_LDFLAGS = -module -avoid-version

diff --git a/src/ecore_evas/Makefile.am b/src/ecore_evas/Makefile.am
index 355e99d0947052d37dfb518cf346eea0b3ce024a..83c84b0d95ff0a4dc3f3d4b8d57f88914f6145ce 100644 (file)
--- a/src/ecore_evas/Makefile.am
+++ b/src/ecore_evas/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 50 2004-08-01 10:18:39Z tilman $
+## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $

 
 AM_CFLAGS = $(ECORE_CFLAGS) $(EVAS_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
 
 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
 
                         rb_gl_x11.c rb_gl_x11.h \
                         rb_fb.c rb_fb.h
 

-ecore_evas_la_LIBADD = -lruby $(ECORE_LIBS) $(EVAS_LIBS)
+ecore_evas_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS) $(EVAS_LIBS)

 ecore_evas_la_LDFLAGS = -module -avoid-version
 
 pkgincludedir = $(RUBYSITEDIR)/ecore
 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 63056f112a1547accdfc386c45540b19bd7194a7..30a0379bbd9d0a301a5058c27811330445bac431 100644 (file)
--- a/src/ecore_job/Makefile.am
+++ b/src/ecore_job/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 9 2004-06-19 19:53:47Z tilman $
+## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $

 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR)
 
 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_SOURCES = rb_ecore_job.c rb_ecore_job.h \
                        rb_job.c rb_job.h
 

-ecore_job_la_LIBADD = -lruby $(ECORE_LIBS)
+ecore_job_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)

 ecore_job_la_LDFLAGS = -module -avoid-version
 ecore_job_la_LDFLAGS = -module -avoid-version

diff --git a/src/ecore_x/Makefile.am b/src/ecore_x/Makefile.am
index 5632d00067142b007ed622375f5574a945cd6d68..ae04a7a75ff52afd8a5d18cea4fad72f3f723eff 100644 (file)
--- a/src/ecore_x/Makefile.am
+++ b/src/ecore_x/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 50 2004-08-01 10:18:39Z tilman $
+## $Id: Makefile.am 72 2004-08-16 18:10:27Z tilman $

 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
 
 AM_CFLAGS = $(ECORE_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)


@@ -9,7 +9,7 @@ extdir = $(RUBYSITEDIR)
 ecore_x_la_SOURCES = rb_ecore_x.c rb_ecore_x.h \
                      rb_window.c rb_window.h
 
 ecore_x_la_SOURCES = rb_ecore_x.c rb_ecore_x.h \
                      rb_window.c rb_window.h
 

-ecore_x_la_LIBADD = -lruby $(ECORE_LIBS)
+ecore_x_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS)

 ecore_x_la_LDFLAGS = -module -avoid-version
 
 pkgincludedir = $(RUBYSITEDIR)/ecore
 ecore_x_la_LDFLAGS = -module -avoid-version
 
 pkgincludedir = $(RUBYSITEDIR)/ecore