diff options
| author | Alexander Wirt <formorer@debian.org> | 2014-09-19 10:15:13 +0200 |
|---|---|---|
| committer | Alexander Wirt <formorer@debian.org> | 2014-09-19 10:15:13 +0200 |
| commit | 9f760e5d3f6b44ecf5bb7144517e022fd987fa76 (patch) | |
| tree | a19ccbfccc5049ee3a8252725191af221f31b3ea /m4/libtool.m4 | |
| parent | 6b61aefbf3de71852386f5f26d60c10ef62407d3 (diff) | |
| download | conntrack-tools-9f760e5d3f6b44ecf5bb7144517e022fd987fa76.tar.gz conntrack-tools-9f760e5d3f6b44ecf5bb7144517e022fd987fa76.zip | |
Imported Upstream version 1.4.2
Diffstat (limited to 'm4/libtool.m4')
| -rw-r--r-- | m4/libtool.m4 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 534d1cc..02b4bbe 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1324,7 +1324,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1688,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else |