1 --- icedove-3.1/mozilla/configure.in~ 2010-07-23 12:04:13.419122641 +0300
2 +++ icedove-3.1/mozilla/configure.in 2010-07-23 12:05:09.659376310 +0300
6 if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
7 - echo "cross compiling from $host to $target"
11 - _SAVE_CFLAGS="$CFLAGS"
12 - _SAVE_LDFLAGS="$LDFLAGS"
14 - AC_MSG_CHECKING([for host c compiler])
15 - AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc cl icc, "")
16 - if test -z "$HOST_CC"; then
17 - AC_MSG_ERROR([no acceptable c compiler found in \$PATH])
19 - AC_MSG_RESULT([$HOST_CC])
20 - AC_MSG_CHECKING([for host c++ compiler])
21 - AC_CHECK_PROGS(HOST_CXX, $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc, "")
22 - if test -z "$HOST_CXX"; then
23 - AC_MSG_ERROR([no acceptable c++ compiler found in \$PATH])
25 - AC_MSG_RESULT([$HOST_CXX])
27 - if test -z "$HOST_CFLAGS"; then
28 - HOST_CFLAGS="$CFLAGS"
30 - if test -z "$HOST_CXXFLAGS"; then
31 - HOST_CXXFLAGS="$CXXFLAGS"
33 - if test -z "$HOST_LDFLAGS"; then
34 - HOST_LDFLAGS="$LDFLAGS"
36 - AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :)
37 - AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :)
39 - CFLAGS="$HOST_CFLAGS"
40 - LDFLAGS="$HOST_LDFLAGS"
42 - AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
43 - AC_TRY_COMPILE([], [return(0);],
44 - [ac_cv_prog_hostcc_works=1
45 - AC_MSG_RESULT([yes])],
46 - AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
49 - CFLAGS="$HOST_CXXFLAGS"
51 - AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
52 - AC_TRY_COMPILE([], [return(0);],
53 - [ac_cv_prog_hostcxx_works=1
54 - AC_MSG_RESULT([yes])],
55 - AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
58 - CFLAGS=$_SAVE_CFLAGS
59 - LDFLAGS=$_SAVE_LDFLAGS
61 - case "$build:$target" in
62 - powerpc-apple-darwin8*:i?86-apple-darwin*)
63 - dnl The Darwin cross compiler doesn't necessarily point itself at a
64 - dnl root that has libraries for the proper architecture, it defaults
65 - dnl to the system root. The libraries in the system root on current
66 - dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
67 - dnl checks will fail. Fake a working SDK in that case.
68 - _SAVE_CFLAGS=$CFLAGS
69 - _SAVE_CXXFLAGS=$CXXLAGS
70 - dnl 1.9.2 support 10.4, 1.9.3 and later don't.
71 - if test "$MOZILLA_1_9_2_BRANCH" = "1";
73 - CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
74 - CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
76 - CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CFLAGS"
77 - CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CXXFLAGS"
82 - AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
85 - AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
86 - unset ac_cv_prog_CXX
89 - case "$build:$target" in
90 - powerpc-apple-darwin8*:i?86-apple-darwin*)
91 - dnl Revert the changes made above. From this point on, the target
92 - dnl compiler will never be used without applying the SDK to CFLAGS
93 - dnl (see --with-macos-sdk below).
94 - CFLAGS=$_SAVE_CFLAGS
95 - CXXFLAGS=$_SAVE_CXXFLAGS
99 - AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
100 - AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
101 - MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
102 - AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
103 - AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
104 - AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
105 - AC_DEFINE(CROSS_COMPILE)
106 + echo >&2 Cross compile block breaks whole configure script, be first to figure it out and fix it