projects
/
ruby-esmart.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8b9eb3
)
Link to the correct Ruby shared object.
author
Tilman Sauerbeck
<tilman@code-monkey.de>
Mon, 18 Oct 2004 20:24:05 +0000
(20:24 +0000)
committer
Tilman Sauerbeck
<tilman@code-monkey.de>
Mon, 18 Oct 2004 20:24:05 +0000
(20:24 +0000)
m4/ac_ruby_ext.m4
patch
|
blob
|
history
src/Makefile.am
patch
|
blob
|
history
src/esmart_container/Makefile.am
patch
|
blob
|
history
src/esmart_draggies/Makefile.am
patch
|
blob
|
history
src/esmart_trans_x11/Makefile.am
patch
|
blob
|
history
diff --git
a/m4/ac_ruby_ext.m4
b/m4/ac_ruby_ext.m4
index 90a3383846ac8a692e255c04b5e614d7bf6e3891..da811165b43b810864e444a6d2fc91cd5878fee6 100644
(file)
--- 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_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)
AC_SUBST(RUBYLIBDIR)
AC_SUBST(RUBYDIR)
AC_SUBST(RUBYSITEDIR)
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 3808f55ed2a7115f9e090512e8cd58ab62c22ba6..23af9f89256c8a8592983fee86ce056bffbeb43a 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am
75 2004-08-16 18:17:19
Z tilman $
+## $Id: Makefile.am
121 2004-10-18 20:24:05
Z tilman $
SUBDIRS = esmart_container esmart_draggies esmart_trans_x11
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_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
esmart_la_LDFLAGS = -module -avoid-version
diff --git
a/src/esmart_container/Makefile.am
b/src/esmart_container/Makefile.am
index cdec71afffd69c80d2161f522428b0d9d8349c86..87a61a3d76d78cd1bc90c15880b2f8eeb4785285 100644
(file)
--- 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:19
Z tilman $
+## $Id: Makefile.am
121 2004-10-18 20:24:05
Z tilman $
AM_CFLAGS = $(ESMART_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
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_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
-lesmart_container
esmart_container_la_LDFLAGS = -module -avoid-version
diff --git
a/src/esmart_draggies/Makefile.am
b/src/esmart_draggies/Makefile.am
index ac9dcb949095fe6834e743cf654f8d1887961ab4..2e714831ed38b72f0753dbe82bf1b95ccea45c7b 100644
(file)
--- 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:19
Z tilman $
+## $Id: Makefile.am
121 2004-10-18 20:24:05
Z tilman $
AM_CFLAGS = $(ESMART_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
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_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
-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 34ffe4706ac48768857bf373cccf16a39356b487..a615abfa2c154261ec32626c51e4e3b05b1a3442 100644
(file)
--- 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:19
Z tilman $
+## $Id: Makefile.am
121 2004-10-18 20:24:05
Z tilman $
AM_CFLAGS = $(ESMART_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
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_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
-lesmart_trans_x11
esmart_trans_x11_la_LDFLAGS = -module -avoid-version