1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
--- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
+++ configure.in 2011-12-19 15:51:19.000000000 +0100
@@ -1410,7 +1410,7 @@
CPU_ARCH=sparc
;;
-x86_64 | ia64)
+amd64 | x86_64 | ia64)
CPU_ARCH="$OS_TEST"
;;
@@ -1430,7 +1430,7 @@
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
- x86_64|i?86)
+ amd64|x86_64|i?86)
INTEL_ARCHITECTURE=1
esac
@@ -1753,7 +1753,7 @@
esac
case "${host_cpu}" in
- x86_64)
+ amd64 | x86_64)
HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
;;
esac
@@ -2415,6 +2415,9 @@
x86_64-*)
AC_DEFINE(_AMD64_)
;;
+ amd64*)
+ AC_DEFINE(_AMD64_)
+ ;;
*)
AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
;;
@@ -2486,7 +2489,7 @@
else
DLL_SUFFIX=".so.1.0"
fi
- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -3304,11 +3307,11 @@
;;
*)
MOZ_CHECK_PTHREADS(pthreads,
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
MOZ_CHECK_PTHREADS(pthread,
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
MOZ_CHECK_PTHREADS(c_r,
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
MOZ_CHECK_PTHREADS(c,
USE_PTHREADS=1
)
@@ -3383,18 +3386,18 @@
*-*-freebsd*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
+ dnl -pthread links in -pthread, so don't specify it explicitly.
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
else
- _PTHREAD_LDFLAGS="-lc_r"
+ _PTHREAD_LDFLAGS="-pthread"
fi
;;
*-*-openbsd*|*-*-bsdi*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
+ dnl -pthread links in -pthread, so don't specify it explicitly.
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
fi
@@ -3569,7 +3572,7 @@
ac_cv_func_iconv,
[AC_TRY_LINK([
#include <stdlib.h>
- #include <iconv.h>
+ #include "/usr/local/include/iconv.h"
],
[
iconv_t h = iconv_open("", "");
@@ -3590,7 +3593,7 @@
ac_cv_func_const_iconv,
[AC_TRY_COMPILE([
#include <stdlib.h>
- #include <iconv.h>
+ #include "/usr/local/include/iconv.h"
],
[
const char *input = "testing";
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
fi
|
