]>
Commit | Line | Data |
---|---|---|
b2d1d7af JB |
1 | --- mozilla/configure.in.orig 2006-11-02 14:42:28.649505000 +0100 |
2 | +++ mozilla/configure.in 2006-11-02 15:29:44.879505000 +0100 | |
3 | @@ -61,6 +61,9 @@ | |
4 | ||
5 | AC_PREREQ(2.13) | |
6 | AC_INIT(config/config.mk) | |
7 | +dnl MOZ_READ_MOZCONFIG([.]) | |
8 | +_AUTOCONF_TOOLS_DIR="`dirname [$]0`/build/autoconf" | |
9 | +. `dirname [$]0`/build/autoconf/mozconfig2configure | |
10 | AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) | |
11 | AC_CANONICAL_SYSTEM | |
12 | TARGET_CPU="${target_cpu}" | |
13 | @@ -388,17 +391,17 @@ | |
14 | # Make sure compilers are valid | |
15 | CFLAGS="$CFLAGS -TC -nologo" | |
16 | CXXFLAGS="$CXXFLAGS -TP -nologo" | |
17 | - AC_LANG_SAVE | |
18 | - AC_LANG_C | |
19 | + AC_LANG_PUSH([C]) | |
20 | AC_TRY_COMPILE([#include <stdio.h>], | |
21 | [ printf("Hello World\n"); ],, | |
22 | AC_MSG_ERROR([\$(CC) test failed. You must have MS VC++ in your path to build.]) ) | |
23 | + AC_LANG_POP | |
24 | ||
25 | - AC_LANG_CPLUSPLUS | |
26 | + AC_LANG_PUSH([C++]) | |
27 | AC_TRY_COMPILE([#include <new.h>], | |
28 | [ unsigned *test = new unsigned(42); ],, | |
29 | AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) ) | |
30 | - AC_LANG_RESTORE | |
31 | + AC_LANG_POP | |
32 | ||
33 | _MSVC_VER_FILTER='s|.* \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*|\1|p' | |
34 | ||
35 | @@ -705,12 +708,12 @@ | |
36 | fi | |
37 | ||
38 | AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination]) | |
39 | - AC_LANG_CPLUSPLUS | |
40 | + AC_LANG_PUSH([C++]) | |
41 | AC_TRY_COMPILE([#include <new> | |
42 | int main() { return 0; }], | |
43 | result=yes, | |
44 | result=no) | |
45 | - AC_LANG_RESTORE | |
46 | + AC_LANG_POP | |
47 | AC_MSG_RESULT($result) | |
48 | ||
49 | if test "$result" = "no" ; then | |
50 | @@ -770,6 +773,9 @@ | |
51 | dnl ======================================================== | |
52 | dnl set the defaults first | |
53 | dnl ======================================================== | |
54 | +m4_pattern_allow([AS_BIN]) | |
55 | +m4_pattern_allow([AS_DASH_C_FLAG]) | |
56 | +m4_pattern_allow([AS_PERL]) | |
57 | AS_BIN=$AS | |
58 | AR_FLAGS='cr $@' | |
59 | AR_LIST='$(AR) t' | |
60 | @@ -1217,8 +1223,7 @@ | |
61 | dnl Checking for 64-bit OS | |
62 | dnl ======================================================== | |
63 | if test "$COMPILE_ENVIRONMENT"; then | |
64 | -AC_LANG_SAVE | |
65 | -AC_LANG_C | |
66 | +AC_LANG_PUSH([C]) | |
67 | AC_MSG_CHECKING(for 64-bit OS) | |
68 | AC_TRY_RUN([ int main () { | |
69 | if (sizeof(long) == 8) { return 0; } return 1; } ], | |
70 | @@ -1235,7 +1240,7 @@ | |
71 | solaris*) TARGET_NSPR_MDCPUCFG='\"md/_solaris64.cfg\"' ;; | |
72 | esac | |
73 | fi | |
74 | -AC_LANG_RESTORE | |
75 | +AC_LANG_POP | |
76 | fi # COMPILE_ENVIRONMENT | |
77 | ||
78 | dnl ======================================================== | |
79 | @@ -1353,8 +1358,7 @@ | |
80 | MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@' | |
81 | MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@' | |
82 | if test "$COMPILE_ENVIRONMENT"; then | |
83 | - AC_LANG_SAVE | |
84 | - AC_LANG_CPLUSPLUS | |
85 | + AC_LANG_PUSH([C++]) | |
86 | AC_MSG_CHECKING([for VisualAge C++ compiler version >= 5.0.2.0]) | |
87 | AC_TRY_COMPILE([], | |
88 | [#if (__IBMCPP__ < 502) | |
89 | @@ -1367,7 +1371,7 @@ | |
90 | else | |
91 | AC_MSG_RESULT([yes]) | |
92 | fi | |
93 | - AC_LANG_RESTORE | |
94 | + AC_LANG_POP | |
95 | TARGET_COMPILER_ABI="ibmc" | |
96 | CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'` | |
97 | CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'` | |
98 | @@ -2149,8 +2153,7 @@ | |
99 | CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | |
100 | CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | |
101 | AC_MSG_CHECKING([for Forte compiler version >= WS6U2]) | |
102 | - AC_LANG_SAVE | |
103 | - AC_LANG_CPLUSPLUS | |
104 | + AC_LANG_PUSH([C++]) | |
105 | AC_TRY_COMPILE([], | |
106 | [#if (__SUNPRO_CC < 0x530) | |
107 | #error "Denied" | |
108 | @@ -2163,7 +2166,7 @@ | |
109 | _res="yes" | |
110 | fi | |
111 | AC_MSG_RESULT([$_res]) | |
112 | - AC_LANG_RESTORE | |
113 | + AC_LANG_POP | |
114 | else | |
115 | ASFLAGS="$ASFLAGS -fPIC" | |
116 | DSO_LDOPTS='-G' | |
117 | @@ -2483,8 +2486,7 @@ | |
118 | dnl only have short-wchar support for c++. | |
119 | dnl Note that we assume that mac & win32 have short wchar (see nscore.h) | |
120 | ||
121 | - AC_LANG_SAVE | |
122 | - AC_LANG_CPLUSPLUS | |
123 | + AC_LANG_PUSH([C++]) | |
124 | _SAVE_CXXFLAGS=$CXXFLAGS | |
125 | CXXFLAGS="$CXXFLAGS -fshort-wchar" | |
126 | ||
127 | @@ -2504,7 +2506,7 @@ | |
128 | else | |
129 | CXXFLAGS=$_SAVE_CXXFLAGS | |
130 | fi | |
131 | - AC_LANG_RESTORE | |
132 | + AC_LANG_POP | |
133 | fi | |
134 | ||
135 | dnl Check for .hidden assembler directive and visibility attribute. | |
136 | @@ -2652,10 +2654,10 @@ | |
137 | *-darwin*) | |
138 | ;; | |
139 | *) | |
140 | - AC_CHECK_LIB(dl, dlopen, | |
141 | - AC_CHECK_HEADER(dlfcn.h, | |
142 | + AC_CHECK_LIB(dl, dlopen,[ | |
143 | + AC_CHECK_HEADER(dlfcn.h,[ | |
144 | LIBS="-ldl $LIBS" | |
145 | - AC_DEFINE(HAVE_LIBDL))) | |
146 | + AC_DEFINE(HAVE_LIBDL)])]) | |
147 | ;; | |
148 | esac | |
149 | if test ! "$GNU_CXX"; then | |
150 | @@ -2984,8 +2986,7 @@ | |
151 | dnl check for wcrtomb/mbrtowc | |
152 | dnl ======================================================================= | |
153 | if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then | |
154 | -AC_LANG_SAVE | |
155 | -AC_LANG_CPLUSPLUS | |
156 | +AC_LANG_PUSH([C++]) | |
157 | AC_CACHE_CHECK(for wcrtomb, | |
158 | ac_cv_have_wcrtomb, | |
159 | [AC_TRY_LINK([#include <wchar.h>], | |
160 | @@ -3004,7 +3005,7 @@ | |
161 | if test "$ac_cv_have_mbrtowc" = "yes"; then | |
162 | AC_DEFINE(HAVE_MBRTOWC) | |
163 | fi | |
164 | -AC_LANG_RESTORE | |
165 | +AC_LANG_POP | |
166 | fi | |
167 | ||
168 | AC_CACHE_CHECK( | |
169 | @@ -4050,8 +4051,7 @@ | |
170 | _SAVE_LDFLAGS=$LDFLAGS | |
171 | QT_LDFLAGS=-L${QTDIR}/lib | |
172 | LDFLAGS="$LDFLAGS $QT_LDFLAGS" | |
173 | - AC_LANG_SAVE | |
174 | - AC_LANG_CPLUSPLUS | |
175 | + AC_LANG_PUSH([C++]) | |
176 | AC_CHECK_LIB(qt, main, QT_LIB=-lqt, | |
177 | AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt, | |
178 | AC_MSG_ERROR([Cannot find QT libraries.]))) | |
179 | @@ -4082,7 +4082,7 @@ | |
180 | CXXFLAGS=$_SAVE_CXXFLAGS | |
181 | LIBS=$_SAVE_LIBS | |
182 | ||
183 | - AC_LANG_RESTORE | |
184 | + AC_LANG_POP | |
185 | fi | |
186 | fi # COMPILE_ENVIRONMENT | |
187 | ||
188 | @@ -5275,13 +5275,12 @@ | |
189 | dnl AC_MSG_ERROR([Gdiplus.h not found!])) | |
190 | dnl So do this instead: | |
191 | AC_MSG_CHECKING(for Gdiplus.h) | |
192 | - AC_LANG_SAVE | |
193 | - AC_LANG_CPLUSPLUS | |
194 | + AC_LANG_PUSH([C++]) | |
195 | AC_TRY_COMPILE([#include <windows.h> | |
196 | #include <unknwn.h> | |
197 | #include <Gdiplus.h>],,AC_MSG_RESULT(yes), | |
198 | AC_MSG_ERROR([Building the SVG GDI+ renderer requires an appropriate Microsoft SDK.])) | |
199 | - AC_LANG_RESTORE | |
200 | + AC_LANG_POP | |
201 | AC_DEFINE(MOZ_SVG_RENDERER_GDIPLUS) | |
202 | ;; | |
203 | ||
204 | @@ -5868,10 +5867,9 @@ | |
205 | MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= ) | |
206 | if test "$COMPILE_ENVIRONMENT"; then | |
207 | if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then | |
208 | - AC_LANG_SAVE | |
209 | - AC_LANG_CPLUSPLUS | |
210 | + AC_LANG_PUSH([C++]) | |
211 | AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual) | |
212 | - AC_LANG_RESTORE | |
213 | + AC_LANG_POP | |
214 | AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS) | |
215 | fi | |
216 | fi # COMPILE_ENVIRONMENT | |
217 | @@ -6012,10 +6010,9 @@ | |
218 | dnl = Support for demangling undefined symbols | |
219 | dnl ======================================================== | |
220 | if test -z "$SKIP_LIBRARY_CHECKS"; then | |
221 | - AC_LANG_SAVE | |
222 | - AC_LANG_CPLUSPLUS | |
223 | + AC_LANG_PUSH([C++]) | |
224 | AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=) | |
225 | - AC_LANG_RESTORE | |
226 | + AC_LANG_POP | |
227 | fi | |
228 | ||
229 | # Demangle only for debug or trace-malloc builds | |
230 | @@ -6966,12 +6963,11 @@ | |
231 | dnl older versions of glib do not seem to have gmodule which ctl needs | |
232 | _SAVE_CFLAGS=$CFLAGS | |
233 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
234 | - AC_LANG_SAVE | |
235 | - AC_LANG_C | |
236 | + AC_LANG_PUSH([C]) | |
237 | AC_TRY_COMPILE([#include <gmodule.h>], | |
238 | [ int x = 1; x++; ],, | |
239 | [AC_MSG_ERROR([Cannot build ctl without gmodule support in glib.])]) | |
240 | - AC_LANG_RESTORE | |
241 | + AC_LANG_POP | |
242 | CFLAGS=$_SAVE_CFLAGS | |
243 | AC_DEFINE(SUNCTL) | |
244 | fi | |
245 | @@ -7523,7 +7519,7 @@ | |
246 | if test -n "$HAVE_64BIT_OS"; then | |
247 | ac_configure_args="$ac_configure_args --enable-64bit" | |
248 | fi | |
249 | - AC_OUTPUT_SUBDIRS(nsprpub) | |
250 | + AC_CONFIG_SUBDIRS(nsprpub) | |
251 | ac_configure_args="$_SUBDIR_CONFIG_ARGS" | |
252 | fi | |
253 | ||
254 | @@ -7569,7 +7565,7 @@ | |
255 | if test -n "$HAVE_64BIT_OS"; then | |
256 | ac_configure_args="$ac_configure_args --enable-64bit" | |
257 | fi | |
258 | - AC_OUTPUT_SUBDIRS(directory/c-sdk) | |
259 | + AC_CONFIG_SUBDIRS(directory/c-sdk) | |
260 | ac_configure_args="$_SUBDIR_CONFIG_ARGS" | |
261 | fi | |
262 | fi # COMPILE_ENVIRONMENT | |
263 | --- mozilla/build/autoconf/altoptions.m4.orig 2006-11-02 15:09:27.229505000 +0100 | |
264 | +++ mozilla/build/autoconf/altoptions.m4 2006-11-02 15:13:14.929505000 +0100 | |
265 | @@ -145,12 +145,13 @@ | |
266 | ]) | |
267 | ||
268 | dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file | |
269 | -AC_DEFUN(MOZ_READ_MOZCONFIG, | |
270 | +AC_DEFUN([MOZ_READ_MOZCONFIG], | |
271 | [AC_REQUIRE([AC_INIT_BINSH])dnl | |
272 | # Read in '.mozconfig' script to set the initial options. | |
273 | # See the mozconfig2configure script for more details. | |
274 | _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf | |
275 | -. $_AUTOCONF_TOOLS_DIR/mozconfig2configure]) | |
276 | +. $_AUTOCONF_TOOLS_DIR/mozconfig2configure | |
277 | +]) | |
278 | ||
279 | dnl This gets inserted at the top of the configure script | |
280 | -MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR) | |
281 | +dnl MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR) |