← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/apache2/oneiric-updates

« back to all changes in this revision

Viewing changes to srclib/apr-util/build/find_apu.m4

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-22 13:02:08 UTC
  • mfrom: (14.3.23 sid)
  • Revision ID: james.westby@ubuntu.com-20110222130208-5hrxnun6a8uygfhv
Tags: 2.2.17-1ubuntu1
* 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
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/build/find_apu.m4
185
185
    fi
186
186
    dnl if we have not found anything yet and have bundled source, use that
187
187
    if test "$apu_found" = "no" && test -d "$1"; then
188
 
      apu_temp_abs_srcdir="`cd $1 && pwd`"
 
188
      apu_temp_abs_srcdir="`cd \"$1\" && pwd`"
189
189
      apu_found="reconfig"
190
190
      apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
191
191
      case $apu_bundled_major in