+++ /dev/null
---- firefox-2.0+0dfsg.orig/extensions/spellcheck/myspell/src/Makefile.in
-+++ firefox-2.0+0dfsg/extensions/spellcheck/myspell/src/Makefile.in
-@@ -60,15 +60,18 @@
- xulapp \
- $(NULL)
-
--CPPSRCS = affentry.cpp \
-+CPPSRCS = mozMySpell.cpp \
-+ mozMySpellFactory.cpp \
-+ $(NULL)
-+ifndef MOZ_NATIVE_MYSPELL
-+CPPSRCS += affentry.cpp \
- affixmgr.cpp \
- hashmgr.cpp \
- suggestmgr.cpp \
- csutil.cpp \
- myspell.cpp \
-- mozMySpell.cpp \
-- mozMySpellFactory.cpp \
- $(NULL)
-+endif
-
- ifdef MOZ_XUL_APP
- CPPSRCS += mozMySpellDirProvider.cpp
-@@ -79,6 +82,7 @@
- $(XPCOM_LIBS) \
- $(NSPR_LIBS) \
- $(MOZ_UNICHARUTIL_LIBS) \
-+ $(MOZ_MYSPELL_LIBS) \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
---- firefox-2.0+0dfsg.orig/configure
-+++ firefox-2.0+0dfsg/configure
-@@ -60,6 +60,8 @@
- --with-system-png[=PFX]
- Use system libpng [installed at prefix PFX]"
- ac_help="$ac_help
-+ --enable-system-myspell Use system myspell (located with pkgconfig)"
-+ac_help="$ac_help
- --with-java-include-path=dir Location of Java SDK headers"
- ac_help="$ac_help
- --with-java-bin-path=dir Location of Java binaries (java, javac, jar)"
-@@ -12011,6 +11953,116 @@
-
- fi # SKIP_LIBRARY_CHECKS
-
-+# Check whether --enable-system-myspell or --disable-system-myspell was given.
-+if test "${enable_system_myspell+set}" = set; then
-+ enableval="$enable_system_myspell"
-+ if test "$enableval" = "yes"; then
-+ SYSTEM_MYSPELL=1
-+ elif test "$enableval" = "no"; then
-+ :
-+ else
-+ { echo "configure: error: Option, system-myspell, does not take an argument ($enableval)." 1>&2; exit 1; }
-+ fi
-+fi
-+
-+
-+if test -n "$SYSTEM_MYSPELL"; then
-+
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:11978: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ case "$PKG_CONFIG" in
-+ /*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ ?:/*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
-+esac
-+fi
-+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+if test -n "$PKG_CONFIG"; then
-+ echo "$ac_t""$PKG_CONFIG" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ echo $ac_n "checking for myspell""... $ac_c" 1>&6
-+echo "configure:12022: checking for myspell" >&5
-+
-+ if $PKG_CONFIG --exists "myspell" ; then
-+ echo "$ac_t""yes" 1>&6
-+ succeeded=yes
-+
-+ echo $ac_n "checking MOZ_MYSPELL_CFLAGS""... $ac_c" 1>&6
-+echo "configure:12029: checking MOZ_MYSPELL_CFLAGS" >&5
-+ MOZ_MYSPELL_CFLAGS=`$PKG_CONFIG --cflags "myspell"`
-+ echo "$ac_t""$MOZ_MYSPELL_CFLAGS" 1>&6
-+
-+ echo $ac_n "checking MOZ_MYSPELL_LIBS""... $ac_c" 1>&6
-+echo "configure:12034: checking MOZ_MYSPELL_LIBS" >&5
-+ ## don't use --libs since that can do evil things like add
-+ ## -Wl,--export-dynamic
-+ MOZ_MYSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"myspell\"` `$PKG_CONFIG --libs-only-l \"myspell\"`"
-+ echo "$ac_t""$MOZ_MYSPELL_LIBS" 1>&6
-+ else
-+ MOZ_MYSPELL_CFLAGS=""
-+ MOZ_MYSPELL_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ MOZ_MYSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "myspell"`
-+ echo $MOZ_MYSPELL_PKG_ERRORS
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ :
-+ else
-+ { echo "configure: error: Library requirements (myspell) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
-+ fi
-+
-+fi
-+
-+
-+
-+
- JAVA_INCLUDE_PATH=
- # Check whether --with-java-include-path or --without-java-include-path was given.
- if test "${with_java_include_path+set}" = set; then
-@@ -20291,10 +20347,13 @@
- s%@NSS_CONFIG@%$NSS_CONFIG%g
- s%@NSS_CFLAGS@%$NSS_CFLAGS%g
- s%@NSS_LIBS@%$NSS_LIBS%g
-+s%@PKG_CONFIG@%$PKG_CONFIG%g
-+s%@MOZ_MYSPELL_CFLAGS@%$MOZ_MYSPELL_CFLAGS%g
-+s%@MOZ_MYSPELL_LIBS@%$MOZ_MYSPELL_LIBS%g
-+s%@SYSTEM_MYSPELL@%$SYSTEM_MYSPELL%g
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
--s%@PKG_CONFIG@%$PKG_CONFIG%g
- s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
- s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
- s%@HOST_MOC@%$HOST_MOC%g
---- firefox-2.0+0dfsg.orig/configure.in
-+++ firefox-2.0+0dfsg/configure.in
-@@ -3840,6 +3870,19 @@
-
- fi # SKIP_LIBRARY_CHECKS
-
-+dnl system MySpell Support
-+dnl ========================================================
-+MOZ_ARG_ENABLE_BOOL(system-myspell,
-+[ --enable-system-myspell Use system myspell (located with pkgconfig)],
-+ SYSTEM_MYSPELL=1 )
-+
-+if test -n "$SYSTEM_MYSPELL"; then
-+ PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
-+fi
-+
-+AC_SUBST(SYSTEM_MYSPELL)
-+AC_SUBST(MOZ_MYSPELL_LIBS)
-+
- dnl ========================================================
- dnl Java SDK support
- dnl ========================================================
---- firefox-2.0+0dfsg.orig/config/autoconf.mk.in
-+++ firefox-2.0+0dfsg/config/autoconf.mk.in
-@@ -190,6 +190,9 @@
- NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
- NECKO_COOKIES = @NECKO_COOKIES@
-
-+MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
-+MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
-+
- MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
- MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
- MOZ_NATIVE_PNG = @SYSTEM_PNG@
---- mozilla/mailnews/compose/resources/content/MsgComposeCommands.js~ 2006-12-31 00:16:49.000000000 +0200
-+++ mozilla/mailnews/compose/resources/content/MsgComposeCommands.js 2007-03-05 04:35:59.280678222 +0200
-@@ -2154,6 +2154,10 @@
- {
- langId = dictList[i];
- isoStrArray = dictList[i].split("-");
-+ // if we can't split by Mozilla locale names (en-US), try system separator (en_US)
-+ if (isoStrArray.length < 2) {
-+ isoStrArray = dictList[i].split("_");
-+ }
-
- if (languageBundle && isoStrArray[0])
- langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
---- mozilla/mail/components/compose/content/MsgComposeCommands.js~ 2007-01-16 02:37:55.000000000 +0200
-+++ mozilla/mail/components/compose/content/MsgComposeCommands.js 2007-03-05 04:37:41.320669980 +0200
-@@ -2235,6 +2235,10 @@
- {
- langId = dictList[i];
- isoStrArray = dictList[i].split("-");
-+ // if we can't split by Mozilla locale names (en-US), try system separator (en_US)
-+ if (isoStrArray.length < 2) {
-+ isoStrArray = dictList[i].split("_");
-+ }
-
- if (languageBundle && isoStrArray[0])
- langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
---- mozilla/mail/components/preferences/compose.js~ 2006-11-28 03:06:50.000000000 +0200
-+++ mozilla/mail/components/preferences/compose.js 2007-03-05 04:39:00.815779020 +0200
-@@ -337,6 +337,10 @@
- try {
- langId = dictList[i];
- isoStrArray = dictList[i].split("-");
-+ // if we can't split by Mozilla locale names (en-US), try system separator (en_US)
-+ if (isoStrArray.length < 2) {
-+ isoStrArray = dictList[i].split("_");
-+ }
-
- if (languageBundle && isoStrArray[0])
- langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
+++ /dev/null
---- icedove-3.1/mozilla/configure.in 2010-06-23 20:43:07.000000000 +0300
-+++ icedove-3.1/mozilla/configure.in 2010-07-23 12:00:43.318986326 +0300
-@@ -67,6 +67,9 @@
-
- AC_PREREQ(2.13)
- AC_INIT(config/config.mk)
-+dnl MOZ_READ_MOZCONFIG([.])
-+_AUTOCONF_TOOLS_DIR="`dirname [$]0`/mozilla/build/autoconf"
-+. `dirname [$]0`/mozilla/build/autoconf/mozconfig2configure
- MOZILLA_SRCDIR=$topsrcdir/mozilla
- AC_CONFIG_AUX_DIR(${MOZILLA_SRCDIR}/build/autoconf)
- AC_CANONICAL_SYSTEM
-@@ -375,7 +378,8 @@
-
- AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
- AC_TRY_COMPILE([], [return(0);],
-- [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+ [ac_cv_prog_hostcc_works=1
-+ AC_MSG_RESULT([yes])],
- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
-
- CC="$HOST_CXX"
-@@ -383,7 +387,8 @@
-
- AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
- AC_TRY_COMPILE([], [return(0);],
-- [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+ [ac_cv_prog_hostcxx_works=1
-+ AC_MSG_RESULT([yes])],
- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-
- CC=$_SAVE_CC
-@@ -579,17 +584,17 @@
- # Make sure compilers are valid
- CFLAGS="$CFLAGS -TC -nologo"
- CXXFLAGS="$CXXFLAGS -TP -nologo"
-- AC_LANG_SAVE
-- AC_LANG_C
-+ AC_LANG_PUSH([C])
- AC_TRY_COMPILE([#include <stdio.h>],
- [ printf("Hello World\n"); ],,
- AC_MSG_ERROR([\$(CC) test failed. You must have MS VC++ in your path to build.]) )
-+ AC_LANG_POP
-
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_TRY_COMPILE([#include <new.h>],
- [ unsigned *test = new unsigned(42); ],,
- AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
-- AC_LANG_RESTORE
-+ AC_LANG_POP
-
- changequote(,)
- _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'
-@@ -1051,14 +1056,13 @@
- fi
- fi
-
-- AC_LANG_SAVE
- AC_MSG_CHECKING([for valid compiler/Mac OS X SDK combination])
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_TRY_COMPILE([#include <new>
- int main() { return 0; }],
- result=yes,
- result=no)
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- AC_MSG_RESULT($result)
-
- if test "$result" = "no" ; then
-@@ -1079,6 +1083,9 @@
- dnl ========================================================
- dnl set the defaults first
- dnl ========================================================
-+m4_pattern_allow([AS_BIN])
-+m4_pattern_allow([AS_DASH_C_FLAG])
-+m4_pattern_allow([AS_PERL])
- AS_BIN=$AS
- AR_FLAGS='cr $@'
- AR_LIST='$(AR) t'
-@@ -1547,8 +1554,7 @@
- AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof,
- ac_has_wno_invalid_offsetof,
- [
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- _SAVE_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
- AC_TRY_COMPILE([],
-@@ -1556,7 +1562,7 @@
- ac_has_wno_invalid_offsetof="yes",
- ac_has_wno_invalid_offsetof="no")
- CXXFLAGS="$_SAVE_CXXFLAGS"
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- ])
- if test "$ac_has_wno_invalid_offsetof" = "yes"; then
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-invalid-offsetof"
-@@ -1565,8 +1571,7 @@
- AC_CACHE_CHECK(whether the compiler supports -Wno-variadic-macros,
- ac_has_wno_variadic_macros,
- [
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- _SAVE_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-variadic-macros"
- AC_TRY_COMPILE([],
-@@ -1574,7 +1579,7 @@
- ac_has_wno_variadic_macros="yes",
- ac_has_wno_variadic_macros="no")
- CXXFLAGS="$_SAVE_CXXFLAGS"
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- ])
- if test "$ac_has_wno_variadic_macros" = "yes"; then
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-variadic-macros"
-@@ -1583,8 +1588,7 @@
- AC_CACHE_CHECK(whether the compiler supports -Werror=return-type,
- ac_has_werror_return_type,
- [
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- _SAVE_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Werror=return-type"
- AC_TRY_COMPILE([],
-@@ -1592,7 +1596,7 @@
- ac_has_werror_return_type="yes",
- ac_has_werror_return_type="no")
- CXXFLAGS="$_SAVE_CXXFLAGS"
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- ])
- if test "$ac_has_werror_return_type" = "yes"; then
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=return-type"
-@@ -1656,8 +1660,8 @@
- dnl test that the macros actually work:
- AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
- AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
-- [AC_LANG_SAVE
-- AC_LANG_C
-+ [
-+ AC_LANG_PUSH([C])
- ac_cv_static_assertion_macros_work="yes"
- AC_TRY_COMPILE([$configure_static_assert_macros],
- [CONFIGURE_STATIC_ASSERT(1)],
-@@ -1667,7 +1671,8 @@
- [CONFIGURE_STATIC_ASSERT(0)],
- ac_cv_static_assertion_macros_work="no",
- )
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_POP
-+ AC_LANG_PUSH([C++])
- AC_TRY_COMPILE([$configure_static_assert_macros],
- [CONFIGURE_STATIC_ASSERT(1)],
- ,
-@@ -1676,7 +1681,7 @@
- [CONFIGURE_STATIC_ASSERT(0)],
- ac_cv_static_assertion_macros_work="no",
- )
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- ])
- AC_MSG_RESULT("$ac_cv_static_assertion_macros_work")
- if test "$ac_cv_static_assertion_macros_work" = "no"; then
-@@ -1688,8 +1693,7 @@
- dnl Checking for 64-bit OS
- dnl ========================================================
- if test "$COMPILE_ENVIRONMENT"; then
--AC_LANG_SAVE
--AC_LANG_C
-+AC_LANG_PUSH([C])
- AC_MSG_CHECKING(for 64-bit OS)
- AC_TRY_COMPILE([$configure_static_assert_macros],
- [CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8)],
-@@ -1700,7 +1704,7 @@
- HAVE_64BIT_OS=1
- fi
- AC_SUBST(HAVE_64BIT_OS)
--AC_LANG_RESTORE
-+AC_LANG_POP
- fi # COMPILE_ENVIRONMENT
-
- dnl ========================================================
-@@ -1830,8 +1834,7 @@
- MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- if test "$COMPILE_ENVIRONMENT"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_MSG_CHECKING([for VisualAge C++ compiler version >= 6.0.0.3])
- AC_TRY_COMPILE([],
- [#if (__IBMCPP__ < 600)
-@@ -1844,7 +1847,7 @@
- else
- AC_MSG_RESULT([yes])
- fi
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- TARGET_COMPILER_ABI="ibmc"
- CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
- CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-@@ -2682,8 +2685,7 @@
- CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_TRY_COMPILE([],
- [#if (__SUNPRO_CC < 0x590)
- #error "Denied"
-@@ -2696,7 +2698,7 @@
- _res="yes"
- fi
- AC_MSG_RESULT([$_res])
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- else
- ASFLAGS="$ASFLAGS -fPIC"
- DSO_LDOPTS='-G'
-@@ -2808,7 +2810,7 @@
- if test -z "$SKIP_COMPILER_CHECKS"; then
- dnl Checks for typedefs, structures, and compiler characteristics.
- dnl ========================================================
--AC_LANG_C
-+AC_LANG_PUSH([C])
- AC_HEADER_STDC
- AC_C_CONST
- AC_TYPE_MODE_T
-@@ -2923,11 +2925,12 @@
- else
- AC_MSG_RESULT(no)
- fi
-+AC_LANG_POP
-
- dnl On the gcc trunk (as of 2001-02-09) _GNU_SOURCE, and thus __USE_GNU,
- dnl are defined when compiling C++ but not C. Since the result of this
- dnl test is used only in C++, do it in C++.
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
-
- AC_MSG_CHECKING(for uname.domainname)
- AC_CACHE_VAL(ac_cv_have_uname_domainname_field,
-@@ -3019,8 +3022,7 @@
- CXXFLAGS=$_SAVE_CXXFLAGS
- fi
- fi
--
--AC_LANG_C
-+AC_LANG_POP
-
- dnl Check for .hidden assembler directive and visibility attribute.
- dnl Borrowed from glibc configure.in
-@@ -3168,11 +3170,11 @@
-
- dnl Check whether the compiler supports the new-style C++ standard
- dnl library headers (i.e. <new>) or needs the old "new.h"
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
- NEW_H=new.h
- AC_CHECK_HEADER(new, [NEW_H=new])
- AC_DEFINE_UNQUOTED(NEW_H, <$NEW_H>)
--AC_LANG_C
-+AC_LANG_POP
-
- AC_ARG_ENABLE(dtrace,
- [ --enable-dtrace build with dtrace support if available (default=no)],
-@@ -3220,10 +3222,11 @@
- ;;
- *)
- AC_CHECK_LIB(m, atan)
-- AC_CHECK_LIB(dl, dlopen,
-- AC_CHECK_HEADER(dlfcn.h,
-+ AC_CHECK_LIB(dl, dlopen, [
-+ AC_CHECK_HEADER(dlfcn.h, [
- LIBS="-ldl $LIBS"
-- ))
-+ ])
-+ ])
- ;;
- esac
-
-@@ -3490,8 +3493,7 @@
- dnl check for wcrtomb/mbrtowc
- dnl =======================================================================
- if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
- AC_CACHE_CHECK(for wcrtomb,
- ac_cv_have_wcrtomb,
- [AC_TRY_LINK([#include <wchar.h>],
-@@ -3510,7 +3512,7 @@
- if test "$ac_cv_have_mbrtowc" = "yes"; then
- AC_DEFINE(HAVE_MBRTOWC)
- fi
--AC_LANG_RESTORE
-+AC_LANG_POP
- fi
-
- AC_CACHE_CHECK(
-@@ -3535,7 +3537,7 @@
- dnl AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
- fi
-
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
- AC_CACHE_CHECK(
- [for gnu_get_libc_version()],
- ac_cv_func_gnu_get_libc_version,
-@@ -3613,7 +3615,7 @@
-
- AM_LANGINFO_CODESET
-
--AC_LANG_C
-+AC_LANG_POP
-
- dnl **********************
- dnl *** va_copy checks ***
-@@ -3776,7 +3778,7 @@
- dnl ========================================================
- dnl Put your C++ language/feature checks below
- dnl ========================================================
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
-
- HAVE_GCC3_ABI=
- if test "$GNU_CC"; then
-@@ -4150,7 +4152,7 @@
- ac_cv_attribute_noreturn=no)])
-
- dnl End of C++ language/feature checks
--AC_LANG_C
-+AC_LANG_POP
-
- dnl ========================================================
- dnl = Internationalization checks
-@@ -6300,10 +6302,9 @@
- MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
- if test "$COMPILE_ENVIRONMENT"; then
- if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_CHECK_FUNCS(__builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual)
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
- fi
- fi # COMPILE_ENVIRONMENT
-@@ -6397,10 +6398,9 @@
- dnl = Support for demangling undefined symbols
- dnl ========================================================
- if test -z "$SKIP_LIBRARY_CHECKS"; then
-- AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-+ AC_LANG_PUSH([C++])
- AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=)
-- AC_LANG_RESTORE
-+ AC_LANG_POP
- fi
-
- # Demangle only for debug or trace-malloc builds
-@@ -6640,7 +6640,7 @@
- AC_SUBST(PROFILE_USE_CFLAGS)
- AC_SUBST(PROFILE_USE_LDFLAGS)
-
--AC_LANG_CPLUSPLUS
-+AC_LANG_PUSH([C++])
-
- dnl ========================================================
- dnl Test for -pedantic bustage
-@@ -6784,7 +6784,7 @@
- else
- AC_DEFINE(CPP_THROW_NEW, [throw()])
- fi
--AC_LANG_C
-+AC_LANG_POP
-
- dnl ========================================================
- dnl =
-@@ -7606,7 +7606,7 @@
- if test -n "$MOZ_CURRENT_PROJECT"; then
- export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
- fi
--AC_OUTPUT_SUBDIRS(mozilla)
-+AC_CONFIG_SUBDIRS(mozilla)
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
-
-@@ -7630,6 +7630,6 @@
- dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
- ac_configure_args="$ac_configure_args --enable-64bit"
- fi
-- AC_OUTPUT_SUBDIRS(directory/c-sdk)
-+ AC_CONFIG_SUBDIRS(directory/c-sdk)
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
+++ /dev/null
---- icedove-3.1/mozilla/configure.in~ 2010-07-23 12:04:13.419122641 +0300
-+++ icedove-3.1/mozilla/configure.in 2010-07-23 12:05:09.659376310 +0300
-@@ -341,105 +341,8 @@
- esac
-
- if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-- echo "cross compiling from $host to $target"
-- cross_compiling=yes
--
-- _SAVE_CC="$CC"
-- _SAVE_CFLAGS="$CFLAGS"
-- _SAVE_LDFLAGS="$LDFLAGS"
--
-- AC_MSG_CHECKING([for host c compiler])
-- AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc cl icc, "")
-- if test -z "$HOST_CC"; then
-- AC_MSG_ERROR([no acceptable c compiler found in \$PATH])
-- fi
-- AC_MSG_RESULT([$HOST_CC])
-- AC_MSG_CHECKING([for host c++ compiler])
-- AC_CHECK_PROGS(HOST_CXX, $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc, "")
-- if test -z "$HOST_CXX"; then
-- AC_MSG_ERROR([no acceptable c++ compiler found in \$PATH])
-- fi
-- AC_MSG_RESULT([$HOST_CXX])
--
-- if test -z "$HOST_CFLAGS"; then
-- HOST_CFLAGS="$CFLAGS"
-- fi
-- if test -z "$HOST_CXXFLAGS"; then
-- HOST_CXXFLAGS="$CXXFLAGS"
-- fi
-- if test -z "$HOST_LDFLAGS"; then
-- HOST_LDFLAGS="$LDFLAGS"
-- fi
-- AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :)
-- AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :)
-- CC="$HOST_CC"
-- CFLAGS="$HOST_CFLAGS"
-- LDFLAGS="$HOST_LDFLAGS"
--
-- AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-- AC_TRY_COMPILE([], [return(0);],
-- [ac_cv_prog_hostcc_works=1
-- AC_MSG_RESULT([yes])],
-- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
--
-- CC="$HOST_CXX"
-- CFLAGS="$HOST_CXXFLAGS"
--
-- AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-- AC_TRY_COMPILE([], [return(0);],
-- [ac_cv_prog_hostcxx_works=1
-- AC_MSG_RESULT([yes])],
-- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
--
-- CC=$_SAVE_CC
-- CFLAGS=$_SAVE_CFLAGS
-- LDFLAGS=$_SAVE_LDFLAGS
--
-- case "$build:$target" in
-- powerpc-apple-darwin8*:i?86-apple-darwin*)
-- dnl The Darwin cross compiler doesn't necessarily point itself at a
-- dnl root that has libraries for the proper architecture, it defaults
-- dnl to the system root. The libraries in the system root on current
-- dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
-- dnl checks will fail. Fake a working SDK in that case.
-- _SAVE_CFLAGS=$CFLAGS
-- _SAVE_CXXFLAGS=$CXXLAGS
-- dnl 1.9.2 support 10.4, 1.9.3 and later don't.
-- if test "$MOZILLA_1_9_2_BRANCH" = "1";
-- then
-- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
-- CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
-- else
-- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CFLAGS"
-- CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CXXFLAGS"
-- fi
-- ;;
-- esac
--
-- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-- unset ac_cv_prog_CC
-- AC_PROG_CC
-- AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-- unset ac_cv_prog_CXX
-- AC_PROG_CXX
--
-- case "$build:$target" in
-- powerpc-apple-darwin8*:i?86-apple-darwin*)
-- dnl Revert the changes made above. From this point on, the target
-- dnl compiler will never be used without applying the SDK to CFLAGS
-- dnl (see --with-macos-sdk below).
-- CFLAGS=$_SAVE_CFLAGS
-- CXXFLAGS=$_SAVE_CXXFLAGS
-- ;;
-- esac
--
-- AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
-- AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
-- MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
-- AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
-- AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
-- AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
-- AC_DEFINE(CROSS_COMPILE)
-+ echo >&2 Cross compile block breaks whole configure script, be first to figure it out and fix it
-+ exit 1
- else
- AC_PROG_CC
- AC_PROG_CXX
projects / packages / icedove.git / commitdiff