From 16dab3e2212f60446e2adcb2925b70ead4b2b488 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 12 Sep 2005 23:50:01 +0000 Subject: re PR libgcj/23762 (java.library.path should default to value of environment variable specified by LTDL_SHLIBPATH_VAR) 2005-09-12 Thomas Fitzsimmons PR libgcj/23762 * shlibpath.m4: New file. * configure.ac: If libltdl is being used call AC_LTDL_SHLIBPATH macro. * gnu/classpath/natSystemProperties.cc (insertSystemProperties) [USE_LTDL]: If it was not defined with -D set java.library.path to the value of LTDL_SHLIBPATH_VAR. From-SVN: r104198 --- libjava/include/Makefile.in | 5 +++-- libjava/include/config.h.in | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'libjava/include') diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 810f1fc..334ad63 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -52,7 +52,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/lib-prefix.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/mingwld.m4 \ - $(top_srcdir)/pkg.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index e59ea35..ffb3d3f 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -378,6 +378,10 @@ /* Define if using POSIX threads on Linux. */ #undef LINUX_THREADS +/* Define to the name of the environment variable that determines the dynamic + library search path. */ +#undef LTDL_SHLIBPATH_VAR + /* Define if MinGW libgcj uses the Windows UNICODE OS API. */ #undef MINGW_LIBGCJ_UNICODE -- cgit v1.1