From f14311dbaf47ce47c38c1bd8428cf6b7676b96cf Mon Sep 17 00:00:00 2001 From: Greg Ames Date: Mon, 3 Dec 2001 18:00:04 +0000 Subject: [PATCH] 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: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92299 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ build/binbuild.sh | 1 + configure.in | 1 + support/apachectl.in | 5 +++++ 4 files changed, 10 insertions(+) diff --git a/CHANGES b/CHANGES index 70983d58e7..eebf7feec6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ Changes with Apache 2.0.30-dev + + *) Get binary builds working when libapr and libaprutil are built + shared [Greg Ames] *) Get shared builds of libapr and libaprutil, as well as Apache DSOs, working on AIX. [Aaron Bannert, Dick Dunbar , diff --git a/build/binbuild.sh b/build/binbuild.sh index 1d8092eae5..8ec8a2a720 100755 --- a/build/binbuild.sh +++ b/build/binbuild.sh @@ -137,6 +137,7 @@ sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \ cp bindist/conf/httpd.conf bindist/conf/httpd-std.conf sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \ + -e "s%^#binbuild %%" \ bindist/bin/apachectl > bindist/bin/apachectl.tmp mv bindist/bin/apachectl.tmp bindist/bin/apachectl diff --git a/configure.in b/configure.in index 3c25e59aa7..cf9451265b 100644 --- a/configure.in +++ b/configure.in @@ -261,6 +261,7 @@ APACHE_SUBST(MPM_LIB) APACHE_SUBST(OS) APACHE_SUBST(OS_DIR) APACHE_SUBST(BUILTIN_LIBS) +APACHE_SUBST(SHLIBPATH_VAR) PRE_SHARED_CMDS='echo ""' POST_SHARED_CMDS='echo ""' diff --git a/support/apachectl.in b/support/apachectl.in index 7b85809863..e948f91712 100644 --- a/support/apachectl.in +++ b/support/apachectl.in @@ -30,6 +30,11 @@ PIDFILE=@prefix@/logs/@progname@.pid # the path to your httpd binary, including options if necessary HTTPD='@prefix@/bin/@progname@' # +# the following lines are automatically uncommented for +# binary builds +#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@' +#binbuild export @SHLIBPATH_VAR@ +# # a command that outputs a formatted text version of the HTML at the # url given on the command line. Designed for lynx, however other # programs may work. -- 2.50.1