summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgregames <gregames@13f79535-47bb-0310-9956-ffa450edef68>2001-12-03 18:00:04 +0000
committergregames <gregames@13f79535-47bb-0310-9956-ffa450edef68>2001-12-03 18:00:04 +0000
commit8d72c412d667c60c03d777fdd851333dbfae8e30 (patch)
treec823fa0afa3e11e36d42ce83462ef8055df74a39
parentdc20098feb417c309cc0ed3889371723a3e9bc35 (diff)
downloadlibapr-8d72c412d667c60c03d777fdd851333dbfae8e30.tar.gz
get binbuild working when apr, apr-util, and expat are built shared in
directories that are not well known to the loader. How it works: * libtool figures out the name of this system's library path environment variable (i.e. LD_LIBRARY_PATH, LIBPATH, DYLD_LIBRARY_PATH) at apr configure time (existing code) * save this variable name in SHLIBPATH_VAR in APRVARS * substitute this name when apachectl is created * uncomment the lines containing this variable during binbuild * install_bindist.sh updates the path to lib/ when the binary is installed (existing code) not done yet, but a good idea: * create a file or directory containing all environment variable settings for apachectl. Others env vars need to be tweaked, at least on AIX and OS/390, so keeping them separate should reduce headaches long term. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@62596 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--APRVARS.in1
-rw-r--r--configure.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/APRVARS.in b/APRVARS.in
index b91cda655..28cb3092c 100644
--- a/APRVARS.in
+++ b/APRVARS.in
@@ -7,6 +7,7 @@ EXTRA_LDFLAGS="@EXTRA_LDFLAGS@"
EXTRA_LIBS="@EXTRA_LIBS@"
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
LIBTOOL_LIBS="@LIBTOOL_LIBS@"
+SHLIBPATH_VAR="@shlibpath_var@"
APR_SOURCE_DIR="@abs_srcdir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
diff --git a/configure.in b/configure.in
index be5840ebb..f28997038 100644
--- a/configure.in
+++ b/configure.in
@@ -1364,6 +1364,7 @@ AC_SUBST(OSDIR)
AC_SUBST(DEFAULT_OSDIR)
AC_SUBST(EXEEXT)
AC_SUBST(LIBTOOL_LIBS)
+AC_SUBST(shlibpath_var)
echo "${nl}Construct Makefiles and header files."
MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"