← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apache2/trusty

« back to all changes in this revision

Viewing changes to srclib/apr/buildconf

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 01:28:04 UTC
  • mfrom: (14.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100505012804-vbouq0xs3tu2vvij
Tags: 2.2.15-5ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)
  + Dropped:
    - debian/patches/206-fix-potential-memory-leaks.dpatch: No longer needed.
    - debian/patches/206-report-max-client-mpm-worker.dpatch: No longer needed.
    - debian/config-dir/apache2.conf: Merged back from debian.
    - mod-reqtimeout functionality: Merge back from debian.
    - debian/patches/204_CVE-2010-0408.dpatch: No longer needed.
    - debian/patches/205_CVE-2010-0434.dpatch: No longer needed.
    - debian/patches/203_fix-ab-segfault.dpatch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr/buildconf
19
19
# buildconf: Build the support scripts needed to compile from a
20
20
#            checked-out version of the source code.
21
21
 
 
22
if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
 
23
    verbose="--verbose"
 
24
    shift
 
25
fi
 
26
 
22
27
# Verify that the builder has the right config tools installed
23
28
#
24
 
build/buildcheck.sh || exit 1
 
29
build/buildcheck.sh $verbose || exit 1
25
30
 
26
31
libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
27
32
if [ "x$libtoolize" = "x" ]; then
41
46
# and libtool 1.4 by simply rerunning the buildconf script.
42
47
(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
43
48
 
44
 
$libtoolize --copy --automake
 
49
$libtoolize --copy --automake --force $verbose
45
50
 
46
51
if [ -f libtool.m4 ]; then 
47
52
   ltfile=`pwd`/libtool.m4
86
91
# Generate the autoconf header and ./configure
87
92
#
88
93
echo "Creating include/arch/unix/apr_private.h.in ..."
89
 
${AUTOHEADER:-autoheader}
 
94
${AUTOHEADER:-autoheader} $verbose
90
95
 
91
96
echo "Creating configure ..."
92
97
### do some work to toss config.cache?
93
 
${AUTOCONF:-autoconf}
 
98
${AUTOCONF:-autoconf} $verbose
94
99
 
95
100
# Remove autoconf 2.5x's cache directory
96
101
rm -rf autom4te*.cache
97
102
 
98
103
echo "Generating 'make' outputs ..."
99
 
build/gen-build.py make
 
104
build/gen-build.py $verbose make
100
105
 
101
106
# Create RPM Spec file
102
107
if [ -f `which cut` ]; then