Allow support programs to be compiled against a static version

of libapr.  This allows the smaller support programs to be
relocated.

Submitted by:	Aaron Bannert <aaron@clove.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91167 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 8ed935aacbf44b3e92f9e8928807c1c2796983e8..0d70354bd0e460a9f0976640ad7e081214d67551 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.26-dev
 
+  *) Allow support programs to be compiled against a static version
+     of libapr.  This allows the smaller support programs to be 
+     relocated.  [Aaron Bannert <aaron@clove.org>]
+
   *) Update the mime.types file to the registered media types as
      of 2001-09-25, and add mapping for xsl extension [Mark Cox]
 

diff --git a/support/Makefile.in b/support/Makefile.in
index a0c2c7580c99af3c1c9e9657c3ae6dd6bd1642ca..c64375948f2f95e2bbb52f1930d697e010f6f8a7 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -23,23 +23,23 @@ install:
 
 htpasswd_OBJECTS = htpasswd.lo
 htpasswd: $(htpasswd_OBJECTS)
-       $(LINK) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(htpasswd_LTFLAGS) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
 
 htdigest_OBJECTS = htdigest.lo
 htdigest: $(htdigest_OBJECTS)
-       $(LINK) $(htdigest_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(htdigest_LTFLAGS) $(htdigest_OBJECTS) $(PROGRAM_LDADD)
 
 rotatelogs_OBJECTS = rotatelogs.lo
 rotatelogs: $(rotatelogs_OBJECTS)
-       $(LINK) $(rotatelogs_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(rotatelogs_LTFLAGS) $(rotatelogs_OBJECTS) $(PROGRAM_LDADD)
 
 logresolve_OBJECTS = logresolve.lo
 logresolve: $(logresolve_OBJECTS)
-       $(LINK) $(logresolve_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(logresolve_LTFLAGS) $(logresolve_OBJECTS) $(PROGRAM_LDADD)
 
 ab_OBJECTS = ab.lo
 ab: $(ab_OBJECTS)
-       $(LINK) $(ab_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(PROGRAM_LDADD)
 
 suexec_OBJECTS = suexec.lo
 suexec: $(suexec_OBJECTS)

diff --git a/support/config.m4 b/support/config.m4
new file mode 100644 (file)
index 0000000..ce37747
--- /dev/null
+++ b/support/config.m4
@@ -0,0 +1,45 @@
+
+
+htpasswd_LTFLAGS=""
+htdigest_LTFLAGS=""
+rotatelogs_LTFLAGS=""
+logresolve_LTFLAGS=""
+ab_LTFLAGS=""
+
+dnl XXX Should we change the foo_LTFLAGS="-static" settings below
+dnl to something like APR_ADDTO? -aaron
+
+AC_ARG_ENABLE(static-htpasswd,[  --enable-static-htpasswd  Build a statically linked version of htpasswd],[
+if test "$enableval" = "yes" ; then
+  htpasswd_LTFLAGS="-static"
+fi
+])
+APACHE_SUBST(htpasswd_LTFLAGS)
+
+AC_ARG_ENABLE(static-htdigest,[  --enable-static-htdigest  Build a statically linked version of htdigest],[
+if test "$enableval" = "yes" ; then
+  htdigest_LTFLAGS="-static"
+fi
+])
+APACHE_SUBST(htdigest_LTFLAGS)
+
+AC_ARG_ENABLE(static-rotatelogs,[  --enable-static-rotatelogs  Build a statically linked version of rotatelogs],[
+if test "$enableval" = "yes" ; then
+  rotatelogs_LTFLAGS="-static"
+fi
+])
+APACHE_SUBST(rotatelogs_LTFLAGS)
+
+AC_ARG_ENABLE(static-logresolve,[  --enable-static-logresolve  Build a statically linked version of logresolve],[
+if test "$enableval" = "yes" ; then
+  logresolve_LTFLAGS="-static"
+fi
+])
+APACHE_SUBST(logresolve_LTFLAGS)
+
+AC_ARG_ENABLE(static-ab,[  --enable-static-ab      Build a statically linked version of ab],[
+if test "$enableval" = "yes" ; then
+  ab_LTFLAGS="-static"
+fi
+])
+APACHE_SUBST(ab_LTFLAGS)