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

diff --git a/CHANGES b/CHANGES
index 70983d58e72003fe8ac0b3d2173c0ccd4adef920..eebf7feec654ea5ea4eaeb66f7def724573edfbd 100644 (file)
--- 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 <RLDunbar@pacbell.net>,

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 1d8092eae5f2af7ba4378b37a9e9db8050091257..8ec8a2a72086cdbf14e8f7c32cc9eddce9205388 100755 (executable)
--- 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 3c25e59aa77dc5c405da96f7baa5af9f45671b04..cf9451265b096f9853db7d74f93c48e30f38c64b 100644 (file)
--- 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 7b85809863927589a15cbf431aa0da2821493cd6..e948f917128f8af38c03003bc23ab563508fb04e 100644 (file)
--- 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.