← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to srclib/apr-util/xml/expat/aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-07-26 20:21:37 UTC
  • mfrom: (14.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100726202137-rctltspkiazb40z1
Tags: 2.2.16-1ubuntu1
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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/xml/expat/aclocal.m4
633
633
      esac
634
634
      ;;
635
635
    *64-bit*)
636
 
      libsuff=64
637
636
      case $host in
638
637
        x86_64-*kfreebsd*-gnu)
639
638
          LD="${LD-ld} -m elf_x86_64_fbsd"
1696
1695
  # Some rework will be needed to allow for fast_install
1697
1696
  # before this can be enabled.
1698
1697
  hardcode_into_libs=yes
1699
 
  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
1700
 
  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1701
1698
 
1702
1699
  # Append ld.so.conf contents to the search path
1703
1700
  if test -f /etc/ld.so.conf; then
1704
1701
    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1705
 
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 
1702
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1706
1703
  fi
1707
1704
 
1708
1705
  # We used to test for /lib/ld.so.1 and disable shared libraries on