From: Aaron Bannert Date: Thu, 7 Feb 2002 23:01:47 +0000 (+0000) Subject: Allow statically linked support binaries with the new X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7415eaccbe2de16d956026d938027fce703af70c;p=apache 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93331 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 44b72a0eab..d53db765c7 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/STATUS b/STATUS index 2d6af8b0cb..184f77ecc1 100644 --- a/STATUS +++ b/STATUS @@ -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 @@ FINAL RELEASE SHOWSTOPPERS: variable, but ab, htpasswd, etc. don't know how to pick up apr, apr-util, etc. Message-ID: <20020116000226.GA15991@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: <20020207142751.T31582@clove.org> + CURRENT VOTES: diff --git a/build/binbuild.sh b/build/binbuild.sh index b969dbd470..2c3d23a6c8 100755 --- a/build/binbuild.sh +++ b/build/binbuild.sh @@ -12,7 +12,7 @@ DEFAULT_DIR="/usr/local/apache2" 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`" diff --git a/support/config.m4 b/support/config.m4 index f04ae26b0c..5dd691f89e 100644 --- a/support/config.m4 +++ b/support/config.m4 @@ -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) +