From e9d72d28b261c63c945df05fd8b0fb0a2bcfcf68 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 16 Aug 2004 18:10:27 +0000 Subject: [PATCH] Look for the directory where libruby.so lives. --- m4/ac_ruby_ext.m4 | 14 ++++++++++++-- src/ecore/Makefile.am | 4 ++-- src/ecore_evas/Makefile.am | 4 ++-- src/ecore_job/Makefile.am | 4 ++-- src/ecore_x/Makefile.am | 4 ++-- 5 files changed, 20 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/ecore/Makefile.am b/src/ecore/Makefile.am index 3279d17..7c85427 100644 --- 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) @@ -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 -ecore_la_LIBADD = -lruby $(ECORE_LIBS) +ecore_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS) ecore_la_LDFLAGS = -module -avoid-version diff --git a/src/ecore_evas/Makefile.am b/src/ecore_evas/Makefile.am index 355e99d..83c84b0 100644 --- 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) @@ -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 = -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 diff --git a/src/ecore_job/Makefile.am b/src/ecore_job/Makefile.am index 63056f1..30a0379 100644 --- 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) @@ -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 = -lruby $(ECORE_LIBS) +ecore_job_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS) ecore_job_la_LDFLAGS = -module -avoid-version diff --git a/src/ecore_x/Makefile.am b/src/ecore_x/Makefile.am index 5632d00..ae04a7a 100644 --- 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) @@ -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_LIBADD = -lruby $(ECORE_LIBS) +ecore_x_la_LIBADD = -L$(RUBYLIBDIR) -lruby $(ECORE_LIBS) ecore_x_la_LDFLAGS = -module -avoid-version pkgincludedir = $(RUBYSITEDIR)/ecore -- 2.30.2