You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by aa...@apache.org on 2002/02/08 00:01:48 UTC
cvs commit: httpd-2.0 STATUS CHANGES
aaron 02/02/07 15:01:47
Modified: support config.m4
build binbuild.sh
. STATUS CHANGES
Log:
Allow statically linked support binaries with the new
--enable-static-support flag, and enable this behavior in
the binbuild script. Also add a new --enable-static-htdbm
flag.
BTW, this takes care of 7/8th of a showstopper.
Revision Changes Path
1.4 +41 -10 httpd-2.0/support/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/support/config.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.m4 2 Feb 2002 21:33:03 -0000 1.3
+++ config.m4 7 Feb 2002 23:01:47 -0000 1.4
@@ -1,52 +1,83 @@
-
-
htpasswd_LTFLAGS=""
htdigest_LTFLAGS=""
rotatelogs_LTFLAGS=""
logresolve_LTFLAGS=""
+htdbm_LTFLAGS=""
ab_LTFLAGS=""
+checkgid_LTFLAGS=""
-dnl XXX Should we change the foo_LTFLAGS="-static" settings below
-dnl to something like APR_ADDTO? -aaron
+AC_ARG_ENABLE(static-support,APACHE_HELP_STRING(--enable-static-support,Build a statically linked version the support binaries),[
+if test "$enableval" = "yes" ; then
+ APR_ADDTO(htpasswd_LTFLAGS, [-static])
+ APR_ADDTO(htdigest_LTFLAGS, [-static])
+ APR_ADDTO(rotatelogs_LTFLAGS, [-static])
+ APR_ADDTO(logresolve_LTFLAGS, [-static])
+ APR_ADDTO(htdbm_LTFLAGS, [-static])
+ APR_ADDTO(ab_LTFLAGS, [-static])
+ APR_ADDTO(checkgid_LTFLAGS, [-static])
+fi
+])
AC_ARG_ENABLE(static-htpasswd,APACHE_HELP_STRING(--enable-static-htpasswd,Build a statically linked version of htpasswd),[
if test "$enableval" = "yes" ; then
- htpasswd_LTFLAGS="-static"
+ APR_ADDTO(htpasswd_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(htpasswd_LTFLAGS, [-static])
fi
])
APACHE_SUBST(htpasswd_LTFLAGS)
AC_ARG_ENABLE(static-htdigest,APACHE_HELP_STRING(--enable-static-htdigest,Build a statically linked version of htdigest),[
if test "$enableval" = "yes" ; then
- htdigest_LTFLAGS="-static"
+ APR_ADDTO(htdigest_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(htdigest_LTFLAGS, [-static])
fi
])
APACHE_SUBST(htdigest_LTFLAGS)
AC_ARG_ENABLE(static-rotatelogs,APACHE_HELP_STRING(--enable-static-rotatelogs,Build a statically linked version of rotatelogs),[
if test "$enableval" = "yes" ; then
- rotatelogs_LTFLAGS="-static"
+ APR_ADDTO(rotatelogs_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(rotatelogs_LTFLAGS, [-static])
fi
])
APACHE_SUBST(rotatelogs_LTFLAGS)
AC_ARG_ENABLE(static-logresolve,APACHE_HELP_STRING(--enable-static-logresolve,Build a statically linked version of logresolve),[
if test "$enableval" = "yes" ; then
- logresolve_LTFLAGS="-static"
+ APR_ADDTO(logresolve_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(logresolve_LTFLAGS, [-static])
fi
])
APACHE_SUBST(logresolve_LTFLAGS)
+AC_ARG_ENABLE(static-htdbm,APACHE_HELP_STRING(--enable-static-htdbm,Build a statically linked version of htdbm),[
+if test "$enableval" = "yes" ; then
+ APR_ADDTO(htdbm_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(htdbm_LTFLAGS, [-static])
+fi
+])
+APACHE_SUBST(htdbm_LTFLAGS)
+
AC_ARG_ENABLE(static-ab,APACHE_HELP_STRING(--enable-static-ab,Build a statically linked version of ab),[
if test "$enableval" = "yes" ; then
- ab_LTFLAGS="-static"
+ APR_ADDTO(ab_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(ab_LTFLAGS, [-static])
fi
])
APACHE_SUBST(ab_LTFLAGS)
AC_ARG_ENABLE(static-checkgid,APACHE_HELP_STRING(--enable-static-checkgid,Build a statically linked version of checkgid),[
if test "$enableval" = "yes" ; then
- checkgid_LTFLAGS="-static"
+ APR_ADDTO(checkgid_LTFLAGS, [-static])
+else
+ APR_REMOVEFROM(checkgid_LTFLAGS, [-static])
fi
])
APACHE_SUBST(checkgid_LTFLAGS)
+
1.35 +1 -1 httpd-2.0/build/binbuild.sh
Index: binbuild.sh
===================================================================
RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- binbuild.sh 2 Feb 2002 20:30:03 -0000 1.34
+++ binbuild.sh 7 Feb 2002 23:01:47 -0000 1.35
@@ -12,7 +12,7 @@
APDIR=`pwd`
APDIR=`basename $APDIR`
APFULLDIR=`pwd`
-CONFIGPARAM="--with-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat"
+CONFIGPARAM="--with-layout=BinaryDistribution --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
VER=`echo $APDIR |sed s/httpd-//`
TAR="`srclib/apr/build/PrintPath tar`"
GTAR="`srclib/apr/build/PrintPath gtar`"
1.489 +5 -11 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- STATUS 6 Feb 2002 22:52:15 -0000 1.488
+++ STATUS 7 Feb 2002 23:01:47 -0000 1.489
@@ -1,5 +1,5 @@
APACHE 2.0 STATUS: -*-text-*-
-Last modified at [$Date: 2002/02/06 22:52:15 $]
+Last modified at [$Date: 2002/02/07 23:01:47 $]
Release:
@@ -175,20 +175,14 @@
variable, but ab, htpasswd, etc. don't know how to pick up apr,
apr-util, etc.
Message-ID: <20...@ebuilt.com>
- Justin says: "You could always build all of the binaries
- statically if you don't want to let libtool
- handle it. At most, I don't consider this a
- a release showstopper as it is a packaging issue."
- Ken sez: "Showstopper because, until it's the default, it
- violates the P of LA. Binaries will give strange
- errors and not run if moved."
- Status: Aaron volunteers: I'll commit a patch to allow all
- the support binaries to be built statically against
- libapr/libaprutil/etc and then enable it in binbuild.
gregames says: what about httpd? yeah, it works at the moment
if you use apachectl. But I've already heard
complaints about not being able to execute
httpd directly.
+ Status: Aaron has committed this for all the support binaries,
+ but is hesitant to do the same for the httpd binary.
+ Message-ID: <20...@clove.org>
+
CURRENT VOTES:
1.570 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- CHANGES 7 Feb 2002 06:37:09 -0000 1.569
+++ CHANGES 7 Feb 2002 23:01:47 -0000 1.570
@@ -1,5 +1,10 @@
Changes with Apache 2.0.32-dev
+ *) Allow statically linked support binaries with the new
+ --enable-static-support flag, and enable this behavior in
+ the binbuild script. Also add a new --enable-static-htdbm
+ flag. [Aaron Bannert]
+
*) Allow mod_autoindex to serve symlinks if permitted and attempt to
do only one stat() call when generating the directory listings.
[Justin Erenkrantz]