Propagate $lt_cv_objdir not to use directly .libs (would break on WIN32)

12 files changed, 23 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index a7e10d5..f8f78d9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,6 +123,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/configure b/configure
index aca4abd..4baa4aa 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,7 @@ V6_FLAG
 OPENSSL_LIBS
 VERSION_INFO
 DEFAULT_CFLAGS
+LT_CV_OBJDIR
 SHLIBPATH_VAR
 CXXCPP
 OTOOL64
@@ -15206,10 +15207,14 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
-# Export
+# Export LD_LIBRARY_PATH name or equivalent.
 SHLIBPATH_VAR=$shlibpath_var
 
 
+# Export .libs or equivalent.
+LT_CV_OBJDIR=$lt_cv_objdir
+
+
 ### Default CFLAGS
 DEFAULT_CFLAGS=""
 DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
diff --git a/configure.ac b/configure.ac
index d0d7698..e21c618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,9 +14,12 @@ AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 AC_PROG_LN_S
 
-# Export
+# Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
 
+# Export .libs or equivalent.
+AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
+
 ### Default CFLAGS
 DEFAULT_CFLAGS=""
 DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
diff --git a/html/Makefile.in b/html/Makefile.in
index 9d0b2bb..af03adc 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -132,6 +132,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/lang/Makefile.in b/lang/Makefile.in
index 05767d4..e7db9b0 100644
--- a/lang/Makefile.in
+++ b/lang/Makefile.in
@@ -109,6 +109,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index d8246c2..2b5d35a 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -174,6 +174,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 1b46241..3bfe6b4 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -98,6 +98,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/man/Makefile.in b/man/Makefile.in
index 4392c24..9922202 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -102,6 +102,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/src/Makefile.in b/src/Makefile.in
index 70f6394..c23a0e2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -167,6 +167,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/templates/Makefile.in b/templates/Makefile.in
index be66d32..3086356 100644
--- a/templates/Makefile.in
+++ b/templates/Makefile.in
@@ -108,6 +108,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ffd05bb..5a076f6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh
 
 TESTS_ENVIRONMENT =
-TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
-TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/.libs:$$PATH
+TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
+TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH
 
 TESTS = *.test
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c8164bd..eb2ffe8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -98,6 +98,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_CV_OBJDIR = @LT_CV_OBJDIR@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
@@ -179,8 +180,8 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh
-TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \
-	PATH=$(top_builddir)/src/.libs:$$PATH
+TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \
+	PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH
 TESTS = *.test
 all: all-am