diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | html/Makefile.in | 1 | ||||
| -rw-r--r-- | lang/Makefile.in | 1 | ||||
| -rw-r--r-- | libtest/Makefile.in | 1 | ||||
| -rw-r--r-- | m4/Makefile.in | 1 | ||||
| -rw-r--r-- | man/Makefile.in | 1 | ||||
| -rw-r--r-- | src/Makefile.in | 1 | ||||
| -rw-r--r-- | templates/Makefile.in | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 4 |
12 files changed, 19 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 40f247c..a7e10d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -147,6 +147,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ @@ -644,6 +644,7 @@ V6_FLAG OPENSSL_LIBS VERSION_INFO DEFAULT_CFLAGS +SHLIBPATH_VAR CXXCPP OTOOL64 OTOOL @@ -15205,6 +15206,10 @@ $as_echo "no, using $LN_S" >&6; } fi +# Export +SHLIBPATH_VAR=$shlibpath_var + + ### Default CFLAGS DEFAULT_CFLAGS="" DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ diff --git a/configure.ac b/configure.ac index 4770ebd..d0d7698 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,9 @@ AC_STDC_HEADERS AM_PROG_LIBTOOL AC_PROG_LN_S +# Export +AC_SUBST(SHLIBPATH_VAR,$shlibpath_var) + ### Default CFLAGS DEFAULT_CFLAGS="" DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ diff --git a/html/Makefile.in b/html/Makefile.in index 62791b9..9d0b2bb 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -156,6 +156,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/lang/Makefile.in b/lang/Makefile.in index bf17b78..05767d4 100644 --- a/lang/Makefile.in +++ b/lang/Makefile.in @@ -133,6 +133,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/libtest/Makefile.in b/libtest/Makefile.in index ebaaa86..d8246c2 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -198,6 +198,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/m4/Makefile.in b/m4/Makefile.in index 886f309..1b46241 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -122,6 +122,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/man/Makefile.in b/man/Makefile.in index c0fe0bf..4392c24 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -126,6 +126,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/src/Makefile.in b/src/Makefile.in index 6397ce7..70f6394 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -191,6 +191,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/templates/Makefile.in b/templates/Makefile.in index 56ba91e..be66d32 100644 --- a/templates/Makefile.in +++ b/templates/Makefile.in @@ -132,6 +132,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ diff --git a/tests/Makefile.am b/tests/Makefile.am index df00049..ffd05bb 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 += LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH +TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/.libs:$$PATH TESTS = *.test diff --git a/tests/Makefile.in b/tests/Makefile.in index 1c5295a..c8164bd 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -122,6 +122,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SHLIBPATH_VAR = @SHLIBPATH_VAR@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ THREADS_CFLAGS = @THREADS_CFLAGS@ @@ -178,8 +179,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh -TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \ +TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \ PATH=$(top_builddir)/src/.libs:$$PATH TESTS = *.test all: all-am |