Use both .libs and non.libs versions of the so paths, because some

versions of libtool add .libs implicitly and others don't.

diff --git a/ChangeLog b/ChangeLog
index 347ac03f8ec8a91f757d848d3b0c3ab4ee374628..66b0df268db81f5e134296440d492cc7210e06ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 
+2004-05-12  Rhys Weatherley  <rweather@southern-storm.com.au>
+
+       * jitdynamic/Makefile.am, jitplus/Makefile.am: use both .libs and
+       non.libs versions of the so paths, because some versions of libtool
+       add .libs implicitly and others don't.
+
 2004-05-11  Rhys Weatherley  <rweather@southern-storm.com.au>
 
        * include/jit/jit-insn.h, jit/jit-insn.c, jit/jit-interp.cpp,

diff --git a/jitdynamic/Makefile.am b/jitdynamic/Makefile.am
index e0a033d397696feea32ba37de9a82cf50203f74c..0e797ec7a62c9027a8be1eef8216b5edb6e99dba 100644 (file)
--- a/jitdynamic/Makefile.am
+++ b/jitdynamic/Makefile.am
@@ -8,6 +8,7 @@ libjitdynamic_la_SOURCES = \
 AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
                        -I. -I$(srcdir) -I$(top_srcdir)/jit -I$(top_builddir)/jit
 
-libjitdynamic_la_LDFLAGS = -version-info $(LIBJIT_VERSION) \
-                                                  -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP)
+libjitdynamic_la_LDFLAGS = \
+               -version-info $(LIBJIT_VERSION) \
+               -L$(top_builddir)/jit -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP)
 libjitdynamic_la_DEPENDENCIES = $(top_builddir)/jit/libjit.la

diff --git a/jitplus/Makefile.am b/jitplus/Makefile.am
index 86e2c8ed094b4b7230bd49190bf7afd64c058200..8069dd90d496c092b1e06b1b39c5d0ccf2cb976e 100644 (file)
--- a/jitplus/Makefile.am
+++ b/jitplus/Makefile.am
@@ -8,6 +8,7 @@ libjitplus_la_SOURCES = \
 
 AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I. -I$(srcdir)
 
-libjitplus_la_LDFLAGS = -version-info $(LIBJIT_VERSION) \
-                                               -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP)
+libjitplus_la_LDFLAGS = \
+               -version-info $(LIBJIT_VERSION) \
+               -L$(top_builddir)/jit -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP)
 libjitplus_la_DEPENDENCIES = $(top_builddir)/jit/libjit.la