← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cheese/quantal

« back to all changes in this revision

Viewing changes to m4/libtool.m4

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2011-11-22 15:02:36 UTC
  • Revision ID: package-import@ubuntu.com-20111122150236-6fs4o0adktyojxm2
Tags: 3.2.2-0ubuntu2
* debian/control:
  - Drop Vcs-Bzr and update maintainer; this is in universe, not maintained
    by the Desktop Team.
* debian/patches/debian-changes-3.2.2-0ubuntu1:
  - Dropped, looks like an accidental change
* debian/patches/add-missing-cheese-common-vapi.patch:
  - Add missing file from the tarball, grabbed from bzr.  Fixes FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/libtool.m4
2421
2421
    *) objformat=elf ;;
2422
2422
    esac
2423
2423
  fi
2424
 
  # Handle Gentoo/FreeBSD as it was Linux
2425
 
  case $host_vendor in
2426
 
    gentoo)
2427
 
      version_type=linux ;;
2428
 
    *)
2429
 
      version_type=freebsd-$objformat ;;
2430
 
  esac
2431
 
 
 
2424
  version_type=freebsd-$objformat
2432
2425
  case $version_type in
2433
2426
    freebsd-elf*)
2434
2427
      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
2439
2432
      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
2440
2433
      need_version=yes
2441
2434
      ;;
2442
 
    linux)
2443
 
      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2444
 
      soname_spec='${libname}${release}${shared_ext}$major'
2445
 
      need_lib_prefix=no
2446
 
      need_version=no
2447
 
      ;;
2448
2435
  esac
2449
2436
  shlibpath_var=LD_LIBRARY_PATH
2450
2437
  case $host_os in
2623
2610
  # before this can be enabled.
2624
2611
  hardcode_into_libs=yes
2625
2612
 
 
2613
  # Add ABI-specific directories to the system library path.
 
2614
  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
2615
 
2626
2616
  # Append ld.so.conf contents to the search path
2627
2617
  if test -f /etc/ld.so.conf; then
2628
2618
    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;s/"//g;/^$/d' | tr '\n' ' '`
2629
 
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 
2619
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 
2620
 
2630
2621
  fi
2631
2622
 
2632
2623
  # We used to test for /lib/ld.so.1 and disable shared libraries on