← Back to branch summary

~ubuntu-branches/ubuntu/raring/grilo/raring-proposed

« back to all changes in this revision

Viewing changes to m4/libtool.m4

  • Committer: Package Import Robot
  • Author(s): Alberto Garcia
  • Date: 2012-12-01 13:22:37 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20121201132237-gktet8hvxd6btaz0
Tags: 0.2.4-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/libtool.m4
1324
1324
            LD="${LD-ld} -m elf_i386_fbsd"
1325
1325
            ;;
1326
1326
          x86_64-*linux*)
1327
 
            LD="${LD-ld} -m elf_i386"
 
1327
            case `/usr/bin/file conftest.o` in
 
1328
              *x86-64*)
 
1329
                LD="${LD-ld} -m elf32_x86_64"
 
1330
                ;;
 
1331
              *)
 
1332
                LD="${LD-ld} -m elf_i386"
 
1333
                ;;
 
1334
            esac
1328
1335
            ;;
1329
1336
          ppc64-*linux*|powerpc64-*linux*)
1330
1337
            LD="${LD-ld} -m elf32ppclinux"
1688
1695
    ;;
1689
1696
  *)
1690
1697
    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
1691
 
    if test -n "$lt_cv_sys_max_cmd_len"; then
 
1698
    if test -n "$lt_cv_sys_max_cmd_len" && \
 
1699
        test undefined != "$lt_cv_sys_max_cmd_len"; then
1692
1700
      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
1693
1701
      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
1694
1702
    else