← Back to branch summary

~ubuntu-branches/ubuntu/precise/apache2/precise

« back to all changes in this revision

Viewing changes to srclib/apr/build/libtool.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/build/libtool.m4
631
631
      esac
632
632
      ;;
633
633
    *64-bit*)
 
634
      libsuff=64
634
635
      case $host in
635
636
        x86_64-*kfreebsd*-gnu)
636
637
          LD="${LD-ld} -m elf_x86_64_fbsd"
1693
1694
  # Some rework will be needed to allow for fast_install
1694
1695
  # before this can be enabled.
1695
1696
  hardcode_into_libs=yes
 
1697
  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
 
1698
  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1696
1699
 
1697
1700
  # Append ld.so.conf contents to the search path
1698
1701
  if test -f /etc/ld.so.conf; then
1699
1702
    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' ' '`
1700
 
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 
1703
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1701
1704
  fi
1702
1705
 
1703
1706
  # We used to test for /lib/ld.so.1 and disable shared libraries on