--- xulrunner-1.8.1.14+nobinonly.orig/configure +++ xulrunner-1.8.1.14+nobinonly/configure @@ -8082,8 +8082,7 @@ echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ "$ac_cv_have_visibility_class_bug" = "no"; then - VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - WRAP_SYSTEM_INCLUDES=1 + VISIBILITY_FLAGS='-fvisibility=hidden' else VISIBILITY_FLAGS='-fvisibility=hidden' fi # have visibility pragma bug @@ -10957,7 +10956,7 @@ X x(3); ; return 0; } EOF -if { (eval echo configure:10961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/65_mouse_buttons.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/65_mouse_buttons.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_mouse_buttons.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Extended mouse buttons support taken from #244305. Thanks Peter Colberg + +@DPATCH@ + +=== widget/src/gtk2/nsWindow.cpp +================================================================== +--- xulrunner/widget/src/gtk2/nsWindow.cpp (revision 72) ++++ xulrunner/widget/src/gtk2/nsWindow.cpp (local) +@@ -1543,6 +1543,9 @@ + return; + + switch (aEvent->button) { ++ case 1: ++ eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ break; + case 2: + eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN; + break; +@@ -1550,7 +1553,7 @@ + eventType = NS_MOUSE_RIGHT_BUTTON_DOWN; + break; + default: +- eventType = NS_MOUSE_LEFT_BUTTON_DOWN; ++ return; + break; + } + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/68_mips_performance.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/68_mips_performance.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_mips_performance.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Thiemo Seufer to increase stability and performance on mips. + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 22) ++++ xulrunner/config/rules.mk (local) +@@ -456,15 +456,6 @@ endif + endif + endif + +-ifeq ($(OS_ARCH),Linux) +-ifneq (,$(filter mips mipsel,$(OS_TEST))) +-ifeq ($(MODULE),layout) +-OS_CFLAGS += -Wa,-xgot +-OS_CXXFLAGS += -Wa,-xgot +-endif +-endif +-endif +- + # + # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag + # which uses internal symbols first +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 22) ++++ xulrunner/configure.in (local) +@@ -1481,8 +1481,6 @@ + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_crmf.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_crmf.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_crmf.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Put the crmf library before the NSS libraries + +@DPATCH@ + +diff --git a/configure.in b/configure.in +index ef57009..f92b6e4 100644 +--- a/configure.in ++++ b/configure.in +@@ -3746,7 +3746,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS=`echo $NSS_LIBS | sed 's/-l/-lcrmf &/'` + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_hunspell.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_hunspell.dpatch @@ -0,0 +1,114 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_hunspell.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use hunspell instead of myspell, and link against system library. + +@DPATCH@ + +--- iceape/config/autoconf.mk.in ++++ iceape/config/autoconf.mk.in +@@ -190,6 +190,10 @@ + NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@ + NECKO_COOKIES = @NECKO_COOKIES@ + ++MOZ_NATIVE_HUNSPELL = @SYSTEM_HUNSPELL@ ++MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@ ++MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLAGS@ ++ + MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ + MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ + MOZ_NATIVE_PNG = @SYSTEM_PNG@ +--- iceape/configure.in ++++ iceape/configure.in +@@ -3840,6 +3840,19 @@ + + fi # SKIP_LIBRARY_CHECKS + ++dnl system HunSpell Support ++dnl ======================================================== ++MOZ_ARG_ENABLE_BOOL(system-hunspell, ++[ --enable-system-hunspell Use system hunspell (located with pkgconfig)], ++ SYSTEM_HUNSPELL=1 ) ++ ++if test -n "$SYSTEM_HUNSPELL"; then ++ PKG_CHECK_MODULES(MOZ_HUNSPELL, hunspell) ++fi ++ ++AC_SUBST(SYSTEM_HUNSPELL) ++AC_SUBST(MOZ_HUNSPELL_LIBS) ++ + dnl ======================================================== + dnl Java SDK support + dnl ======================================================== +--- iceape/extensions/spellcheck/myspell/src/Makefile.in ++++ iceape/extensions/spellcheck/myspell/src/Makefile.in +@@ -60,15 +60,19 @@ + xulapp \ + $(NULL) + +-CPPSRCS = affentry.cpp \ ++CPPSRCS = mozMySpell.cpp \ ++ mozMySpellFactory.cpp \ ++ $(NULL) ++ ++ifndef MOZ_NATIVE_HUNSPELL ++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 +83,11 @@ + $(XPCOM_LIBS) \ + $(NSPR_LIBS) \ + $(MOZ_UNICHARUTIL_LIBS) \ ++ $(MOZ_HUNSPELL_LIBS) \ + $(NULL) + + include $(topsrcdir)/config/rules.mk ++ ++ifdef MOZ_NATIVE_HUNSPELL ++CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS) -DMOZ_NATIVE_HUNSPELL ++endif +--- iceape/extensions/spellcheck/myspell/src/mozMySpell.h ++++ iceape/extensions/spellcheck/myspell/src/mozMySpell.h +@@ -56,7 +56,12 @@ + #ifndef mozMySpell_h__ + #define mozMySpell_h__ + ++#if MOZ_NATIVE_HUNSPELL ++#include "hunspell.hxx" ++#define MySpell Hunspell ++#else + #include "myspell.hxx" ++#endif + #include "mozISpellCheckingEngine.h" + #include "mozIPersonalDictionary.h" + #include "nsString.h" +--- iceape/config/Makefile.in ++++ iceape/config/Makefile.in +@@ -140,6 +140,7 @@ + -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ + -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ + -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ ++ -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ + $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers + $(INSTALL) system_wrappers $(DIST)/include + +--- iceape/config/system-headers ++++ iceape/config/system-headers +@@ -934,3 +934,6 @@ + #if MOZ_NATIVE_BZ2==1 + bzlib.h + #endif ++#if MOZ_NATIVE_HUNSPELL==1 ++hunspell.hxx ++#endif --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: mozilla/configure.in +=================================================================== +--- mozilla.orig/configure.in 2007-08-21 15:52:32.000000000 +0000 ++++ mozilla/configure.in 2007-08-21 15:54:29.000000000 +0000 +@@ -2642,18 +2642,17 @@ + if test `grep -c "@PLT" conftest.S` = 0; then + ac_cv_visibility_builtin_bug=yes + fi + fi + rm -f conftest.{c,S} + ]) + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute + fi # GNU_CC + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/82_locale.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/82_locale.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_locale.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use OS locale and display it correctly. bz#331779 + +@DPATCH@ + +=== xulrunner/app/xulrunner.js +================================================================== +--- xulrunner/xulrunner/app/xulrunner.js (revision 17) ++++ xulrunner/xulrunner/app/xulrunner.js (local) +@@ -39,7 +39,8 @@ + // We need to override the default values of these preferences since all.js + // assumes these are in the navigator package, which for us is non-existant. + // XXX(darin): perhaps all.js should not be seamonkey specific +-pref("general.useragent.locale", "@AB_CD@"); ++pref("intl.locale.matchOS", true); ++pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("font.language.group", "chrome://global/locale/intl.properties"); + pref("intl.accept_languages", "chrome://global/locale/intl.properties"); + pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/00list +++ xulrunner-1.8.1.14+nobinonly/debian/patches/00list @@ -0,0 +1,81 @@ +# Nomenclature for the file ordering/naming +# First digit: +# 1 -> Has been applied in some branch upstream. +# It will eventually be applied in a release +# 2 -> Has been or will be fixed differently upstream +# 3 -> Pending upstream. Waiting to land on a branch or some review, +# or some asked modifications +# 6 -> Not yet sent upstream +# 8 -> Debian specific. This we don't want to send upstream or that +# upstream don't want to apply. +# +# Second digit: +# 0 -> Build system +# 1 -> Mostly build +# 2 -> Preferences +# 5 -> General code +# 8 -> Fix for some architectures support +# +10_components_no_exec +10_gdkpango_system_wrapper +10_icons +10_no_chromelist +10_toolkit_library +15_jni +15_pango_textarea_position +15_pyxpcom_deadcode +18_arm_xpcom_unused_attribute +20_about:plugins +25_gnome_helpers_with_params +25_xpidl +25_xrender_bug_workaround +30_cairo_xlib +30_distclean +30_embedding_tests +30_killAll +31_system_bz2 +32_print_command +35_pango_null_char +35_python_2.5 +35_zip_cache +38_arm_xpcom_optim +38_armel +38_hppa_xpcom +38_ia64_align +38_kbsd +38_gnu +38_mips_xpcom +38_sparc64_unichar_alignment +60_config_install +60_js_binary +60_pyxpcom +60_xpcomstub +61_javaxpcom +65_mouse_buttons +65_mozjs_abi +65_native_uconv +68_m68k_xpcom +68_mips_performance +80_config +80_crmf +80_hunspell +80_install_path +80_javaxpcom +80_libxpcom_hack +80_no_examples +80_no_sys_profile +80_system_libs +80_uname +80_xulrunner-config +80_zip +81_sonames +82_locale +82_prefs +85_installer +85_no_register +85_sidebar +85_URI_fixup +85_useragent +85_xpcomglue +88_force-no-pragma-visibility-for-gcc-4.2_4.3 +99_configure --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/18_arm_xpcom_unused_attribute.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/18_arm_xpcom_unused_attribute.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18_arm_xpcom_unused_attribute.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Steve Langasek to fix unused vs. used gcc attribute on arm. +## DP: bz#307418 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp (local) +@@ -45,7 +45,8 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/15_jni.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/15_jni.dpatch @@ -0,0 +1,435 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_jni.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from bz#333738 to update java stubs + +@DPATCH@ + +=== sun-java/stubs/include/jni.h +================================================================== +--- xulrunner/sun-java/stubs/include/jni.h (revision 134) ++++ xulrunner/sun-java/stubs/include/jni.h (local) +@@ -114,6 +114,8 @@ + + #endif + ++typedef jobject jweak; ++ + #if 0 /* moved to jri_md.h */ + typedef jobject jref; /* For transition---not meant to be part of public + API anymore.*/ +@@ -148,8 +150,13 @@ + * possible return values for JNI functions. + */ + +-#define JNI_OK 0 +-#define JNI_ERR (-1) ++#define JNI_OK 0 /* success */ ++#define JNI_ERR (-1) /* unknown error */ ++#define JNI_EDETACHED (-2) /* thread detached from the VM */ ++#define JNI_EVERSION (-3) /* JNI version error */ ++#define JNI_ENOMEM (-4) /* not enough memory */ ++#define JNI_EEXIST (-5) /* VM already created */ ++#define JNI_EINVAL (-6) /* invalid arguments */ + + /* + * used in ReleaseScalarArrayElements +@@ -211,16 +218,21 @@ + jclass (JNICALL *FindClass) + (JNIEnv *env, const char *name); + +- void *reserved4; +- void *reserved5; +- void *reserved6; ++ jmethodID (JNICALL *FromReflectedMethod) ++ (JNIEnv *env, jobject method); ++ jfieldID (JNICALL *FromReflectedField) ++ (JNIEnv *env, jobject field); + ++ jobject (JNICALL *ToReflectedMethod) ++ (JNIEnv *env, jclass cls, jmethodID methodID, jboolean isStatic); ++ + jclass (JNICALL *GetSuperclass) + (JNIEnv *env, jclass sub); + jboolean (JNICALL *IsAssignableFrom) + (JNIEnv *env, jclass sub, jclass sup); +- void *reserved7; + ++ jobject (JNICALL *ToReflectedField) ++ (JNIEnv *env, jclass cls, jfieldID fieldID, jboolean isStatic); + + jint (JNICALL *Throw) + (JNIEnv *env, jthrowable obj); +@@ -234,9 +246,12 @@ + (JNIEnv *env); + void (JNICALL *FatalError) + (JNIEnv *env, const char *msg); +- void *reserved8; +- void *reserved9; + ++ jint (JNICALL *PushLocalFrame) ++ (JNIEnv *env, jint capacity); ++ jobject (JNICALL *PopLocalFrame) ++ (JNIEnv *env, jobject result); ++ + jobject (JNICALL *NewGlobalRef) + (JNIEnv *env, jobject lobj); + void (JNICALL *DeleteGlobalRef) +@@ -245,8 +260,10 @@ + (JNIEnv *env, jobject obj); + jboolean (JNICALL *IsSameObject) + (JNIEnv *env, jobject obj1, jobject obj2); +- void *reserved10; +- void *reserved11; ++ jobject (JNICALL *NewLocalRef) ++ (JNIEnv *env, jobject ref); ++ jint (JNICALL *EnsureLocalCapacity) ++ (JNIEnv *env, jint capacity); + + jobject (JNICALL *AllocObject) + (JNIEnv *env, jclass clazz); +@@ -706,6 +723,36 @@ + + jint (JNICALL *GetJavaVM) + (JNIEnv *env, JavaVM **vm); ++ ++ void (JNICALL *GetStringRegion) ++ (JNIEnv *env, jstring str, jsize start, jsize len, jchar *buf); ++ void (JNICALL *GetStringUTFRegion) ++ (JNIEnv *env, jstring str, jsize start, jsize len, char *buf); ++ ++ void * (JNICALL *GetPrimitiveArrayCritical) ++ (JNIEnv *env, jarray array, jboolean *isCopy); ++ void (JNICALL *ReleasePrimitiveArrayCritical) ++ (JNIEnv *env, jarray array, void *carray, jint mode); ++ ++ const jchar * (JNICALL *GetStringCritical) ++ (JNIEnv *env, jstring string, jboolean *isCopy); ++ void (JNICALL *ReleaseStringCritical) ++ (JNIEnv *env, jstring string, const jchar *cstring); ++ ++ jweak (JNICALL *NewWeakGlobalRef) ++ (JNIEnv *env, jobject obj); ++ void (JNICALL *DeleteWeakGlobalRef) ++ (JNIEnv *env, jweak ref); ++ ++ jboolean (JNICALL *ExceptionCheck) ++ (JNIEnv *env); ++ ++ jobject (JNICALL *NewDirectByteBuffer) ++ (JNIEnv* env, void* address, jlong capacity); ++ void* (JNICALL *GetDirectBufferAddress) ++ (JNIEnv* env, jobject buf); ++ jlong (JNICALL *GetDirectBufferCapacity) ++ (JNIEnv* env, jobject buf); + }; + + /* +@@ -722,8 +769,6 @@ + + struct JNIEnv_ { + const struct JNINativeInterface_ *functions; +- void *reserved0; +- void *reserved1[6]; + #ifdef __cplusplus + + jint GetVersion() { +@@ -736,6 +781,17 @@ + jclass FindClass(const char *name) { + return functions->FindClass(this, name); + } ++ jmethodID FromReflectedMethod(jobject method) { ++ return functions->FromReflectedMethod(this,method); ++ } ++ jfieldID FromReflectedField(jobject field) { ++ return functions->FromReflectedField(this,field); ++ } ++ ++ jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) { ++ return functions->ToReflectedMethod(this, cls, methodID, isStatic); ++ } ++ + jclass GetSuperclass(jclass sub) { + return functions->GetSuperclass(this, sub); + } +@@ -743,6 +799,10 @@ + return functions->IsAssignableFrom(this, sub, sup); + } + ++ jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) { ++ return functions->ToReflectedField(this,cls,fieldID,isStatic); ++ } ++ + jint Throw(jthrowable obj) { + return functions->Throw(this, obj); + } +@@ -762,6 +822,13 @@ + functions->FatalError(this, msg); + } + ++ jint PushLocalFrame(jint capacity) { ++ return functions->PushLocalFrame(this,capacity); ++ } ++ jobject PopLocalFrame(jobject result) { ++ return functions->PopLocalFrame(this,result); ++ } ++ + jobject NewGlobalRef(jobject lobj) { + return functions->NewGlobalRef(this,lobj); + } +@@ -776,6 +843,13 @@ + return functions->IsSameObject(this,obj1,obj2); + } + ++ jobject NewLocalRef(jobject ref) { ++ return functions->NewLocalRef(this,ref); ++ } ++ jint EnsureLocalCapacity(jint capacity) { ++ return functions->EnsureLocalCapacity(this,capacity); ++ } ++ + jobject AllocObject(jclass clazz) { + return functions->AllocObject(this,clazz); + } +@@ -1726,9 +1800,71 @@ + return functions->GetJavaVM(this,vm); + } + ++ void GetStringRegion(jstring str, jsize start, jsize len, jchar *buf) { ++ functions->GetStringRegion(this,str,start,len,buf); ++ } ++ void GetStringUTFRegion(jstring str, jsize start, jsize len, char *buf) { ++ functions->GetStringUTFRegion(this,str,start,len,buf); ++ } ++ ++ void * GetPrimitiveArrayCritical(jarray array, jboolean *isCopy) { ++ return functions->GetPrimitiveArrayCritical(this,array,isCopy); ++ } ++ void ReleasePrimitiveArrayCritical(jarray array, void *carray, jint mode) { ++ functions->ReleasePrimitiveArrayCritical(this,array,carray,mode); ++ } ++ ++ const jchar * GetStringCritical(jstring string, jboolean *isCopy) { ++ return functions->GetStringCritical(this,string,isCopy); ++ } ++ void ReleaseStringCritical(jstring string, const jchar *cstring) { ++ functions->ReleaseStringCritical(this,string,cstring); ++ } ++ ++ jweak NewWeakGlobalRef(jobject obj) { ++ return functions->NewWeakGlobalRef(this,obj); ++ } ++ void DeleteWeakGlobalRef(jweak ref) { ++ functions->DeleteWeakGlobalRef(this,ref); ++ } ++ ++ jboolean ExceptionCheck() { ++ return functions->ExceptionCheck(this); ++ } ++ ++ jobject NewDirectByteBuffer(void* address, jlong capacity) { ++ return functions->NewDirectByteBuffer(this, address, capacity); ++ } ++ void* GetDirectBufferAddress(jobject buf) { ++ return functions->GetDirectBufferAddress(this, buf); ++ } ++ jlong GetDirectBufferCapacity(jobject buf) { ++ return functions->GetDirectBufferCapacity(this, buf); ++ } ++ + #endif /* __cplusplus */ + }; + ++typedef struct JavaVMOption { ++ char *optionString; ++ void *extraInfo; ++} JavaVMOption; ++ ++typedef struct JavaVMInitArgs { ++ jint version; ++ ++ jint nOptions; ++ JavaVMOption *options; ++ jboolean ignoreUnrecognized; ++} JavaVMInitArgs; ++ ++typedef struct JavaVMAttachArgs { ++ jint version; ++ ++ char *name; ++ jobject group; ++} JavaVMAttachArgs; ++ + /* These structures will be VM-specific. */ + + typedef struct JDK1_1InitArgs { +@@ -1745,7 +1881,7 @@ + + jint (JNICALL *vfprintf)(FILE *fp, const char *format, va_list args); + void (JNICALL *exit)(jint code); +- void (JNICALL *abort)(); ++ void (JNICALL *abort)(void); + + jint enableClassGC; + jint enableVerboseGC; +@@ -1759,6 +1895,9 @@ + void * __padding; /* C compilers don't allow empty structures. */ + } JDK1_1AttachArgs; + ++#define JDK1_2 ++#define JDK1_4 ++ + /* End VM-specific. */ + + struct JNIInvokeInterface_ { +@@ -1768,39 +1907,63 @@ + + jint (JNICALL *DestroyJavaVM)(JavaVM *vm); + +- jint (JNICALL *AttachCurrentThread) +- (JavaVM *vm, JNIEnv **penv, void *args); ++ jint (JNICALL *AttachCurrentThread)(JavaVM *vm, void **penv, void *args); + + jint (JNICALL *DetachCurrentThread)(JavaVM *vm); ++ ++ jint (JNICALL *GetEnv)(JavaVM *vm, void **penv, jint version); ++ ++ jint (JNICALL *AttachCurrentThreadAsDaemon)(JavaVM *vm, void **penv, void *args); + }; + + struct JavaVM_ { + const struct JNIInvokeInterface_ *functions; +- void *reserved0; +- void *reserved1; +- void *reserved2; + #ifdef __cplusplus + + jint DestroyJavaVM() { + return functions->DestroyJavaVM(this); + } +- jint AttachCurrentThread(JNIEnv **penv, void *args) { ++ jint AttachCurrentThread(void **penv, void *args) { + return functions->AttachCurrentThread(this, penv, args); + } + jint DetachCurrentThread() { + return functions->DetachCurrentThread(this); + } + ++ jint GetEnv(void **penv, jint version) { ++ return functions->GetEnv(this, penv, version); ++ } ++ jint AttachCurrentThreadAsDaemon(void **penv, void *args) { ++ return functions->AttachCurrentThreadAsDaemon(this, penv, args); ++ } + #endif + }; + +-JNI_PUBLIC_API(void) JNI_GetDefaultJavaVMInitArgs(void *); ++#ifdef _JNI_IMPLEMENTATION_ ++#define _JNI_IMPORT_OR_EXPORT_ JNIEXPORT ++#else ++#define _JNI_IMPORT_OR_EXPORT_ JNIIMPORT ++#endif ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_GetDefaultJavaVMInitArgs(void *args); + +-JNI_PUBLIC_API(jint) JNI_CreateJavaVM(JavaVM **, JNIEnv **, void *); ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args); + +-JNI_PUBLIC_API(jint) JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); +-JNI_PUBLIC_API(jref) JNI_MakeLocalRef(JNIEnv *pJNIEnv, void *pHObject); ++_JNI_IMPORT_OR_EXPORT_ jint JNICALL ++JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); + ++/* Defined by native libraries. */ ++JNIEXPORT jint JNICALL ++JNI_OnLoad(JavaVM *vm, void *reserved); ++ ++JNIEXPORT void JNICALL ++JNI_OnUnload(JavaVM *vm, void *reserved); ++ ++#define JNI_VERSION_1_1 0x00010001 ++#define JNI_VERSION_1_2 0x00010002 ++#define JNI_VERSION_1_4 0x00010004 ++ + #ifdef __cplusplus + } /* extern "C" */ + #endif /* __cplusplus */ +=== sun-java/stubs/include/jni_md.h +================================================================== +--- xulrunner/sun-java/stubs/include/jni_md.h (revision 134) ++++ xulrunner/sun-java/stubs/include/jni_md.h (local) +@@ -81,20 +81,8 @@ + ******************************************************************************/ + + /* DLL Entry modifiers... */ +-#if defined(XP_OS2) +-# ifdef XP_OS2_VACPP +-# define JNI_PUBLIC_API(ResultType) ResultType _System +-# define JNI_PUBLIC_VAR(VarType) VarType +-# define JNICALL _Optlink +-# define JNIEXPORT +-# else +-# define JNI_PUBLIC_API(ResultType) ResultType +-# define JNI_PUBLIC_VAR(VarType) VarType +-# define JNICALL +-# define JNIEXPORT +-# endif + /* Win32 */ +-#elif defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) ++#if defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) + # include + # if defined(_MSC_VER) || defined(__GNUC__) + # if defined(WIN32) || defined(_WIN32) +@@ -135,7 +123,33 @@ + # endif + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT __declspec(dllexport) ++# define JNIIMPORT __declspec(dllimport) + ++/* OS/2 */ ++#elif defined(XP_OS2) ++# ifdef XP_OS2_VACPP ++# define JNI_PUBLIC_API(ResultType) ResultType _System ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNICALL _Optlink ++# define JNIEXPORT ++# define JNIIMPORT ++# elif defined(__declspec) ++# define JNI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNI_NATIVE_STUB(ResultType) __declspec(dllexport) ResultType ++# define JNICALL ++# define JNIEXPORT ++# define JNIIMPORT ++# else ++# define JNI_PUBLIC_API(ResultType) ResultType ++# define JNI_PUBLIC_VAR(VarType) VarType ++# define JNICALL ++# define JNIEXPORT ++# define JNIIMPORT ++# endif ++# ifndef IS_LITTLE_ENDIAN ++# define IS_LITTLE_ENDIAN ++# endif + + /* Mac */ + #elif macintosh || Macintosh || THINK_C +@@ -161,6 +175,7 @@ + # define JNICALL + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT ++# define JNIIMPORT + + /* Unix or else */ + #else +@@ -170,6 +185,7 @@ + # define JNICALL + /* This is the stuff inherited from JavaSoft .. */ + # define JNIEXPORT ++# define JNIIMPORT + #endif + + #ifndef FAR /* for non-Win16 */ --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/32_print_command.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/32_print_command.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_print_command.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix printer configurations. bz#326245. + +@DPATCH@ + +=== modules/libpref/src/init/all.js +================================================================== +--- xulrunner/modules/libpref/src/init/all.js (revision 67) ++++ xulrunner/modules/libpref/src/init/all.js (local) +@@ -1827,7 +1827,7 @@ + pref("applications.tn3270", "xterm -e tn3270 %h"); + pref("applications.rlogin", "xterm -e rlogin %h"); + pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u"); +-pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}"); ++pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}"); + pref("print.printer_list", ""); // list of printers, separated by spaces + pref("print.print_reversed", false); + pref("print.print_color", true); +@@ -2164,7 +2164,7 @@ + // pref("print.postscript.enabled", true); + pref("print.postscript.paper_size", "letter"); + pref("print.postscript.orientation", "portrait"); +-pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}"); ++pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}"); + + /* PostScript print module font config + * this list is used by the postscript font --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/20_about:plugins.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/20_about:plugins.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_about:plugins.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Install the files for about:plugins. bz#328678 + +@DPATCH@ + +=== toolkit/content/jar.mn +================================================================== +--- xulrunner/toolkit/content/jar.mn (revision 209) ++++ xulrunner/toolkit/content/jar.mn (local) +@@ -78,4 +78,4 @@ + + content/global/selectDialog.xul (selectDialog.xul) + *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) + #endif +- ++ content/global/plugins.html (../../xpfe/global/resources/content/plugins.html) +=== toolkit/themes/winstripe/global/jar.mn +================================================================== +--- xulrunner/toolkit/themes/winstripe/global/jar.mn (revision 209) ++++ xulrunner/toolkit/themes/winstripe/global/jar.mn (local) +@@ -153,3 +153,4 @@ + skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) + #endif ++ skin/classic/global/plugins.css (../../../../themes/classic/global/plugins.css) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/68_m68k_xpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/68_m68k_xpcom.dpatch @@ -0,0 +1,86 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_m68k_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Zack Weinberg to fix FTBFS on m68k. bz#323114 +## DP: Modified by Roman Zippel. #402011 + +@DPATCH@ + +Index: xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp +=================================================================== +--- xulrunner-1.8.0.8.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp 2006-12-04 02:59:30.000000000 +0100 ++++ xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp 2006-12-04 02:59:37.000000000 +0100 +@@ -121,18 +121,8 @@ + #define STUB_ENTRY(n) \ + nsresult nsXPTCStubBase::Stub##n() \ + { \ +- register nsresult result asm("d0"); \ + void *frame = __builtin_frame_address(0); \ +- __asm__ __volatile__( \ +- "pea %2@(12)\n\t" /* args */ \ +- "pea "#n"\n\t" /* method index */ \ +- "movl %1, %/sp@-\n\t" /* this */ \ +- "jbsr PrepareAndDispatch\n\t" \ +- "addw #12, %/sp" \ +- : "=d" (result) /* %0 */ \ +- : "a" (this), "a" (frame) \ +- : "a0", "a1", "d0", "d1", "memory" ); \ +- return result; \ ++ return PrepareAndDispatch(this, n, (uint32*)frame + 3); \ + } + + #define SENTINEL_ENTRY(n) \ +Index: xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp +=================================================================== +--- xulrunner-1.8.0.8.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp 2006-12-04 02:59:30.000000000 +0100 ++++ xulrunner-1.8.0.8/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp 2006-12-04 03:01:53.000000000 +0100 +@@ -137,32 +137,28 @@ + n = invoke_count_words(paramCount, params) * 4; + + __asm__ __volatile__( +- "subl %5, %/sp\n\t" /* make room for params */ +- "movl %/sp, %/a0\n\t" +- "movl %4, %/sp@-\n\t" +- "movl %3, %/sp@-\n\t" +- "movl %/a0, %/sp@-\n\t" ++ "subl %5, %%sp\n\t" /* make room for params */ ++ "movel %4, %%sp@-\n\t" ++ "movel %3, %%sp@-\n\t" ++ "pea %%sp@(8)\n\t" + "jbsr invoke_copy_to_stack\n\t" /* copy params */ +- "addl #12, %/sp\n\t" +- "movl %1, %/a0\n\t" +- "movl %/a0, %/sp@-\n\t" +- "movl %/a0@, %/a0\n\t" +- "movl %2, %/d0\n\t" /* function index */ ++ "addw #12, %%sp\n\t" ++ "movel %1, %%sp@-\n\t" ++ "movel %1@, %%a0\n\t" + #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ +- "movl %/a0@(%/d0:l:4), %/a0\n\t" ++ "movel %%a0@(%2:l:4), %%a0\n\t" + #else /* not V3 */ +- "movl %/a0@(8,%/d0:l:4), %/a0\n\t" ++ "movel %%a0@(8,%2:l:4), %%a0\n\t" + #endif +- "jbsr %/a0@\n\t" /* safe to not cleanup sp */ +- "movl %/d0, %0\n\t" +- "addql #4, %/sp\n\t" +- "addl %5, %/sp" +- : "=g" (result) /* %0 */ +- : "g" (that), /* %1 */ +- "g" (methodIndex), /* %2 */ ++ "jbsr %%a0@\n\t" /* safe to not cleanup sp */ ++ "lea %%sp@(4,%5:l), %%sp\n\t" ++ "movel %%d0, %0" ++ : "=d" (result) /* %0 */ ++ : "a" (that), /* %1 */ ++ "d" (methodIndex), /* %2 */ + "g" (paramCount), /* %3 */ + "g" (params), /* %4 */ +- "g" (n) /* %5 */ ++ "d" (n) /* %5 */ + : "a0", "a1", "d0", "d1", "memory" + ); + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/15_pango_textarea_position.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/15_pango_textarea_position.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_pango_textarea_position.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for cursor position when moving in a textarea. bz#366796 + +@DPATCH@ + +--- iceape/gfx/src/gtk/nsFontMetricsPango.cpp ++++ iceape/gfx/src/gtk/nsFontMetricsPango.cpp +@@ -948,7 +948,6 @@ + { + int trailing = 0; + int inx = 0; +- gboolean found = FALSE; + const gchar *curChar; + PRInt32 retval = 0; + +@@ -974,22 +973,12 @@ + pango_layout_set_text(layout, text, strlen(text)); + FixupSpaceWidths(layout, text); + +- found = pango_layout_xy_to_index(layout, localX, localY, +- &inx, &trailing); ++ pango_layout_xy_to_index(layout, localX, localY, ++ &inx, &trailing); + + // Convert the index back to the utf-16 index + curChar = text; + +- // Jump to the end if it's not found. +- if (!found) { +- if (inx == 0) +- retval = 0; +- else if (trailing) +- retval = aLength; +- +- goto loser; +- } +- + for (PRUint32 curOffset=0; curOffset < aLength; + curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) { + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/30_cairo_xlib.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/30_cairo_xlib.dpatch @@ -0,0 +1,112 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_cairo_xlib.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Properly get cairo lib dependencies and don't rely on GTK bringing +## DP: them, which just don't happen anymore (see #343711). +## DP: Patch from bz#344818. + +@DPATCH@ + +diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +index becb493..fb6e4d0 100644 +--- a/config/autoconf.mk.in ++++ b/config/autoconf.mk.in +@@ -207,6 +207,8 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDERER_CAIRO@ + MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ + MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ + MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ ++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@ ++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@ + TX_EXE = @TX_EXE@ + + # Mac's don't like / in a #include, so we include the libart +@@ -218,6 +220,8 @@ endif + endif + MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@ + MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@ ++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@ ++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@ + + MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@ + MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ +diff --git a/configure.in b/configure.in +index 2ae89b1..6a97250 100644 +--- a/configure.in ++++ b/configure.in +@@ -6800,12 +6800,29 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_ + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; then ++ PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; then ++ PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + + AC_SUBST(MOZ_TREE_CAIRO) + AC_SUBST(MOZ_CAIRO_CFLAGS) + AC_SUBST(MOZ_CAIRO_LIBS) ++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XLIB_LIBS) ++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS) + + dnl ======================================================== + dnl disable xul +diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in +index b82a3e1..fbe9baa 100644 +--- a/content/canvas/src/Makefile.in ++++ b/content/canvas/src/Makefile.in +@@ -94,7 +94,7 @@ FORCE_STATIC_LIB = 1 + + include $(topsrcdir)/config/rules.mk + +-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS) + + ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT))) + # needed for nsDrawingSurfaceMac.h +diff --git a/layout/svg/renderer/src/cairo/Makefile.in b/layout/svg/renderer/src/cairo/Makefile.in +index 464658d..ed38658 100644 +--- a/layout/svg/renderer/src/cairo/Makefile.in ++++ b/layout/svg/renderer/src/cairo/Makefile.in +@@ -95,6 +95,11 @@ LOCAL_INCLUDES = \ + -I$(topsrcdir)/gfx/src \ + $(NULL) + ++ifdef MOZ_X11 ++CFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++endif ++ + ifdef MOZ_ENABLE_GTK + LOCAL_INCLUDES += -I$(topsrcdir)/gfx/src/gtk + CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in +index 9406f84..9b28239 100644 +--- a/toolkit/library/Makefile.in ++++ b/toolkit/library/Makefile.in +@@ -396,6 +396,12 @@ endif + + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) ++ifdef MOZ_SVG_RENDERER_CAIRO ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) ++endif ++ifdef MOZ_ENABLE_CANVAS ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) ++endif + endif + + export:: dlldeps.cpp dlldeps-obs.cpp --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/99_configure.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/99_configure.dpatch @@ -0,0 +1,13038 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_configure.dpatch by Fabien Tassin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: autoconf + +@DPATCH@ +diff -urNad xulrunner-1.8.1.14+nobinonly~/configure xulrunner-1.8.1.14+nobinonly/configure +--- xulrunner-1.8.1.14+nobinonly~/configure 2008-04-23 00:47:59.000000000 +0200 ++++ xulrunner-1.8.1.14+nobinonly/configure 2008-04-23 01:47:25.000000000 +0200 +@@ -57,9 +57,14 @@ + --with-system-zlib[=PFX] + Use system libz [installed at prefix PFX]" + ac_help="$ac_help ++ --with-system-bz2[=PFX] ++ Use system libbz2 [installed at prefix PFX]" ++ac_help="$ac_help + --with-system-png[=PFX] + Use system libpng [installed at prefix PFX]" + ac_help="$ac_help ++ --enable-system-hunspell Use system hunspell (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)" +@@ -217,6 +222,10 @@ + ac_help="$ac_help + --disable-tests Do not build test libraries & programs" + ac_help="$ac_help ++ --enable-embedding-tests ++ Do build embedding tests libraries & programs, ++ even if tests are disabled" ++ac_help="$ac_help + --enable-xpcom-lea Use Lea malloc in xpcom " + ac_help="$ac_help + --enable-places Enable 'places' bookmark/history implementation" +@@ -231,6 +240,11 @@ + ac_help="$ac_help + --enable-js-ultrasparc Use UltraSPARC optimizations in JS" + ac_help="$ac_help ++ --enable-js-binary Build the standalone JS program" ++ac_help="$ac_help ++ --with-readline[=PFX] ++ Use libreadline [installed at prefix PFX]" ++ac_help="$ac_help + --enable-debug[=DBG] Enable building with developer debug info + (Using compiler flags DBG)" + ac_help="$ac_help +@@ -960,7 +974,7 @@ + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:964: checking host system type" >&5 ++echo "configure:978: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in +@@ -981,7 +995,7 @@ + echo "$ac_t""$host" 1>&6 + + echo $ac_n "checking target system type""... $ac_c" 1>&6 +-echo "configure:985: checking target system type" >&5 ++echo "configure:999: checking target system type" >&5 + + target_alias=$target + case "$target_alias" in +@@ -999,7 +1013,7 @@ + echo "$ac_t""$target" 1>&6 + + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1003: checking build system type" >&5 ++echo "configure:1017: checking build system type" >&5 + + build_alias=$build + case "$build_alias" in +@@ -1069,12 +1083,12 @@ + LIBGNOME_VERSION=2.0 + + MISSING_X= +-for ac_prog in gawk mawk nawk awk ++for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1078: checking for $ac_word" >&5 ++echo "configure:1092: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1172,7 +1186,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1176: checking for $ac_word" >&5 ++echo "configure:1190: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1214,7 +1228,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1218: checking for $ac_word" >&5 ++echo "configure:1232: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1285,13 +1299,13 @@ + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 +-echo "configure:1289: checking for host c compiler" >&5 ++echo "configure:1303: checking for host c compiler" >&5 + for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1295: checking for $ac_word" >&5 ++echo "configure:1309: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1326,13 +1340,13 @@ + fi + echo "$ac_t""$HOST_CC" 1>&6 + echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 +-echo "configure:1330: checking for host c++ compiler" >&5 ++echo "configure:1344: checking for host c++ compiler" >&5 + for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1336: checking for $ac_word" >&5 ++echo "configure:1350: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1381,7 +1395,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1385: checking for $ac_word" >&5 ++echo "configure:1399: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1416,7 +1430,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1420: checking for $ac_word" >&5 ++echo "configure:1434: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1451,16 +1465,16 @@ + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1469: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1475,16 +1489,16 @@ + CFLAGS="$HOST_CXXFLAGS" + + echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 ++echo "configure:1493: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 + else +@@ -1513,7 +1527,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1517: checking for $ac_word" >&5 ++echo "configure:1531: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1547,7 +1561,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1551: checking for $ac_word" >&5 ++echo "configure:1565: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1577,7 +1591,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1581: checking for $ac_word" >&5 ++echo "configure:1595: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1628,7 +1642,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1632: checking for $ac_word" >&5 ++echo "configure:1646: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1660,7 +1674,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1678: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1671,12 +1685,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1675 "configure" ++#line 1689 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1702,12 +1716,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1711: checking whether we are using GNU C" >&5 ++echo "configure:1725: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1716,7 +1730,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1735,7 +1749,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1753: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1771,7 +1785,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1775: checking for $ac_word" >&5 ++echo "configure:1789: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1807,7 +1821,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1811: checking for $ac_word" >&5 ++echo "configure:1825: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1839,7 +1853,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1857: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1850,12 +1864,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1854 "configure" ++#line 1868 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1881,12 +1895,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1899: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1890: checking whether we are using GNU C++" >&5 ++echo "configure:1904: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1895,7 +1909,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -1914,7 +1928,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1932: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1945,57 +1959,6 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + + case "$build:$target" in + powerpc-apple-darwin8*:i?86-apple-darwin*) +@@ -2009,7 +1972,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2013: checking for $ac_word" >&5 ++echo "configure:1976: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2044,7 +2007,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2048: checking for $ac_word" >&5 ++echo "configure:2011: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2079,7 +2042,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2083: checking for $ac_word" >&5 ++echo "configure:2046: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2120,7 +2083,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2124: checking for $ac_word" >&5 ++echo "configure:2087: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2155,7 +2118,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2159: checking for $ac_word" >&5 ++echo "configure:2122: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2190,7 +2153,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2194: checking for $ac_word" >&5 ++echo "configure:2157: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2228,7 +2191,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2232: checking for $ac_word" >&5 ++echo "configure:2195: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2258,7 +2221,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2262: checking for $ac_word" >&5 ++echo "configure:2225: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2309,7 +2272,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2313: checking for $ac_word" >&5 ++echo "configure:2276: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2341,7 +2304,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2308: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2352,12 +2315,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2356 "configure" ++#line 2319 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2383,12 +2346,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2350: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2392: checking whether we are using GNU C" >&5 ++echo "configure:2355: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2397,7 +2360,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2416,7 +2379,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2383: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2452,7 +2415,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2456: checking for $ac_word" >&5 ++echo "configure:2419: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2484,7 +2447,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:2451: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2495,12 +2458,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2499 "configure" ++#line 2462 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2526,12 +2489,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2493: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:2535: checking whether we are using GNU C++" >&5 ++echo "configure:2498: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2540,7 +2503,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -2559,7 +2522,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:2526: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2590,61 +2553,10 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2648: checking for $ac_word" >&5 ++echo "configure:2560: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2676,7 +2588,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2680: checking for $ac_word" >&5 ++echo "configure:2592: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2717,7 +2629,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2721: checking for $ac_word" >&5 ++echo "configure:2633: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2752,7 +2664,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2756: checking for $ac_word" >&5 ++echo "configure:2668: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2787,7 +2699,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2791: checking for $ac_word" >&5 ++echo "configure:2703: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2822,7 +2734,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2826: checking for $ac_word" >&5 ++echo "configure:2738: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2911,7 +2823,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2915: checking for $ac_word" >&5 ++echo "configure:2827: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2953,14 +2865,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -2978,14 +2890,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { + unsigned *test = new unsigned(42); + ; return 0; } + EOF +-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -3041,7 +2953,7 @@ + _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` + # Add flags if necessary + echo $ac_n "checking for midl flags""... $ac_c" 1>&6 +-echo "configure:3045: checking for midl flags" >&5 ++echo "configure:2957: checking for midl flags" >&5 + if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then + # Starting with MIDL version 6.0.359, the MIDL compiler + # generates /Oicf /robust stubs by default, which is not +@@ -3063,9 +2975,9 @@ + _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` + _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` + echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 +-echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5 ++echo "configure:2979: checking for w32api version >= $W32API_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3077,7 +2989,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + res=yes + else +@@ -3093,7 +3005,7 @@ + fi + # Check windres version + echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 +-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5 ++echo "configure:3009: checking for windres version >= $WINDRES_VERSION" >&5 + _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` + echo "$ac_t""$_WINDRES_VERSION" 1>&6 + _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` +@@ -3120,7 +3032,7 @@ + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3124: checking how to run the C preprocessor" >&5 ++echo "configure:3036: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3135,13 +3047,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3152,13 +3064,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3169,13 +3081,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3203,17 +3115,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3207: checking for $ac_hdr" >&5 ++echo "configure:3119: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3244,10 +3156,10 @@ + if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:3160: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:3251: checking whether cc understands -c and -o together" >&5 ++echo "configure:3163: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -3259,16 +3171,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:3175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:3183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -3304,7 +3216,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:3308: checking how to run the C preprocessor" >&5 ++echo "configure:3220: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -3319,13 +3231,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3336,13 +3248,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3353,13 +3265,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3384,7 +3296,7 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:3388: checking how to run the C++ preprocessor" >&5 ++echo "configure:3300: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3397,12 +3309,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -3449,7 +3361,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:3453: checking for a BSD compatible install" >&5 ++echo "configure:3365: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3502,7 +3414,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:3506: checking whether ln -s works" >&5 ++echo "configure:3418: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3527,7 +3439,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3531: checking for $ac_word" >&5 ++echo "configure:3443: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3567,7 +3479,7 @@ + fi + + echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 +-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5 ++echo "configure:3483: checking for minimum required perl version >= $PERL_VERSION" >&5 + _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + echo "$ac_t""$_perl_version" 1>&6 +@@ -3577,7 +3489,7 @@ + fi + + echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 +-echo "configure:3581: checking for full perl installation" >&5 ++echo "configure:3493: checking for full perl installation" >&5 + _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` + _perl_res=$? + if test "$_perl_res" != 0; then +@@ -3590,7 +3502,7 @@ + # Extract the first word of "doxygen", so it can be a program name with args. + set dummy doxygen; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3594: checking for $ac_word" >&5 ++echo "configure:3506: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3626,7 +3538,7 @@ + # Extract the first word of "whoami", so it can be a program name with args. + set dummy whoami; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3630: checking for $ac_word" >&5 ++echo "configure:3542: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3662,7 +3574,7 @@ + # Extract the first word of "autoconf", so it can be a program name with args. + set dummy autoconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3666: checking for $ac_word" >&5 ++echo "configure:3578: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3698,7 +3610,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3702: checking for $ac_word" >&5 ++echo "configure:3614: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3731,53 +3643,10 @@ + echo "$ac_t""no" 1>&6 + fi + +-for ac_prog in zip +-do +-# Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3740: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- case "$ZIP" in +- /*) +- ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_ZIP="$ZIP" # 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_ZIP="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac +-fi +-ZIP="$ac_cv_path_ZIP" +-if test -n "$ZIP"; then +- echo "$ac_t""$ZIP" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-test -n "$ZIP" && break +-done +- +-if test -z "$ZIP" || test "$ZIP" = ":"; then +- { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; } +-fi + # Extract the first word of "makedepend", so it can be a program name with args. + set dummy makedepend; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3781: checking for $ac_word" >&5 ++echo "configure:3650: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3812,7 +3681,7 @@ + # Extract the first word of "xargs", so it can be a program name with args. + set dummy xargs; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3816: checking for $ac_word" >&5 ++echo "configure:3685: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3875,7 +3744,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3879: checking for $ac_word" >&5 ++echo "configure:3748: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3925,7 +3794,7 @@ + # Extract the first word of "sdp", so it can be a program name with args. + set dummy sdp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:3929: checking for $ac_word" >&5 ++echo "configure:3798: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4056,7 +3925,7 @@ + fi + + echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 +-echo "configure:4060: checking for valid compiler/Mac OS X SDK combination" >&5 ++echo "configure:3929: checking for valid compiler/Mac OS X SDK combination" >&5 + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -4065,7 +3934,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + int main() { return 0; } +@@ -4073,7 +3942,7 @@ + result=yes + ; return 0; } + EOF +-if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result=no + else +@@ -4098,7 +3967,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4102: checking for $ac_word" >&5 ++echo "configure:3971: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4141,7 +4010,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4145: checking for $ac_word" >&5 ++echo "configure:4014: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4209,7 +4078,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. + # --without-x overrides everything else, but does not touch the cache. + echo $ac_n "checking for X""... $ac_c" 1>&6 +-echo "configure:4213: checking for X" >&5 ++echo "configure:4082: checking for X" >&5 + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -4271,12 +4140,12 @@ + + # First, try using that file with no special directory specified. + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4345,14 +4214,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" + # We can link X programs with no special library path. +@@ -4458,17 +4327,17 @@ + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +-echo "configure:4462: checking whether -R must be followed by a space" >&5 ++echo "configure:4331: checking whether -R must be followed by a space" >&5 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_nospace=yes + else +@@ -4484,14 +4353,14 @@ + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes + else +@@ -4523,7 +4392,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4527: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:4396: checking for dnet_ntoa in -ldnet" >&5 + ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4531,7 +4400,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4567,7 +4436,7 @@ + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:4571: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:4440: checking for dnet_ntoa in -ldnet_stub" >&5 + ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4575,7 +4444,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldnet_stub $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4618,12 +4487,12 @@ + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:4622: checking for gethostbyname" >&5 ++echo "configure:4491: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -4670,7 +4539,7 @@ + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:4674: checking for gethostbyname in -lnsl" >&5 ++echo "configure:4543: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4678,7 +4547,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4722,12 +4591,12 @@ + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +-echo "configure:4726: checking for connect" >&5 ++echo "configure:4595: checking for connect" >&5 + if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" + else +@@ -4774,7 +4643,7 @@ + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +-echo "configure:4778: checking for connect in -lsocket" >&5 ++echo "configure:4647: checking for connect in -lsocket" >&5 + ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4782,7 +4651,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4820,12 +4689,12 @@ + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +-echo "configure:4824: checking for remove" >&5 ++echo "configure:4693: checking for remove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" + else +@@ -4872,7 +4741,7 @@ + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +-echo "configure:4876: checking for remove in -lposix" >&5 ++echo "configure:4745: checking for remove in -lposix" >&5 + ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4880,7 +4749,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lposix $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4918,12 +4787,12 @@ + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +-echo "configure:4922: checking for shmat" >&5 ++echo "configure:4791: checking for shmat" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" + else +@@ -4970,7 +4839,7 @@ + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +-echo "configure:4974: checking for shmat in -lipc" >&5 ++echo "configure:4843: checking for shmat in -lipc" >&5 + ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4978,7 +4847,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lipc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5025,7 +4894,7 @@ + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +-echo "configure:5029: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:4898: checking for IceConnectionNumber in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5033,7 +4902,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5106,6 +4975,8 @@ + MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg' + MOZ_ZLIB_CFLAGS= + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++MOZ_BZ2_CFLAGS= ++MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_CFLAGS= + MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng' + +@@ -5115,7 +4986,7 @@ + XPCOM_FROZEN_LDOPTS='-L$(DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom' + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul' + XPCOM_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' +-XPCOM_STANDALONE_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' ++XPCOM_STANDALONE_GLUE_LDOPTS='-L$(DIST)/lib -lxpcomglue' + + MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' + MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat' +@@ -5137,17 +5008,28 @@ + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi + _COMPILER_PREFIX= + +@@ -5425,8 +5307,8 @@ + OS_CONFIG="${OS_TARGET}${OS_RELEASE}" + + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + DSO_LDOPTS='-shared' + if test "$GCC_USE_GNU_LD"; then + # Don't allow undefined symbols in libraries +@@ -5455,8 +5337,8 @@ + _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' + _USE_CPP_INCLUDE_FLAG=1 + else +- MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' ++ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' + + DSO_LDOPTS='-shared' + if test "$GNU_LD"; then +@@ -5485,7 +5367,7 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test "$GNU_CC"; then + echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 +-echo "configure:5489: checking whether ld has archive extraction flags" >&5 ++echo "configure:5371: checking whether ld has archive extraction flags" >&5 + if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5502,14 +5384,14 @@ + LDFLAGS=$force + LIBS=$unforce + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_mkshlib_force_and_unforce=$line; break + else +@@ -5542,7 +5424,7 @@ + ' + + echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 +-echo "configure:5546: checking that static assertion macros used in autoconf tests work" >&5 ++echo "configure:5428: checking that static assertion macros used in autoconf tests work" >&5 + if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5556,14 +5438,14 @@ + + ac_cv_static_assertion_macros_work="yes" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5573,14 +5455,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5596,14 +5478,14 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -5613,14 +5495,14 @@ + fi + rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_static_assertion_macros_work="no" + else +@@ -5655,16 +5537,16 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 +-echo "configure:5659: checking for 64-bit OS" >&5 ++echo "configure:5541: checking for 64-bit OS" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -5743,7 +5625,7 @@ + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -5822,9 +5704,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 +-echo "configure:5826: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 ++echo "configure:5708: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -5871,17 +5753,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5875: checking for $ac_hdr" >&5 ++echo "configure:5757: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5916,14 +5798,14 @@ + + *-beos*) + no_x=yes +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + _PLATFORM_DEFAULT_TOOLKIT="beos" + DSO_LDOPTS='-nostart' + TK_LIBS='-lbe -lroot' + LIBS="$LIBS -lbe" + if test "$COMPILE_ENVIRONMENT"; then + echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 +-echo "configure:5927: checking for main in -lbind" >&5 ++echo "configure:5809: checking for main in -lbind" >&5 + ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5931,14 +5813,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lbind $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5959,7 +5841,7 @@ + fi + + echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 +-echo "configure:5963: checking for main in -lzeta" >&5 ++echo "configure:5845: checking for main in -lzeta" >&5 + ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5967,14 +5849,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lzeta $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6042,18 +5924,18 @@ + MACOSX=1 + + echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 +-echo "configure:6046: checking for -dead_strip option to ld" >&5 ++echo "configure:5928: checking for -dead_strip option to ld" >&5 + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-dead_strip" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + _HAVE_DEAD_STRIP=1 + else +@@ -6192,8 +6074,6 @@ + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 + ;; + mips*) +- CFLAGS="$CFLAGS -Wa,-xgot" +- CXXFLAGS="$CXXFLAGS -Wa,-xgot" + ;; + esac + ;; +@@ -6252,6 +6132,7 @@ + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' + MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + OBJ_SUFFIX=obj + RANLIB='echo not_ranlib' + STRIP='echo not_strip' +@@ -6341,6 +6222,7 @@ + RCFLAGS='-O coff --use-temp-file' + MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++ MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_LIBS='-L$(DIST)/lib -lpng' + MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_FIX_LINK_PATHS= +@@ -6380,6 +6262,7 @@ + MOZ_OPTIMIZE_FLAGS='-O1' + MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + MOZ_PNG_LIBS='$(DIST)/lib/png.lib' + MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_FIX_LINK_PATHS= +@@ -6607,8 +6490,8 @@ + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + ;; + + *-nto*) +@@ -6823,6 +6706,7 @@ + LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' + MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.$(LIB_SUFFIX)' + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)' + MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)' + MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)' +@@ -6831,8 +6715,8 @@ + + alpha*-*-osf*) + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + + else + MOZ_DEBUG_FLAGS='-g' +@@ -6842,8 +6726,8 @@ + DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' + DSO_CFLAGS= + DSO_PIC_CFLAGS= +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-all' + MKSHLIB_UNFORCE_ALL='-none' + cat >> confdefs.h <<\EOF +@@ -6921,14 +6805,14 @@ + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + : + else + echo "configure: failed program was:" >&5 +@@ -6939,8 +6823,8 @@ + rm -f conftest* + fi + MOZ_OPTIMIZE_FLAGS="-xO4" +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' + MKSHLIB_UNFORCE_ALL='' + DSO_LDOPTS='-G -Qoption ld -z,muldefs' +@@ -6956,7 +6840,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 }'` + echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 +-echo "configure:6960: checking for Forte compiler version >= WS6U2" >&5 ++echo "configure:6844: checking for Forte compiler version >= WS6U2" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -6966,7 +6850,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _BAD_COMPILER= + else +@@ -7085,7 +6969,7 @@ + esac + + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu|*-gnu*) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -7125,12 +7009,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:7129: checking for ANSI C header files" >&5 ++echo "configure:7013: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7138,7 +7022,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7155,7 +7039,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7173,7 +7057,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -7194,7 +7078,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -7205,7 +7089,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:7093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -7229,12 +7113,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:7233: checking for working const" >&5 ++echo "configure:7117: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -7304,12 +7188,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:7308: checking for mode_t" >&5 ++echo "configure:7192: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7337,12 +7221,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7341: checking for off_t" >&5 ++echo "configure:7225: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7370,12 +7254,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7374: checking for pid_t" >&5 ++echo "configure:7258: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7403,12 +7287,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7407: checking for size_t" >&5 ++echo "configure:7291: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -7436,12 +7320,12 @@ + fi + + echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +-echo "configure:7440: checking for st_blksize in struct stat" >&5 ++echo "configure:7324: checking for st_blksize in struct stat" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7449,7 +7333,7 @@ + struct stat s; s.st_blksize; + ; return 0; } + EOF +-if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_st_blksize=yes + else +@@ -7470,12 +7354,12 @@ + fi + + echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 +-echo "configure:7474: checking for siginfo_t" >&5 ++echo "configure:7358: checking for siginfo_t" >&5 + if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -7483,7 +7367,7 @@ + siginfo_t* info; + ; return 0; } + EOF +-if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_siginfo_t=true + else +@@ -7517,12 +7401,12 @@ + fi + + echo $ac_n "checking for int16_t""... $ac_c" 1>&6 +-echo "configure:7521: checking for int16_t" >&5 ++echo "configure:7405: checking for int16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7530,7 +7414,7 @@ + int16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int16_t=true + else +@@ -7552,12 +7436,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:7556: checking for int32_t" >&5 ++echo "configure:7440: checking for int32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7565,7 +7449,7 @@ + int32_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int32_t=true + else +@@ -7587,12 +7471,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64_t""... $ac_c" 1>&6 +-echo "configure:7591: checking for int64_t" >&5 ++echo "configure:7475: checking for int64_t" >&5 + if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7600,7 +7484,7 @@ + int64_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64_t=true + else +@@ -7622,12 +7506,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for int64""... $ac_c" 1>&6 +-echo "configure:7626: checking for int64" >&5 ++echo "configure:7510: checking for int64" >&5 + if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7635,7 +7519,7 @@ + int64 foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int64=true + else +@@ -7657,12 +7541,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:7661: checking for uint" >&5 ++echo "configure:7545: checking for uint" >&5 + if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7670,7 +7554,7 @@ + uint foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint=true + else +@@ -7692,12 +7576,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint_t""... $ac_c" 1>&6 +-echo "configure:7696: checking for uint_t" >&5 ++echo "configure:7580: checking for uint_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7705,7 +7589,7 @@ + uint_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint_t=true + else +@@ -7727,12 +7611,12 @@ + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7731: checking for uint16_t" >&5 ++echo "configure:7615: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -7740,7 +7624,7 @@ + uint16_t foo = 0; + ; return 0; } + EOF +-if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_uint16_t=true + else +@@ -7771,12 +7655,12 @@ + + + echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 +-echo "configure:7775: checking for uname.domainname" >&5 ++echo "configure:7659: checking for uname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7784,7 +7668,7 @@ + (void)uname(res); if (res != 0) { domain = res->domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_domainname_field=true + else +@@ -7808,12 +7692,12 @@ + fi + + echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 +-echo "configure:7812: checking for uname.__domainname" >&5 ++echo "configure:7696: checking for uname.__domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { +@@ -7821,7 +7705,7 @@ + (void)uname(res); if (res != 0) { domain = res->__domainname; } + ; return 0; } + EOF +-if { (eval echo configure:7825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_uname_us_domainname_field=true + else +@@ -7854,12 +7738,12 @@ + + + echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 +-echo "configure:7858: checking for usable wchar_t (2 bytes, unsigned)" >&5 ++echo "configure:7742: checking for usable wchar_t (2 bytes, unsigned)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros +@@ -7868,7 +7752,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_have_usable_wchar_v2="yes" + else +@@ -7901,12 +7785,12 @@ + CXXFLAGS="$CXXFLAGS -fshort-wchar" + + echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 +-echo "configure:7905: checking for compiler -fshort-wchar option" >&5 ++echo "configure:7789: checking for compiler -fshort-wchar option" >&5 + if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + $configure_static_assert_macros +@@ -7915,7 +7799,7 @@ + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) + ; return 0; } + EOF +-if { (eval echo configure:7919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_usable_wchar_option_v2="yes" + else +@@ -7949,7 +7833,7 @@ + + if test "$GNU_CC"; then + echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 +-echo "configure:7953: checking for visibility(hidden) attribute" >&5 ++echo "configure:7837: checking for visibility(hidden) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7974,7 +7858,7 @@ + + + echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 +-echo "configure:7978: checking for visibility(default) attribute" >&5 ++echo "configure:7862: checking for visibility(default) attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -7999,7 +7883,7 @@ + + + echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 +-echo "configure:8003: checking for visibility pragma support" >&5 ++echo "configure:7887: checking for visibility pragma support" >&5 + if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8024,7 +7908,7 @@ + echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 + if test "$ac_cv_visibility_pragma" = "yes"; then + echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 +-echo "configure:8028: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 ++echo "configure:7912: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8052,7 +7936,7 @@ + echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 + + echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 +-echo "configure:8056: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 ++echo "configure:7940: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 + if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -8099,12 +7983,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:8104: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:7987: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include <$ac_hdr> +@@ -8112,7 +7996,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:8117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -8137,7 +8021,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:8142: checking for opendir in -ldir" >&5 ++echo "configure:8025: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8145,7 +8029,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8178,7 +8062,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:8183: checking for opendir in -lx" >&5 ++echo "configure:8066: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8186,7 +8070,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8229,17 +8113,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8234: checking for $ac_hdr" >&5 ++echo "configure:8117: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8269,17 +8153,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8274: checking for $ac_hdr" >&5 ++echo "configure:8157: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8309,17 +8193,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8314: checking for $ac_hdr" >&5 ++echo "configure:8197: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8349,17 +8233,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8354: checking for $ac_hdr" >&5 ++echo "configure:8237: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8389,17 +8273,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8394: checking for $ac_hdr" >&5 ++echo "configure:8277: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8430,17 +8314,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8435: checking for $ac_hdr" >&5 ++echo "configure:8318: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8471,17 +8355,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8476: checking for $ac_hdr" >&5 ++echo "configure:8359: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8518,17 +8402,17 @@ + NEW_H=new.h + ac_safe=`echo "new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for new""... $ac_c" 1>&6 +-echo "configure:8523: checking for new" >&5 ++echo "configure:8406: checking for new" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8569,17 +8453,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8574: checking for $ac_hdr" >&5 ++echo "configure:8457: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8613,7 +8497,7 @@ + ;; + *) + echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +-echo "configure:8618: checking for gethostbyname_r in -lc_r" >&5 ++echo "configure:8501: checking for gethostbyname_r in -lc_r" >&5 + ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8621,7 +8505,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8662,7 +8546,7 @@ + ;; + esac + echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +-echo "configure:8667: checking for atan in -lm" >&5 ++echo "configure:8550: checking for atan in -lm" >&5 + ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8670,7 +8554,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lm $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8715,7 +8599,7 @@ + ;; + *) + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:8720: checking for dlopen in -ldl" >&5 ++echo "configure:8603: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8723,7 +8607,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8751,17 +8635,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +-echo "configure:8756: checking for dlfcn.h" >&5 ++echo "configure:8639: checking for dlfcn.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -8797,7 +8681,7 @@ + case $target in + *-aix*) + echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +-echo "configure:8802: checking for demangle in -lC_r" >&5 ++echo "configure:8685: checking for demangle in -lC_r" >&5 + ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8805,7 +8689,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8846,7 +8730,7 @@ + ;; + *) + echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +-echo "configure:8851: checking for demangle in -lC" >&5 ++echo "configure:8734: checking for demangle in -lC" >&5 + ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8854,7 +8738,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lC $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8896,7 +8780,7 @@ + esac + fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:8901: checking for socket in -lsocket" >&5 ++echo "configure:8784: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8904,7 +8788,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8960,7 +8844,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +-echo "configure:8965: checking for XDrawLines in -lX11" >&5 ++echo "configure:8848: checking for XDrawLines in -lX11" >&5 + ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8968,7 +8852,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lX11 $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9001,7 +8885,7 @@ + fi + + echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +-echo "configure:9006: checking for XextAddDisplay in -lXext" >&5 ++echo "configure:8889: checking for XextAddDisplay in -lXext" >&5 + ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9009,7 +8893,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9044,7 +8928,7 @@ + + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9049: checking for XtFree in -lXt" >&5 ++echo "configure:8932: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9052,7 +8936,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9084,7 +8968,7 @@ + + unset ac_cv_lib_Xt_XtFree + echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +-echo "configure:9089: checking for IceFlush in -lICE" >&5 ++echo "configure:8972: checking for IceFlush in -lICE" >&5 + ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9092,7 +8976,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lICE $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9124,7 +9008,7 @@ + fi + + echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +-echo "configure:9129: checking for SmcCloseConnection in -lSM" >&5 ++echo "configure:9012: checking for SmcCloseConnection in -lSM" >&5 + ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9132,7 +9016,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSM $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9164,7 +9048,7 @@ + fi + + echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +-echo "configure:9169: checking for XtFree in -lXt" >&5 ++echo "configure:9052: checking for XtFree in -lXt" >&5 + ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9172,7 +9056,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9217,7 +9101,7 @@ + esac + + echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +-echo "configure:9222: checking for XineramaIsActive in -lXinerama" >&5 ++echo "configure:9105: checking for XineramaIsActive in -lXinerama" >&5 + ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9225,7 +9109,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9258,17 +9142,17 @@ + + ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +-echo "configure:9263: checking for X11/extensions/Xinerama.h" >&5 ++echo "configure:9146: checking for X11/extensions/Xinerama.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9291,7 +9175,7 @@ + + + echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +-echo "configure:9296: checking for XShmCreateImage in -lXext" >&5 ++echo "configure:9179: checking for XShmCreateImage in -lXext" >&5 + ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9299,7 +9183,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9332,17 +9216,17 @@ + + ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +-echo "configure:9337: checking for X11/extensions/XShm.h" >&5 ++echo "configure:9220: checking for X11/extensions/XShm.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9372,7 +9256,7 @@ + fi + + echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +-echo "configure:9377: checking for XieFloGeometry in -lXIE" >&5 ++echo "configure:9260: checking for XieFloGeometry in -lXIE" >&5 + ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9380,7 +9264,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -9413,17 +9297,17 @@ + + ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +-echo "configure:9418: checking for X11/extensions/XIElib.h" >&5 ++echo "configure:9301: checking for X11/extensions/XIElib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -9497,7 +9381,7 @@ + # Extract the first word of "freetype-config", so it can be a program name with args. + set dummy freetype-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9502: checking for $ac_word" >&5 ++echo "configure:9385: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -9533,7 +9417,7 @@ + + min_ft_version=6.1.0 + echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +-echo "configure:9538: checking for FreeType - version >= $min_ft_version" >&5 ++echo "configure:9421: checking for FreeType - version >= $min_ft_version" >&5 + no_ft="" + if test "$FT2_CONFIG" = "no" ; then + no_ft=yes +@@ -9581,7 +9465,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -9607,7 +9491,7 @@ + } + + EOF +-if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -9659,7 +9543,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +-echo "configure:9664: checking for pthread_create in -lpthreads" >&5 ++echo "configure:9547: checking for pthread_create in -lpthreads" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9681,7 +9565,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:9686: checking for pthread_create in -lpthread" >&5 ++echo "configure:9569: checking for pthread_create in -lpthread" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9703,7 +9587,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:9708: checking for pthread_create in -lc_r" >&5 ++echo "configure:9591: checking for pthread_create in -lc_r" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9725,7 +9609,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +-echo "configure:9730: checking for pthread_create in -lc" >&5 ++echo "configure:9613: checking for pthread_create in -lc" >&5 + echo " + #include + void *foo(void *v) { int a = 1; } +@@ -9781,7 +9665,7 @@ + rm -f conftest* + ac_cv_have_dash_pthread=no + echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +-echo "configure:9786: checking whether ${CC-cc} accepts -pthread" >&5 ++echo "configure:9669: checking whether ${CC-cc} accepts -pthread" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9804,7 +9688,7 @@ + ac_cv_have_dash_pthreads=no + if test "$ac_cv_have_dash_pthread" = "no"; then + echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +-echo "configure:9809: checking whether ${CC-cc} accepts -pthreads" >&5 ++echo "configure:9692: checking whether ${CC-cc} accepts -pthreads" >&5 + echo 'int main() { return 0; }' | cat > conftest.c + ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 + if test $? -eq 0; then +@@ -9850,7 +9734,7 @@ + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -9899,7 +9783,7 @@ + fi + + echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +-echo "configure:9904: checking whether mmap() sees write()s" >&5 ++echo "configure:9787: checking whether mmap() sees write()s" >&5 + + + mmap_test_prog=' +@@ -9938,11 +9822,11 @@ + result="yes" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -9967,13 +9851,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:9972: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:9855: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext < + Autoconf TIOCGETP +@@ -9991,7 +9875,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < + Autoconf TCGETA +@@ -10013,7 +9897,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:10018: checking for 8-bit clean memcmp" >&5 ++echo "configure:9901: checking for 8-bit clean memcmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10021,7 +9905,7 @@ + ac_cv_func_memcmp_clean=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_memcmp_clean=yes + else +@@ -10051,12 +9935,12 @@ + for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10056: checking for $ac_func" >&5 ++echo "configure:9939: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10106,12 +9990,12 @@ + for ac_func in flockfile getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10111: checking for $ac_func" >&5 ++echo "configure:9994: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10163,12 +10047,12 @@ + for ac_func in localtime_r strtok_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:10168: checking for $ac_func" >&5 ++echo "configure:10051: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -10227,19 +10111,19 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +-echo "configure:10232: checking for wcrtomb" >&5 ++echo "configure:10115: checking for wcrtomb" >&5 + if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};wcrtomb(0,'f',&ps); + ; return 0; } + EOF +-if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_wcrtomb="yes" + else +@@ -10259,19 +10143,19 @@ + + fi + echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +-echo "configure:10264: checking for mbrtowc" >&5 ++echo "configure:10147: checking for mbrtowc" >&5 + if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + mbstate_t ps={0};mbrtowc(0,0,0,&ps); + ; return 0; } + EOF +-if { (eval echo configure:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_have_mbrtowc="yes" + else +@@ -10300,12 +10184,12 @@ + fi + + echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 +-echo "configure:10305: checking for res_ninit()" >&5 ++echo "configure:10188: checking for res_ninit()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_res_ninit=yes + else +@@ -10347,12 +10231,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 +-echo "configure:10352: checking for gnu_get_libc_version()" >&5 ++echo "configure:10235: checking for gnu_get_libc_version()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_gnu_get_libc_version=yes + else +@@ -10392,7 +10276,7 @@ + *) + + echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +-echo "configure:10397: checking for iconv in -lc" >&5 ++echo "configure:10280: checking for iconv in -lc" >&5 + ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10400,7 +10284,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10433,7 +10317,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10438: checking for iconv in -liconv" >&5 ++echo "configure:10321: checking for iconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10441,7 +10325,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10474,7 +10358,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +-echo "configure:10479: checking for libiconv in -liconv" >&5 ++echo "configure:10362: checking for libiconv in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10482,7 +10366,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -10523,12 +10407,12 @@ + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +-echo "configure:10528: checking for iconv()" >&5 ++echo "configure:10411: checking for iconv()" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10542,7 +10426,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_iconv=yes + else +@@ -10566,12 +10450,12 @@ + LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" + LIBICONV="$_ICONV_LIBS" + echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +-echo "configure:10571: checking for iconv() with const input" >&5 ++echo "configure:10454: checking for iconv() with const input" >&5 + if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -10586,7 +10470,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:10591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_const_iconv=yes + else +@@ -10615,19 +10499,19 @@ + + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +-echo "configure:10620: checking for nl_langinfo and CODESET" >&5 ++echo "configure:10503: checking for nl_langinfo and CODESET" >&5 + if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char* cs = nl_langinfo(CODESET); + ; return 0; } + EOF +-if { (eval echo configure:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes + else +@@ -10659,7 +10543,7 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:10664: checking for an implementation of va_copy()" >&5 ++echo "configure:10547: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10669,7 +10553,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10683,7 +10567,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_copy=yes + else +@@ -10700,7 +10584,7 @@ + + echo "$ac_t""$ac_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:10705: checking for an implementation of __va_copy()" >&5 ++echo "configure:10588: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10710,7 +10594,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10724,7 +10608,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv___va_copy=yes + else +@@ -10741,7 +10625,7 @@ + + echo "$ac_t""$ac_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:10746: checking whether va_lists can be copied by value" >&5 ++echo "configure:10629: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -10751,7 +10635,7 @@ + + else + cat > conftest.$ac_ext < +@@ -10765,7 +10649,7 @@ + } + int main() { f (0, 42); return 0; } + EOF +-if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_va_val_copy=yes + else +@@ -10864,7 +10748,7 @@ + if test "$GNU_CXX"; then + + echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +-echo "configure:10869: checking for C++ exceptions flag" >&5 ++echo "configure:10752: checking for C++ exceptions flag" >&5 + + if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10899,12 +10783,12 @@ + HAVE_GCC3_ABI= + if test "$GNU_CC"; then + echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 +-echo "configure:10904: checking for gcc 3.0 ABI" >&5 ++echo "configure:10787: checking for gcc 3.0 ABI" >&5 + if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_gcc_three_abi="yes" + else +@@ -10941,12 +10825,12 @@ + + + echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 +-echo "configure:10946: checking for C++ \"explicit\" keyword" >&5 ++echo "configure:10829: checking for C++ \"explicit\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_explicit=yes + else +@@ -10977,12 +10861,12 @@ + fi + + echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 +-echo "configure:10982: checking for C++ \"typename\" keyword" >&5 ++echo "configure:10865: checking for C++ \"typename\" keyword" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_typename=yes + else +@@ -11022,12 +10906,12 @@ + fi + + echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +-echo "configure:11027: checking for modern C++ template specialization syntax support" >&5 ++echo "configure:10910: checking for modern C++ template specialization syntax support" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < struct X { int a; }; + class Y {}; +@@ -11037,7 +10921,7 @@ + X y_x; + ; return 0; } + EOF +-if { (eval echo configure:11042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_modern_specialize_template_syntax=yes + else +@@ -11059,12 +10943,12 @@ + + + echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +-echo "configure:11064: checking whether partial template specialization works" >&5 ++echo "configure:10947: checking whether partial template specialization works" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Foo {}; + template class Foo {}; +@@ -11072,7 +10956,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_partial_specialization=yes + else +@@ -11093,12 +10977,12 @@ + fi + + echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +-echo "configure:11098: checking whether operators must be re-defined for templates derived from templates" >&5 ++echo "configure:10981: checking whether operators must be re-defined for templates derived from templates" >&5 + if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template +@@ -11110,7 +10994,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_derived_template_operators=no + else +@@ -11132,12 +11016,12 @@ + + + echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +-echo "configure:11137: checking whether we need to cast a derived template to pass as its base class" >&5 ++echo "configure:11020: checking whether we need to cast a derived template to pass as its base class" >&5 + if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class Base { }; + template class Derived : public Base { }; +@@ -11146,7 +11030,7 @@ + Derived bar; return foo(bar); + ; return 0; } + EOF +-if { (eval echo configure:11151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_need_cpp_template_cast_to_base=no + else +@@ -11167,12 +11051,12 @@ + fi + + echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +-echo "configure:11172: checking whether the compiler can resolve const ambiguities for templates" >&5 ++echo "configure:11055: checking whether the compiler can resolve const ambiguities for templates" >&5 + if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < class ptrClass { +@@ -11193,7 +11077,7 @@ + a(&i); + ; return 0; } + EOF +-if { (eval echo configure:11198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_can_resolve_const_ambiguity=yes + else +@@ -11215,12 +11099,12 @@ + + + echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 +-echo "configure:11220: checking whether the C++ \"using\" keyword can change access" >&5 ++echo "configure:11103: checking whether the C++ \"using\" keyword can change access" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no + else +@@ -11267,12 +11151,12 @@ + fi + + echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 +-echo "configure:11272: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++echo "configure:11155: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_ambiguity_resolving_using=yes + else +@@ -11309,19 +11193,19 @@ + fi + + echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +-echo "configure:11314: checking for \"std::\" namespace" >&5 ++echo "configure:11197: checking for \"std::\" namespace" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + return std::min(0, 1); + ; return 0; } + EOF +-if { (eval echo configure:11326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_namespace_std=yes + else +@@ -11342,12 +11226,12 @@ + fi + + echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +-echo "configure:11347: checking whether standard template operator!=() is ambiguous" >&5 ++echo "configure:11230: checking whether standard template operator!=() is ambiguous" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + struct T1 {}; +@@ -11357,7 +11241,7 @@ + T1 a,b; return a != b; + ; return 0; } + EOF +-if { (eval echo configure:11362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_unambiguous_std_notequal=unambiguous + else +@@ -11379,12 +11263,12 @@ + + + echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 +-echo "configure:11384: checking for C++ reinterpret_cast" >&5 ++echo "configure:11267: checking for C++ reinterpret_cast" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <(z); + ; return 0; } + EOF +-if { (eval echo configure:11397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_reinterpret_cast=yes + else +@@ -11413,7 +11297,7 @@ + fi + + echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +-echo "configure:11418: checking for C++ dynamic_cast to void*" >&5 ++echo "configure:11301: checking for C++ dynamic_cast to void*" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11421,8 +11305,11 @@ + ac_cv_cpp_dynamic_cast_void_ptr=no + else + cat > conftest.$ac_ext <(suby)))); + } + EOF +-if { (eval echo configure:11442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_cpp_dynamic_cast_void_ptr=yes + else +@@ -11461,19 +11348,19 @@ + + + echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +-echo "configure:11466: checking whether C++ requires implementation of unused virtual methods" >&5 ++echo "configure:11352: checking whether C++ requires implementation of unused virtual methods" >&5 + if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_cpp_unused_required=no + else +@@ -11496,12 +11383,12 @@ + + + echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +-echo "configure:11501: checking for trouble comparing to zero near std::operator!=()" >&5 ++echo "configure:11387: checking for trouble comparing to zero near std::operator!=()" >&5 + if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + template class Foo {}; +@@ -11512,7 +11399,7 @@ + Foo f; return (0 != f); + ; return 0; } + EOF +-if { (eval echo configure:11517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_trouble_comparing_to_zero=no + else +@@ -11544,19 +11431,19 @@ + + + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:11549: checking for LC_MESSAGES" >&5 ++echo "configure:11435: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + int category = LC_MESSAGES; + ; return 0; } + EOF +-if { (eval echo configure:11561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:11447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_i18n_lc_messages=yes + else +@@ -11637,7 +11524,7 @@ + # Extract the first word of "nspr-config", so it can be a program name with args. + set dummy nspr-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11642: checking for $ac_word" >&5 ++echo "configure:11528: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11672,7 +11559,7 @@ + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11677: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++echo "configure:11563: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then +@@ -11774,7 +11661,7 @@ + # Extract the first word of "nss-config", so it can be a program name with args. + set dummy nss-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:11779: checking for $ac_word" >&5 ++echo "configure:11665: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -11809,7 +11696,7 @@ + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +-echo "configure:11814: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++echo "configure:11700: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then +@@ -11841,7 +11728,7 @@ + fi + + if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" ++ NSS_LIBS=`echo $NSS_LIBS | sed 's/-l/-lcrmf &/'` + else + NSS_CFLAGS='-I$(DIST)/public/nss' + NSS_DEP_LIBS='\\\ +@@ -11882,7 +11769,7 @@ + SYSTEM_JPEG= + else + echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:11887: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo "configure:11773: checking for jpeg_destroy_compress in -ljpeg" >&5 + ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11890,7 +11777,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ljpeg $JPEG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -11924,13 +11811,13 @@ + + fi + +-if test "$SYSTEM_JPEG" = 1; then ++if test "$SYSTEM_JPEG" = 0; then + LIBS="$JPEG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_JPEG= + else + cat > conftest.$ac_ext < + #include +@@ -11944,7 +11831,7 @@ + } + + EOF +-if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_JPEG=1 + else +@@ -11985,7 +11872,7 @@ + SYSTEM_ZLIB= + else + echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +-echo "configure:11990: checking for gzread in -lz" >&5 ++echo "configure:11876: checking for gzread in -lz" >&5 + ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -11993,7 +11880,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $ZLIB_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:11895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12026,13 +11913,13 @@ + fi + + fi +-if test "$SYSTEM_ZLIB" = 1; then ++if test "$SYSTEM_ZLIB" = 0; then + LIBS="$ZLIB_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_ZLIB= + else + cat > conftest.$ac_ext < +@@ -12053,7 +11940,7 @@ + } + + EOF +-if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:11944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_ZLIB=1 + else +@@ -12076,6 +11963,74 @@ + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi + ++# Check whether --with-system-bz2 or --without-system-bz2 was given. ++if test "${with_system_bz2+set}" = set; then ++ withval="$with_system_bz2" ++ BZ2_DIR=$withval ++fi ++ ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LDFLAGS=$LDFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then ++ CFLAGS="-I${BZ2_DIR}/include $CFLAGS" ++ LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS" ++fi ++if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then ++ SYSTEM_BZ2= ++else ++ echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 ++echo "configure:11985: checking for BZ2_bzread in -lbz2" >&5 ++ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lbz2 $MOZ_BZ2_LIBS $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ SYSTEM_BZ2=1 MOZ_BZ2_LIBS="-lbz2" ++else ++ echo "$ac_t""no" 1>&6 ++SYSTEM_BZ2= MOZ_BZ2_CFLAGS= MOZ_BZ2_LIBS= ++fi ++ ++fi ++CFLAGS=$_SAVE_CFLAGS ++LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS ++ ++if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then ++ MOZ_BZ2_CFLAGS="-I${BZ2_DIR}/include" ++ MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}" ++fi ++ + # Check whether --with-system-png or --without-system-png was given. + if test "${with_system_png+set}" = set; then + withval="$with_system_png" +@@ -12096,7 +12051,7 @@ + SYSTEM_PNG= + else + echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +-echo "configure:12101: checking for png_get_valid in -lpng" >&5 ++echo "configure:12055: checking for png_get_valid in -lpng" >&5 + ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12104,7 +12059,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpng $PNG_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12137,13 +12092,13 @@ + fi + + fi +-if test "$SYSTEM_PNG" = 1; then ++if test "$SYSTEM_PNG" = 0; then + LIBS="$PNG_LIBS $LIBS" + if test "$cross_compiling" = yes; then + SYSTEM_PNG= + else + cat > conftest.$ac_ext < + #include +@@ -12157,7 +12112,7 @@ + } + + EOF +-if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + SYSTEM_PNG=1 + else +@@ -12182,6 +12137,116 @@ + + fi # SKIP_LIBRARY_CHECKS + ++# Check whether --enable-system-hunspell or --disable-system-hunspell was given. ++if test "${enable_system_hunspell+set}" = set; then ++ enableval="$enable_system_hunspell" ++ if test "$enableval" = "yes"; then ++ SYSTEM_HUNSPELL=1 ++ elif test "$enableval" = "no"; then ++ : ++ else ++ { echo "configure: error: Option, system-hunspell, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++if test -n "$SYSTEM_HUNSPELL"; 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:12162: 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 hunspell""... $ac_c" 1>&6 ++echo "configure:12206: checking for hunspell" >&5 ++ ++ if $PKG_CONFIG --exists "hunspell" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 ++echo "configure:12213: checking MOZ_HUNSPELL_CFLAGS" >&5 ++ MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` ++ echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 ++echo "configure:12218: checking MOZ_HUNSPELL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"hunspell\"` `$PKG_CONFIG --libs-only-l \"hunspell\"`" ++ echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 ++ else ++ MOZ_HUNSPELL_CFLAGS="" ++ MOZ_HUNSPELL_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ MOZ_HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hunspell"` ++ echo $MOZ_HUNSPELL_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 (hunspell) 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 +@@ -12407,7 +12472,7 @@ + # Extract the first word of "gtk-config", so it can be a program name with args. + set dummy gtk-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12412: checking for $ac_word" >&5 ++echo "configure:12476: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12442,7 +12507,7 @@ + + min_gtk_version=$GTK_VERSION + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +-echo "configure:12447: checking for GTK - version >= $min_gtk_version" >&5 ++echo "configure:12511: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes +@@ -12465,7 +12530,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -12543,7 +12608,7 @@ + } + + EOF +-if { (eval echo configure:12548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -12578,7 +12643,7 @@ + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + cat > conftest.$ac_ext < +@@ -12588,7 +12653,7 @@ + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:12593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" +@@ -12640,7 +12705,7 @@ + # 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:12645: checking for $ac_word" >&5 ++echo "configure:12709: 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 +@@ -12684,19 +12749,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:12689: checking for gtk+-2.0 >= 1.3.7" >&5 ++echo "configure:12753: checking for gtk+-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +-echo "configure:12696: checking MOZ_GTK2_CFLAGS" >&5 ++echo "configure:12760: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +-echo "configure:12701: checking MOZ_GTK2_LIBS" >&5 ++echo "configure:12765: checking MOZ_GTK2_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" +@@ -12761,7 +12826,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:12766: checking for $ac_word" >&5 ++echo "configure:12830: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -12813,7 +12878,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +-echo "configure:12818: checking for main in -lqt" >&5 ++echo "configure:12882: checking for main in -lqt" >&5 + ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12821,14 +12886,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12847,7 +12912,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +-echo "configure:12852: checking for main in -lqt-mt" >&5 ++echo "configure:12916: checking for main in -lqt-mt" >&5 + ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -12855,14 +12920,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-lqt-mt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:12931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -12898,9 +12963,9 @@ + LIBS="$LIBS $QT_LIBS" + + echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +-echo "configure:12903: checking Qt - version >= $QT_VERSION" >&5 ++echo "configure:12967: checking Qt - version >= $QT_VERSION" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -12911,7 +12976,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:12916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:12980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="yes" + else +@@ -13507,7 +13572,7 @@ + # 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:13512: checking for $ac_word" >&5 ++echo "configure:13576: 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 +@@ -13551,19 +13616,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for xft""... $ac_c" 1>&6 +-echo "configure:13556: checking for xft" >&5 ++echo "configure:13620: checking for xft" >&5 + + if $PKG_CONFIG --exists "xft" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13563: checking MOZ_XFT_CFLAGS" >&5 ++echo "configure:13627: checking MOZ_XFT_CFLAGS" >&5 + MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` + echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +-echo "configure:13568: checking MOZ_XFT_LIBS" >&5 ++echo "configure:13632: checking MOZ_XFT_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" +@@ -13598,7 +13663,7 @@ + # 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:13603: checking for $ac_word" >&5 ++echo "configure:13667: 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 +@@ -13642,19 +13707,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 +-echo "configure:13647: checking for pango >= 1.1.0" >&5 ++echo "configure:13711: checking for pango >= 1.1.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.1.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13654: checking _PANGOCHK_CFLAGS" >&5 ++echo "configure:13718: checking _PANGOCHK_CFLAGS" >&5 + _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` + echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 + + echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +-echo "configure:13659: checking _PANGOCHK_LIBS" >&5 ++echo "configure:13723: checking _PANGOCHK_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" +@@ -13714,7 +13779,7 @@ + # 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:13719: checking for $ac_word" >&5 ++echo "configure:13783: 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 +@@ -13758,19 +13823,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 +-echo "configure:13763: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++echo "configure:13827: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13770: checking MOZ_PANGO_CFLAGS" >&5 ++echo "configure:13834: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +-echo "configure:13775: checking MOZ_PANGO_LIBS" >&5 ++echo "configure:13839: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" +@@ -13838,7 +13903,7 @@ + _SAVE_LDFLAGS="$LDFLAGS" + LDFLAGS="$XLDFLAGS $LDFLAGS" + echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +-echo "configure:13843: checking for XpGetPrinterList in -lXp" >&5 ++echo "configure:13907: checking for XpGetPrinterList in -lXp" >&5 + ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -13846,7 +13911,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -13930,7 +13995,7 @@ + # 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:13935: checking for $ac_word" >&5 ++echo "configure:13999: 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 +@@ -13974,19 +14039,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +-echo "configure:13979: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++echo "configure:14043: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 + + if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +-echo "configure:13986: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++echo "configure:14050: checking MOZ_GNOMEVFS_CFLAGS" >&5 + MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +-echo "configure:13991: checking MOZ_GNOMEVFS_LIBS" >&5 ++echo "configure:14055: checking MOZ_GNOMEVFS_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" +@@ -14037,7 +14102,7 @@ + # 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:14042: checking for $ac_word" >&5 ++echo "configure:14106: 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 +@@ -14081,19 +14146,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +-echo "configure:14086: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++echo "configure:14150: checking for gconf-2.0 >= $GCONF_VERSION" >&5 + + if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14093: checking MOZ_GCONF_CFLAGS" >&5 ++echo "configure:14157: checking MOZ_GCONF_CFLAGS" >&5 + MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` + echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +-echo "configure:14098: checking MOZ_GCONF_LIBS" >&5 ++echo "configure:14162: checking MOZ_GCONF_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" +@@ -14140,7 +14205,7 @@ + # 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:14145: checking for $ac_word" >&5 ++echo "configure:14209: 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 +@@ -14184,19 +14249,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +-echo "configure:14189: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++echo "configure:14253: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14196: checking MOZ_LIBGNOME_CFLAGS" >&5 ++echo "configure:14260: checking MOZ_LIBGNOME_CFLAGS" >&5 + MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` + echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +-echo "configure:14201: checking MOZ_LIBGNOME_LIBS" >&5 ++echo "configure:14265: checking MOZ_LIBGNOME_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" +@@ -14274,7 +14339,7 @@ + # 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:14279: checking for $ac_word" >&5 ++echo "configure:14343: 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 +@@ -14318,19 +14383,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +-echo "configure:14323: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++echo "configure:14387: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 + + if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +-echo "configure:14330: checking MOZ_GNOMEUI_CFLAGS" >&5 ++echo "configure:14394: checking MOZ_GNOMEUI_CFLAGS" >&5 + MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +-echo "configure:14335: checking MOZ_GNOMEUI_LIBS" >&5 ++echo "configure:14399: checking MOZ_GNOMEUI_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" +@@ -14816,7 +14881,7 @@ + # Extract the first word of "javac", so it can be a program name with args. + set dummy javac; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14821: checking for $ac_word" >&5 ++echo "configure:14885: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -14852,7 +14917,7 @@ + # Extract the first word of "jar", so it can be a program name with args. + set dummy jar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:14857: checking for $ac_word" >&5 ++echo "configure:14921: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15099,7 +15164,7 @@ + gdiplus) + MOZ_SVG_RENDERER_GDIPLUS=1 + echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +-echo "configure:15104: checking for Gdiplus.h" >&5 ++echo "configure:15168: checking for Gdiplus.h" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -15109,7 +15174,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include +@@ -15118,7 +15183,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:15123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + else +@@ -15198,7 +15263,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15203: checking for $ac_word" >&5 ++echo "configure:15267: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15243,7 +15308,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15248: checking for $ac_word" >&5 ++echo "configure:15312: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15312,13 +15377,13 @@ + msvc*|mks*|cygwin*|mingw*|wince*) + if test -n "$MOZ_UPDATER"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:15317: checking for iconv" >&5 ++echo "configure:15381: checking for iconv" >&5 + for ac_prog in $HOST_ICONV "iconv" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:15323: checking for $ac_word" >&5 ++echo "configure:15387: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -15461,6 +15526,21 @@ + fi + + ++ ++ENABLE_EMBEDDING_TESTS=$ENABLE_TESTS ++# Check whether --enable-embedding-tests or --disable-embedding-tests was given. ++if test "${enable_embedding_tests+set}" = set; then ++ enableval="$enable_embedding_tests" ++ if test "$enableval" = "yes"; then ++ ENABLE_EMBEDDING_TESTS=1 ++ elif test "$enableval" = "no"; then ++ ENABLE_EMBEDDING_TESTS= ++ else ++ { echo "configure: error: Option, embedding-tests, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ + # Individual module options + + # Check whether --enable-xpcom-lea or --disable-xpcom-lea was given. +@@ -15603,6 +15683,84 @@ + fi + + ++# Check whether --enable-js-binary or --disable-js-binary was given. ++if test "${enable_js_binary+set}" = set; then ++ enableval="$enable_js_binary" ++ if test "$enableval" = "yes"; then ++ ENABLE_JS_BINARY=1 ++ elif test "$enableval" = "no"; then ++ ENABLE_JS_BINARY= ++ else ++ { echo "configure: error: Option, js-binary, does not take an argument ($enableval)." 1>&2; exit 1; } ++ fi ++fi ++ ++ ++ ++if test -n "$ENABLE_JS_BINARY"; then ++ READLINE_DIR=no ++ # Check whether --with-readline or --without-readline was given. ++if test "${with_readline+set}" = set; then ++ withval="$with_readline" ++ READLINE_DIR=$withval ++fi ++ ++ ++ if test -n "${READLINE_DIR}" -a "${READLINE_DIR}" != "no"; then ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 ++echo "configure:15714: checking for readline in -lreadline" >&5 ++ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lreadline $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ HAVE_READLINE=1 READLINE_LIBS="-lreadline" ++else ++ echo "$ac_t""no" 1>&6 ++HAVE_READLINE= READLINE_LIBS= ++fi ++ ++ LDFLAGS=$_SAVE_LDFLAGS ++ fi ++ ++ if test "${READLINE_DIR}" -a -d "${READLINE_DIR}" -a "$HAVE_READLINE" = 1; then ++ READLINE_LIBS="-L${READLINE_DIR}/lib ${READLINE_LIBS}" ++ fi ++fi ++ ++ ++ ++ + + # Debugging and Optimizations + +@@ -15664,18 +15822,18 @@ + + if test -n "$MOZ_DEBUG"; then + echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +-echo "configure:15669: checking for valid debug flags" >&5 ++echo "configure:15826: checking for valid debug flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15716,18 +15874,18 @@ + if test "$COMPILE_ENVIRONMENT"; then + if test -n "$MOZ_OPTIMIZE"; then + echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +-echo "configure:15721: checking for valid optimization flags" >&5 ++echo "configure:15878: checking for valid optimization flags" >&5 + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:15732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:15889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _results=yes + else +@@ -15944,7 +16102,7 @@ + + if test -n "$_ENABLE_EFENCE"; then + echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +-echo "configure:15949: checking for malloc in -lefence" >&5 ++echo "configure:16106: checking for malloc in -lefence" >&5 + ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -15952,7 +16110,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lefence $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -16064,12 +16222,12 @@ + for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16069: checking for $ac_func" >&5 ++echo "configure:16226: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16338,12 +16496,12 @@ + for ac_func in __cxa_demangle + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:16343: checking for $ac_func" >&5 ++echo "configure:16500: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -16448,6 +16606,53 @@ + { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; } + fi + ++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" || ++ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then ++ for ac_prog in zip ++do ++# Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:16617: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ case "$ZIP" in ++ /*) ++ ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path. ++ ;; ++ ?:/*) ++ ac_cv_path_ZIP="$ZIP" # 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_ZIP="$ac_dir/$ac_word" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++ ;; ++esac ++fi ++ZIP="$ac_cv_path_ZIP" ++if test -n "$ZIP"; then ++ echo "$ac_t""$ZIP" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++test -n "$ZIP" && break ++done ++ ++ if test -z "$ZIP" || test "$ZIP" = ":"; then ++ { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; } ++ fi ++fi ++ + # Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given. + if test "${with_default_mozilla_five_home+set}" = set; then + withval="$with_default_mozilla_five_home" +@@ -16507,7 +16712,7 @@ + # Compiler Options + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +-echo "configure:16512: checking for gcc -pipe support" >&5 ++echo "configure:16716: checking for gcc -pipe support" >&5 + if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then + echo '#include ' > dummy-hello.c + echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c +@@ -16522,14 +16727,14 @@ + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -pipe" + cat > conftest.$ac_ext < + int main() { + printf("Hello World\n"); + ; return 0; } + EOF +-if { (eval echo configure:16534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _res_gcc_pipe="yes" + else +@@ -16571,16 +16776,16 @@ + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" + echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +-echo "configure:16576: checking whether compiler supports -Wno-long-long" >&5 ++echo "configure:16780: checking whether compiler supports -Wno-long-long" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" + _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" +@@ -16601,16 +16806,16 @@ + CFLAGS="$CFLAGS -fprofile-generate" + + echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +-echo "configure:16606: checking whether C compiler supports -fprofile-generate" >&5 ++echo "configure:16810: checking whether C compiler supports -fprofile-generate" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-generate" + result="yes" +@@ -16628,16 +16833,16 @@ + else + CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" + echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +-echo "configure:16633: checking whether C compiler supports -fprofile-arcs" >&5 ++echo "configure:16837: checking whether C compiler supports -fprofile-arcs" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + PROFILE_GEN_CFLAGS="-fprofile-arcs" + result="yes" +@@ -16683,16 +16888,16 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" + echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +-echo "configure:16688: checking whether C++ compiler has -pedantic long long bug" >&5 ++echo "configure:16892: checking whether C++ compiler has -pedantic long long bug" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + result="no" + else +@@ -16717,13 +16922,16 @@ + fi + + echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 +-echo "configure:16722: checking for correct temporary object destruction order" >&5 ++echo "configure:16926: checking for correct temporary object destruction order" >&5 + if test "$cross_compiling" = yes; then + result="maybe" + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + result="yes" + else +@@ -16763,12 +16971,12 @@ + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" + echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +-echo "configure:16768: checking for correct overload resolution with const and templates" >&5 ++echo "configure:16975: checking for correct overload resolution with const and templates" >&5 + if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -16798,7 +17006,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:16803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_nscap_nonconst_opeq_bug="no" + else +@@ -17090,7 +17298,7 @@ + # 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:17095: checking for $ac_word" >&5 ++echo "configure:17302: 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 +@@ -17134,19 +17342,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:17139: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:17346: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:17146: checking LIBIDL_CFLAGS" >&5 ++echo "configure:17353: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:17151: checking LIBIDL_LIBS" >&5 ++echo "configure:17358: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -17269,7 +17477,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17274: checking for $ac_word" >&5 ++echo "configure:17481: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17304,7 +17512,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17309: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17327,7 +17535,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17403,7 +17611,7 @@ + } + + EOF +-if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17437,7 +17645,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17447,7 +17655,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -17491,7 +17699,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17496: checking for $ac_word" >&5 ++echo "configure:17703: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17526,7 +17734,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:17531: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -17553,7 +17761,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17639,7 +17847,7 @@ + } + + EOF +-if { (eval echo configure:17644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17673,7 +17881,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -17684,7 +17892,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -17812,7 +18020,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:17817: checking for $ac_word" >&5 ++echo "configure:18024: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -17847,7 +18055,7 @@ + + min_glib_version=1.2.0 + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:17852: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -17870,7 +18078,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -17946,7 +18154,7 @@ + } + + EOF +-if { (eval echo configure:17951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -17980,7 +18188,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -17990,7 +18198,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:17995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18034,7 +18242,7 @@ + # Extract the first word of "libIDL-config", so it can be a program name with args. + set dummy libIDL-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18039: checking for $ac_word" >&5 ++echo "configure:18246: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18069,7 +18277,7 @@ + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +-echo "configure:18074: checking for libIDL - version >= $min_libIDL_version" >&5 ++echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes +@@ -18096,7 +18304,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18182,7 +18390,7 @@ + } + + EOF +-if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18216,7 +18424,7 @@ + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +@@ -18227,7 +18435,7 @@ + return IDL_get_libver_string ? 1 : 0; + ; return 0; } + EOF +-if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libIDL or finding the wrong" +@@ -18268,7 +18476,7 @@ + # 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:18273: checking for $ac_word" >&5 ++echo "configure:18480: 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 +@@ -18312,19 +18520,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:18317: checking for libIDL-2.0 >= 0.8.0" >&5 ++echo "configure:18524: checking for libIDL-2.0 >= 0.8.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18324: checking LIBIDL_CFLAGS" >&5 ++echo "configure:18531: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +-echo "configure:18329: checking LIBIDL_LIBS" >&5 ++echo "configure:18536: checking LIBIDL_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" +@@ -18360,7 +18568,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18365: checking for $ac_word" >&5 ++echo "configure:18572: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18397,7 +18605,7 @@ + + if test -n "$ORBIT_CONFIG"; then + echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +-echo "configure:18402: checking for ORBit libIDL usability" >&5 ++echo "configure:18609: checking for ORBit libIDL usability" >&5 + _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` + _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` + _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` +@@ -18414,7 +18622,7 @@ + result="maybe" + else + cat > conftest.$ac_ext < +@@ -18429,7 +18637,7 @@ + } + + EOF +-if { (eval echo configure:18434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + _LIBIDL_FOUND=1 + result="yes" +@@ -18486,7 +18694,7 @@ + # 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:18491: checking for $ac_word" >&5 ++echo "configure:18698: 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 +@@ -18530,19 +18738,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +-echo "configure:18535: checking for glib-2.0 >= 1.3.7" >&5 ++echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +-echo "configure:18542: checking GLIB_CFLAGS" >&5 ++echo "configure:18749: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +-echo "configure:18547: checking GLIB_LIBS" >&5 ++echo "configure:18754: checking GLIB_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" +@@ -18626,7 +18834,7 @@ + # Extract the first word of "glib-config", so it can be a program name with args. + set dummy glib-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:18631: checking for $ac_word" >&5 ++echo "configure:18838: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -18661,7 +18869,7 @@ + + min_glib_version=${GLIB_VERSION} + echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +-echo "configure:18666: checking for GLIB - version >= $min_glib_version" >&5 ++echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5 + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes +@@ -18684,7 +18892,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -18760,7 +18968,7 @@ + } + + EOF +-if { (eval echo configure:18765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -18794,7 +19002,7 @@ + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat > conftest.$ac_ext < +@@ -18804,7 +19012,7 @@ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; return 0; } + EOF +-if { (eval echo configure:18809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" +@@ -18884,19 +19092,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:18889: checking for working alloca.h" >&5 ++echo "configure:19096: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:18901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -18917,12 +19125,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:18922: checking for alloca" >&5 ++echo "configure:19129: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -18982,12 +19190,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:18987: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19194: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&6 +-echo "configure:19017: checking for $ac_func" >&5 ++echo "configure:19224: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -19067,7 +19275,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:19072: checking stack direction for C alloca" >&5 ++echo "configure:19279: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19075,7 +19283,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -19143,17 +19351,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:19148: checking for $ac_hdr" >&5 ++echo "configure:19355: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:19158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -19244,7 +19452,7 @@ + # 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:19249: checking for $ac_word" >&5 ++echo "configure:19456: 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 +@@ -19288,19 +19496,19 @@ + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +-echo "configure:19293: checking for cairo >= $CAIRO_VERSION" >&5 ++echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +-echo "configure:19300: checking CAIRO_CFLAGS" >&5 ++echo "configure:19507: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +-echo "configure:19305: checking CAIRO_LIBS" >&5 ++echo "configure:19512: checking CAIRO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" +@@ -19330,6 +19538,199 @@ + + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; 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:19552: 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 cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6 ++echo "configure:19596: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 ++echo "configure:19603: checking CAIRO_XLIB_CFLAGS" >&5 ++ CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 ++echo "configure:19608: checking CAIRO_XLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" ++ echo "$ac_t""$CAIRO_XLIB_LIBS" 1>&6 ++ else ++ CAIRO_XLIB_CFLAGS="" ++ CAIRO_XLIB_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"` ++ ++ 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 ++ : ++ fi ++ ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; 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:19647: 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 cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 ++echo "configure:19691: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 ++echo "configure:19698: checking CAIRO_XRENDER_CFLAGS" >&5 ++ CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 ++echo "configure:19703: checking CAIRO_XRENDER_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" ++ echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 ++ else ++ CAIRO_XRENDER_CFLAGS="" ++ CAIRO_XRENDER_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ ++ 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 ++ : ++ fi ++ ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + +@@ -19337,6 +19738,10 @@ + + + ++ ++ ++ ++ + # Check whether --enable-xul or --disable-xul was given. + if test "${enable_xul+set}" = set; then + enableval="$enable_xul" +@@ -19365,7 +19770,7 @@ + # Extract the first word of "python", so it can be a program name with args. + set dummy python; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:19370: checking for $ac_word" >&5 ++echo "configure:19774: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -19641,14 +20046,14 @@ + cross_compiling=$ac_cv_prog_cc_cross + + cat > conftest.$ac_ext < + int main() { + int x = 1; x++; + ; return 0; } + EOF +-if { (eval echo configure:19653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -19832,6 +20237,7 @@ + + + ++ + CFLAGS=`echo \ + $_WARNINGS_CFLAGS \ + $CFLAGS` +@@ -19928,6 +20334,9 @@ + + + ++ ++ ++ + cat >> confdefs.h < conftest.$ac_ext < +@@ -19971,7 +20380,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:19976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -20189,34 +20598,15 @@ + # Transform confdefs.h into DEFS. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-# +-# If the first sed substitution is executed (which looks for macros that +-# take arguments), then we branch to the quote section. Otherwise, +-# look for a macro that doesn't take arguments. +-cat >confdef2opt.sed <<\_ACEOF +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +-t quote +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +-t quote +-d +-: quote +-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +-s,\[,\\&,g +-s,\],\\&,g +-s,\$,$$,g +-p +-_ACEOF +-# We use echo to avoid assuming a particular line-breaking character. +-# The extra dot is to prevent the shell from consuming trailing +-# line-breaks from the sub-command output. A line-break within +-# single-quotes doesn't work because, if this script is created in a +-# platform that uses two characters for line-breaks (e.g., DOS), tr +-# would break. +-ac_LF_and_DOT=`echo; echo .` +-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +-rm -f confdef2opt.sed ++cat > conftest.defs <<\EOF ++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g ++s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g ++s%\[%\\&%g ++s%\]%\\&%g ++s%\$%$$%g ++EOF ++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ++rm -f conftest.defs + + MOZ_DEFINES=$DEFS + +@@ -20419,7 +20809,6 @@ + s%@WHOAMI@%$WHOAMI%g + s%@AUTOCONF@%$AUTOCONF%g + s%@UNZIP@%$UNZIP%g +-s%@ZIP@%$ZIP%g + s%@SYSTEM_MAKEDEPEND@%$SYSTEM_MAKEDEPEND%g + s%@XARGS@%$XARGS%g + s%@PBBUILD@%$PBBUILD%g +@@ -20456,10 +20845,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_HUNSPELL_CFLAGS@%$MOZ_HUNSPELL_CFLAGS%g ++s%@MOZ_HUNSPELL_LIBS@%$MOZ_HUNSPELL_LIBS%g ++s%@SYSTEM_HUNSPELL@%$SYSTEM_HUNSPELL%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 +@@ -20533,6 +20925,9 @@ + s%@MOZ_SAFE_BROWSING@%$MOZ_SAFE_BROWSING%g + s%@MOZ_URL_CLASSIFIER@%$MOZ_URL_CLASSIFIER%g + s%@JS_ULTRASPARC_OPTS@%$JS_ULTRASPARC_OPTS%g ++s%@ENABLE_JS_BINARY@%$ENABLE_JS_BINARY%g ++s%@HAVE_READLINE@%$HAVE_READLINE%g ++s%@READLINE_LIBS@%$READLINE_LIBS%g + s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g + s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g + s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g +@@ -20540,6 +20935,7 @@ + s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g + s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g + s%@MOZ_DEMANGLE_SYMBOLS@%$MOZ_DEMANGLE_SYMBOLS%g ++s%@ZIP@%$ZIP%g + s%@MOZ_DOC_INPUT_DIRS@%$MOZ_DOC_INPUT_DIRS%g + s%@MOZ_DOC_INCLUDE_DIRS@%$MOZ_DOC_INCLUDE_DIRS%g + s%@MOZ_DOC_OUTPUT_DIR@%$MOZ_DOC_OUTPUT_DIR%g +@@ -20580,9 +20976,17 @@ + s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g + s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g + s%@CAIRO_LIBS@%$CAIRO_LIBS%g ++s%@CAIRO_XLIB_CFLAGS@%$CAIRO_XLIB_CFLAGS%g ++s%@CAIRO_XLIB_LIBS@%$CAIRO_XLIB_LIBS%g ++s%@CAIRO_XRENDER_CFLAGS@%$CAIRO_XRENDER_CFLAGS%g ++s%@CAIRO_XRENDER_LIBS@%$CAIRO_XRENDER_LIBS%g + s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g + s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g + s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g ++s%@MOZ_CAIRO_XLIB_CFLAGS@%$MOZ_CAIRO_XLIB_CFLAGS%g ++s%@MOZ_CAIRO_XLIB_LIBS@%$MOZ_CAIRO_XLIB_LIBS%g ++s%@MOZ_CAIRO_XRENDER_CFLAGS@%$MOZ_CAIRO_XRENDER_CFLAGS%g ++s%@MOZ_CAIRO_XRENDER_LIBS@%$MOZ_CAIRO_XRENDER_LIBS%g + s%@MOZ_XUL@%$MOZ_XUL%g + s%@MOZ_PYTHON@%$MOZ_PYTHON%g + s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g +@@ -20691,6 +21095,7 @@ + s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g + s%@MOZ_ENABLE_LIBXUL@%$MOZ_ENABLE_LIBXUL%g + s%@ENABLE_TESTS@%$ENABLE_TESTS%g ++s%@ENABLE_EMBEDDING_TESTS@%$ENABLE_EMBEDDING_TESTS%g + s%@IBMBIDI@%$IBMBIDI%g + s%@SUNCTL@%$SUNCTL%g + s%@ACCESSIBILITY@%$ACCESSIBILITY%g +@@ -20740,6 +21145,7 @@ + s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g + s%@SYSTEM_PNG@%$SYSTEM_PNG%g + s%@SYSTEM_ZLIB@%$SYSTEM_ZLIB%g ++s%@SYSTEM_BZ2@%$SYSTEM_BZ2%g + s%@JPEG_CFLAGS@%$JPEG_CFLAGS%g + s%@JPEG_LIBS@%$JPEG_LIBS%g + s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g +@@ -20750,6 +21156,8 @@ + s%@MOZ_JPEG_LIBS@%$MOZ_JPEG_LIBS%g + s%@MOZ_ZLIB_CFLAGS@%$MOZ_ZLIB_CFLAGS%g + s%@MOZ_ZLIB_LIBS@%$MOZ_ZLIB_LIBS%g ++s%@MOZ_BZ2_CFLAGS@%$MOZ_BZ2_CFLAGS%g ++s%@MOZ_BZ2_LIBS@%$MOZ_BZ2_LIBS%g + s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g + s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g + s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g +@@ -21155,7 +21563,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -21298,7 +21706,7 @@ + fi + fi + +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +diff -urNad xulrunner-1.8.1.14+nobinonly~/configure.rej xulrunner-1.8.1.14+nobinonly/configure.rej +--- xulrunner-1.8.1.14+nobinonly~/configure.rej 1970-01-01 01:00:00.000000000 +0100 ++++ xulrunner-1.8.1.14+nobinonly/configure.rej 2008-04-23 00:55:54.000000000 +0200 +@@ -0,0 +1,6403 @@ ++*************** ++*** 7966,7973 **** ++ echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 ++ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ ++ "$ac_cv_have_visibility_class_bug" = "no"; then ++- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' ++- WRAP_SYSTEM_INCLUDES=1 ++ else ++ VISIBILITY_FLAGS='-fvisibility=hidden' ++ fi # have visibility pragma bug ++--- 7966,7972 ---- ++ echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 ++ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ ++ "$ac_cv_have_visibility_class_bug" = "no"; then +++ VISIBILITY_FLAGS='-fvisibility=hidden' ++ else ++ VISIBILITY_FLAGS='-fvisibility=hidden' ++ fi # have visibility pragma bug ++*************** ++*** 7984,7995 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 ++- echo "configure:7988: checking for $ac_hdr that defines DIR" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ #include <$ac_hdr> ++--- 7983,7994 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +++ echo "configure:7987: checking for $ac_hdr that defines DIR" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ #include <$ac_hdr> ++*************** ++*** 7997,8003 **** ++ DIR *dirp = 0; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:8001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ eval "ac_cv_header_dirent_$ac_safe=yes" ++ else ++--- 7996,8002 ---- ++ DIR *dirp = 0; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ eval "ac_cv_header_dirent_$ac_safe=yes" ++ else ++*************** ++*** 8022,8028 **** ++ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++ if test $ac_header_dirent = dirent.h; then ++ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 ++- echo "configure:8026: checking for opendir in -ldir" >&5 ++ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8021,8027 ---- ++ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++ if test $ac_header_dirent = dirent.h; then ++ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +++ echo "configure:8025: checking for opendir in -ldir" >&5 ++ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8030,8036 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-ldir $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8040,8046 ---- ++ opendir() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8063,8069 **** ++ ++ else ++ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 ++- echo "configure:8067: checking for opendir in -lx" >&5 ++ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8062,8068 ---- ++ ++ else ++ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +++ echo "configure:8066: checking for opendir in -lx" >&5 ++ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8071,8077 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lx $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8081,8087 ---- ++ opendir() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8114,8130 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8118: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8113,8129 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8117: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8154,8170 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8158: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8153,8169 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8157: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8194,8210 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8198: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8193,8209 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8197: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8234,8250 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8238: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8233,8249 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8237: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8274,8290 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8278: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8273,8289 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8277: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8315,8331 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8319: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8314,8330 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8318: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8356,8372 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8360: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8355,8371 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8359: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8403,8419 **** ++ NEW_H=new.h ++ ac_safe=`echo "new" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for new""... $ac_c" 1>&6 ++- echo "configure:8407: checking for new" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8402,8418 ---- ++ NEW_H=new.h ++ ac_safe=`echo "new" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for new""... $ac_c" 1>&6 +++ echo "configure:8406: checking for new" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8454,8470 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:8458: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8453,8469 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:8457: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8498,8504 **** ++ ;; ++ *) ++ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 ++- echo "configure:8502: checking for gethostbyname_r in -lc_r" >&5 ++ ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8497,8503 ---- ++ ;; ++ *) ++ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 +++ echo "configure:8501: checking for gethostbyname_r in -lc_r" >&5 ++ ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8506,8512 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lc_r $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8516,8522 ---- ++ gethostbyname_r() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8547,8553 **** ++ ;; ++ esac ++ echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 ++- echo "configure:8551: checking for atan in -lm" >&5 ++ ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8546,8552 ---- ++ ;; ++ esac ++ echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 +++ echo "configure:8550: checking for atan in -lm" >&5 ++ ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8555,8561 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lm $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8565,8571 ---- ++ atan() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8600,8606 **** ++ ;; ++ *) ++ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ++- echo "configure:8604: checking for dlopen in -ldl" >&5 ++ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8599,8605 ---- ++ ;; ++ *) ++ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +++ echo "configure:8603: checking for dlopen in -ldl" >&5 ++ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8608,8614 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-ldl $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8618,8624 ---- ++ dlopen() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8636,8652 **** ++ echo "$ac_t""yes" 1>&6 ++ ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 ++- echo "configure:8640: checking for dlfcn.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:8650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 8635,8651 ---- ++ echo "$ac_t""yes" 1>&6 ++ ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +++ echo "configure:8639: checking for dlfcn.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 8682,8688 **** ++ case $target in ++ *-aix*) ++ echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 ++- echo "configure:8686: checking for demangle in -lC_r" >&5 ++ ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8681,8687 ---- ++ case $target in ++ *-aix*) ++ echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 +++ echo "configure:8685: checking for demangle in -lC_r" >&5 ++ ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8690,8696 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lC_r $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8700,8706 ---- ++ demangle() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8731,8737 **** ++ ;; ++ *) ++ echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 ++- echo "configure:8735: checking for demangle in -lC" >&5 ++ ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8730,8736 ---- ++ ;; ++ *) ++ echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 +++ echo "configure:8734: checking for demangle in -lC" >&5 ++ ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8739,8745 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lC $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8749,8755 ---- ++ demangle() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8781,8787 **** ++ esac ++ fi ++ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 ++- echo "configure:8785: checking for socket in -lsocket" >&5 ++ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8780,8786 ---- ++ esac ++ fi ++ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +++ echo "configure:8784: checking for socket in -lsocket" >&5 ++ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8789,8795 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lsocket $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8799,8805 ---- ++ socket() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8845,8851 **** ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$XLDFLAGS $LDFLAGS" ++ echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 ++- echo "configure:8849: checking for XDrawLines in -lX11" >&5 ++ ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8844,8850 ---- ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$XLDFLAGS $LDFLAGS" ++ echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 +++ echo "configure:8848: checking for XDrawLines in -lX11" >&5 ++ ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8853,8859 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lX11 $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8863,8869 ---- ++ XDrawLines() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8886,8892 **** ++ fi ++ ++ echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 ++- echo "configure:8890: checking for XextAddDisplay in -lXext" >&5 ++ ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8885,8891 ---- ++ fi ++ ++ echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 +++ echo "configure:8889: checking for XextAddDisplay in -lXext" >&5 ++ ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8894,8900 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXext $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8904,8910 ---- ++ XextAddDisplay() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8929,8935 **** ++ ++ ++ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 ++- echo "configure:8933: checking for XtFree in -lXt" >&5 ++ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8928,8934 ---- ++ ++ ++ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +++ echo "configure:8932: checking for XtFree in -lXt" >&5 ++ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8937,8943 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXt $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8947,8953 ---- ++ XtFree() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 8969,8975 **** ++ ++ unset ac_cv_lib_Xt_XtFree ++ echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 ++- echo "configure:8973: checking for IceFlush in -lICE" >&5 ++ ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 8968,8974 ---- ++ ++ unset ac_cv_lib_Xt_XtFree ++ echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 +++ echo "configure:8972: checking for IceFlush in -lICE" >&5 ++ ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 8977,8983 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lICE $XT_LIBS $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 8987,8993 ---- ++ IceFlush() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:8991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9009,9015 **** ++ fi ++ ++ echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 ++- echo "configure:9013: checking for SmcCloseConnection in -lSM" >&5 ++ ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 9008,9014 ---- ++ fi ++ ++ echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 +++ echo "configure:9012: checking for SmcCloseConnection in -lSM" >&5 ++ ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 9017,9023 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lSM $XT_LIBS $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 9027,9033 ---- ++ SmcCloseConnection() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9049,9055 **** ++ fi ++ ++ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 ++- echo "configure:9053: checking for XtFree in -lXt" >&5 ++ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 9048,9054 ---- ++ fi ++ ++ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 +++ echo "configure:9052: checking for XtFree in -lXt" >&5 ++ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 9057,9063 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 9067,9073 ---- ++ XtFree() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9102,9108 **** ++ esac ++ ++ echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 ++- echo "configure:9106: checking for XineramaIsActive in -lXinerama" >&5 ++ ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 9101,9107 ---- ++ esac ++ ++ echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 +++ echo "configure:9105: checking for XineramaIsActive in -lXinerama" >&5 ++ ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 9110,9116 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 9120,9126 ---- ++ XineramaIsActive() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9143,9159 **** ++ ++ ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 ++- echo "configure:9147: checking for X11/extensions/Xinerama.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:9157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 9142,9158 ---- ++ ++ ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 +++ echo "configure:9146: checking for X11/extensions/Xinerama.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:9156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 9176,9182 **** ++ ++ ++ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 ++- echo "configure:9180: checking for XShmCreateImage in -lXext" >&5 ++ ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 9175,9181 ---- ++ ++ ++ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 +++ echo "configure:9179: checking for XShmCreateImage in -lXext" >&5 ++ ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 9184,9190 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 9194,9200 ---- ++ XShmCreateImage() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9217,9233 **** ++ ++ ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 ++- echo "configure:9221: checking for X11/extensions/XShm.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:9231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 9216,9232 ---- ++ ++ ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 +++ echo "configure:9220: checking for X11/extensions/XShm.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:9230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 9257,9263 **** ++ fi ++ ++ echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 ++- echo "configure:9261: checking for XieFloGeometry in -lXIE" >&5 ++ ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 9256,9262 ---- ++ fi ++ ++ echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 +++ echo "configure:9260: checking for XieFloGeometry in -lXIE" >&5 ++ ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 9265,9271 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 9275,9281 ---- ++ XieFloGeometry() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 9298,9314 **** ++ ++ ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 ++- echo "configure:9302: checking for X11/extensions/XIElib.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:9312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 9297,9313 ---- ++ ++ ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 +++ echo "configure:9301: checking for X11/extensions/XIElib.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:9311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 9382,9388 **** ++ # Extract the first word of "freetype-config", so it can be a program name with args. ++ set dummy freetype-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:9386: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 9381,9387 ---- ++ # Extract the first word of "freetype-config", so it can be a program name with args. ++ set dummy freetype-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:9385: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 9418,9424 **** ++ ++ min_ft_version=6.1.0 ++ echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 ++- echo "configure:9422: checking for FreeType - version >= $min_ft_version" >&5 ++ no_ft="" ++ if test "$FT2_CONFIG" = "no" ; then ++ no_ft=yes ++--- 9417,9423 ---- ++ ++ min_ft_version=6.1.0 ++ echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 +++ echo "configure:9421: checking for FreeType - version >= $min_ft_version" >&5 ++ no_ft="" ++ if test "$FT2_CONFIG" = "no" ; then ++ no_ft=yes ++*************** ++*** 9466,9472 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 9465,9471 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 9492,9498 **** ++ } ++ ++ EOF ++- if { (eval echo configure:9496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 9491,9497 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 9544,9550 **** ++ ++ ++ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ++- echo "configure:9548: checking for pthread_create in -lpthreads" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++--- 9543,9549 ---- ++ ++ ++ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +++ echo "configure:9547: checking for pthread_create in -lpthreads" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++*************** ++*** 9566,9572 **** ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ++- echo "configure:9570: checking for pthread_create in -lpthread" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++--- 9565,9571 ---- ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +++ echo "configure:9569: checking for pthread_create in -lpthread" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++*************** ++*** 9588,9594 **** ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ++- echo "configure:9592: checking for pthread_create in -lc_r" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++--- 9587,9593 ---- ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +++ echo "configure:9591: checking for pthread_create in -lc_r" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++*************** ++*** 9610,9616 **** ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ++- echo "configure:9614: checking for pthread_create in -lc" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++--- 9609,9615 ---- ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 +++ echo "configure:9613: checking for pthread_create in -lc" >&5 ++ echo " ++ #include ++ void *foo(void *v) { int a = 1; } ++*************** ++*** 9666,9672 **** ++ rm -f conftest* ++ ac_cv_have_dash_pthread=no ++ echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ++- echo "configure:9670: checking whether ${CC-cc} accepts -pthread" >&5 ++ echo 'int main() { return 0; }' | cat > conftest.c ++ ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 ++ if test $? -eq 0; then ++--- 9665,9671 ---- ++ rm -f conftest* ++ ac_cv_have_dash_pthread=no ++ echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 +++ echo "configure:9669: checking whether ${CC-cc} accepts -pthread" >&5 ++ echo 'int main() { return 0; }' | cat > conftest.c ++ ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 ++ if test $? -eq 0; then ++*************** ++*** 9689,9695 **** ++ ac_cv_have_dash_pthreads=no ++ if test "$ac_cv_have_dash_pthread" = "no"; then ++ echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ++- echo "configure:9693: checking whether ${CC-cc} accepts -pthreads" >&5 ++ echo 'int main() { return 0; }' | cat > conftest.c ++ ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 ++ if test $? -eq 0; then ++--- 9688,9694 ---- ++ ac_cv_have_dash_pthreads=no ++ if test "$ac_cv_have_dash_pthread" = "no"; then ++ echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 +++ echo "configure:9692: checking whether ${CC-cc} accepts -pthreads" >&5 ++ echo 'int main() { return 0; }' | cat > conftest.c ++ ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 ++ if test $? -eq 0; then ++*************** ++*** 9784,9790 **** ++ fi ++ ++ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 ++- echo "configure:9788: checking whether mmap() sees write()s" >&5 ++ ++ ++ mmap_test_prog=' ++--- 9783,9789 ---- ++ fi ++ ++ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 +++ echo "configure:9787: checking whether mmap() sees write()s" >&5 ++ ++ ++ mmap_test_prog=' ++*************** ++*** 9823,9833 **** ++ result="yes" ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ result="yes" ++ else ++--- 9822,9832 ---- ++ result="yes" ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ result="yes" ++ else ++*************** ++*** 9852,9864 **** ++ ++ if test $ac_cv_prog_gcc = yes; then ++ echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ++- echo "configure:9856: checking whether ${CC-cc} needs -traditional" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ac_pattern="Autoconf.*'x'" ++ cat > conftest.$ac_ext < ++ Autoconf TIOCGETP ++--- 9851,9863 ---- ++ ++ if test $ac_cv_prog_gcc = yes; then ++ echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +++ echo "configure:9855: checking whether ${CC-cc} needs -traditional" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ac_pattern="Autoconf.*'x'" ++ cat > conftest.$ac_ext < ++ Autoconf TIOCGETP ++*************** ++*** 9876,9882 **** ++ ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat > conftest.$ac_ext < ++ Autoconf TCGETA ++--- 9875,9881 ---- ++ ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat > conftest.$ac_ext < ++ Autoconf TCGETA ++*************** ++*** 9898,9904 **** ++ fi ++ ++ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 ++- echo "configure:9902: checking for 8-bit clean memcmp" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 9897,9903 ---- ++ fi ++ ++ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +++ echo "configure:9901: checking for 8-bit clean memcmp" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 9906,9912 **** ++ ac_cv_func_memcmp_clean=no ++ else ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_func_memcmp_clean=yes ++ else ++--- 9915,9921 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_func_memcmp_clean=yes ++ else ++*************** ++*** 9936,9947 **** ++ for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++- echo "configure:9940: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:9939: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 9963,9969 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 9991,10002 **** ++ for ac_func in flockfile getpagesize ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++- echo "configure:9995: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:9994: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 10018,10024 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 10048,10059 **** ++ for ac_func in localtime_r strtok_r ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++- echo "configure:10052: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10051: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 10075,10081 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 10112,10130 **** ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 ++- echo "configure:10116: checking for wcrtomb" >&5 ++ if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ mbstate_t ps={0};wcrtomb(0,'f',&ps); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_have_wcrtomb="yes" ++ else ++--- 10111,10129 ---- ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 +++ echo "configure:10115: checking for wcrtomb" >&5 ++ if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ mbstate_t ps={0};wcrtomb(0,'f',&ps); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_have_wcrtomb="yes" ++ else ++*************** ++*** 10144,10162 **** ++ ++ fi ++ echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 ++- echo "configure:10148: checking for mbrtowc" >&5 ++ if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ mbstate_t ps={0};mbrtowc(0,0,0,&ps); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_have_mbrtowc="yes" ++ else ++--- 10143,10161 ---- ++ ++ fi ++ echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 +++ echo "configure:10147: checking for mbrtowc" >&5 ++ if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ mbstate_t ps={0};mbrtowc(0,0,0,&ps); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_have_mbrtowc="yes" ++ else ++*************** ++*** 10185,10196 **** ++ fi ++ ++ echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 ++- echo "configure:10189: checking for res_ninit()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10188: checking for res_ninit()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_res_ninit=yes ++ else ++--- 10201,10207 ---- ++ int foo = res_ninit(&_res); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_res_ninit=yes ++ else ++*************** ++*** 10232,10243 **** ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 ++- echo "configure:10236: checking for gnu_get_libc_version()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10235: checking for gnu_get_libc_version()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_gnu_get_libc_version=yes ++ else ++--- 10247,10253 ---- ++ const char *glibc_version = gnu_get_libc_version(); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_gnu_get_libc_version=yes ++ else ++*************** ++*** 10277,10283 **** ++ *) ++ ++ echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 ++- echo "configure:10281: checking for iconv in -lc" >&5 ++ ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 10276,10282 ---- ++ *) ++ ++ echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 +++ echo "configure:10280: checking for iconv in -lc" >&5 ++ ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 10285,10291 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lc $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 10298,10304 ---- ++ iconv() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 10318,10324 **** ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 ++- echo "configure:10322: checking for iconv in -liconv" >&5 ++ ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 10317,10323 ---- ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 +++ echo "configure:10321: checking for iconv in -liconv" >&5 ++ ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 10326,10332 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-liconv $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 10339,10345 ---- ++ iconv() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 10359,10365 **** ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 ++- echo "configure:10363: checking for libiconv in -liconv" >&5 ++ ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 10358,10364 ---- ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +++ echo "configure:10362: checking for libiconv in -liconv" >&5 ++ ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 10367,10373 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-liconv $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 10380,10386 ---- ++ libiconv() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 10408,10419 **** ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $_ICONV_LIBS" ++ echo $ac_n "checking for iconv()""... $ac_c" 1>&6 ++- echo "configure:10412: checking for iconv()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++--- 10407,10418 ---- ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $_ICONV_LIBS" ++ echo $ac_n "checking for iconv()""... $ac_c" 1>&6 +++ echo "configure:10411: checking for iconv()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 10427,10433 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_iconv=yes ++ else ++--- 10426,10432 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_iconv=yes ++ else ++*************** ++*** 10451,10462 **** ++ LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" ++ LIBICONV="$_ICONV_LIBS" ++ echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 ++- echo "configure:10455: checking for iconv() with const input" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++--- 10450,10461 ---- ++ LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" ++ LIBICONV="$_ICONV_LIBS" ++ echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 +++ echo "configure:10454: checking for iconv() with const input" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 10471,10477 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_func_const_iconv=yes ++ else ++--- 10470,10476 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_func_const_iconv=yes ++ else ++*************** ++*** 10500,10518 **** ++ ++ ++ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 ++- echo "configure:10504: checking for nl_langinfo and CODESET" >&5 ++ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ char* cs = nl_langinfo(CODESET); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ am_cv_langinfo_codeset=yes ++ else ++--- 10499,10517 ---- ++ ++ ++ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +++ echo "configure:10503: checking for nl_langinfo and CODESET" >&5 ++ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ char* cs = nl_langinfo(CODESET); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ am_cv_langinfo_codeset=yes ++ else ++*************** ++*** 10544,10550 **** ++ ++ ++ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 ++- echo "configure:10548: checking for an implementation of va_copy()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 10543,10549 ---- ++ ++ ++ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +++ echo "configure:10547: checking for an implementation of va_copy()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 10554,10560 **** ++ ++ else ++ cat > conftest.$ac_ext < ++--- 10553,10559 ---- ++ ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 10568,10574 **** ++ } ++ int main() { f (0, 42); return 0; } ++ EOF ++- if { (eval echo configure:10572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_va_copy=yes ++ else ++--- 10567,10573 ---- ++ } ++ int main() { f (0, 42); return 0; } ++ EOF +++ if { (eval echo configure:10571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_va_copy=yes ++ else ++*************** ++*** 10585,10591 **** ++ ++ echo "$ac_t""$ac_cv_va_copy" 1>&6 ++ echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 ++- echo "configure:10589: checking for an implementation of __va_copy()" >&5 ++ if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 10584,10590 ---- ++ ++ echo "$ac_t""$ac_cv_va_copy" 1>&6 ++ echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +++ echo "configure:10588: checking for an implementation of __va_copy()" >&5 ++ if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 10595,10601 **** ++ ++ else ++ cat > conftest.$ac_ext < ++--- 10594,10600 ---- ++ ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 10609,10615 **** ++ } ++ int main() { f (0, 42); return 0; } ++ EOF ++- if { (eval echo configure:10613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv___va_copy=yes ++ else ++--- 10608,10614 ---- ++ } ++ int main() { f (0, 42); return 0; } ++ EOF +++ if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv___va_copy=yes ++ else ++*************** ++*** 10626,10632 **** ++ ++ echo "$ac_t""$ac_cv___va_copy" 1>&6 ++ echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 ++- echo "configure:10630: checking whether va_lists can be copied by value" >&5 ++ if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 10625,10631 ---- ++ ++ echo "$ac_t""$ac_cv___va_copy" 1>&6 ++ echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +++ echo "configure:10629: checking whether va_lists can be copied by value" >&5 ++ if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 10636,10642 **** ++ ++ else ++ cat > conftest.$ac_ext < ++--- 10635,10641 ---- ++ ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 10650,10656 **** ++ } ++ int main() { f (0, 42); return 0; } ++ EOF ++- if { (eval echo configure:10654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_va_val_copy=yes ++ else ++--- 10649,10655 ---- ++ } ++ int main() { f (0, 42); return 0; } ++ EOF +++ if { (eval echo configure:10653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_va_val_copy=yes ++ else ++*************** ++*** 10749,10755 **** ++ if test "$GNU_CXX"; then ++ ++ echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 ++- echo "configure:10753: checking for C++ exceptions flag" >&5 ++ ++ if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 10748,10754 ---- ++ if test "$GNU_CXX"; then ++ ++ echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 +++ echo "configure:10752: checking for C++ exceptions flag" >&5 ++ ++ if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 10784,10795 **** ++ HAVE_GCC3_ABI= ++ if test "$GNU_CC"; then ++ echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 ++- echo "configure:10788: checking for gcc 3.0 ABI" >&5 ++ if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10787: checking for gcc 3.0 ABI" >&5 ++ if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_gcc_three_abi="yes" ++ else ++--- 10801,10807 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_gcc_three_abi="yes" ++ else ++*************** ++*** 10826,10837 **** ++ ++ ++ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 ++- echo "configure:10830: checking for C++ \"explicit\" keyword" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10829: checking for C++ \"explicit\" keyword" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_explicit=yes ++ else ++--- 10840,10846 ---- ++ X x(3); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_explicit=yes ++ else ++*************** ++*** 10862,10873 **** ++ fi ++ ++ echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 ++- echo "configure:10866: checking for C++ \"typename\" keyword" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:10865: checking for C++ \"typename\" keyword" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_typename=yes ++ else ++--- 10885,10891 ---- ++ A.foo(0); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_typename=yes ++ else ++*************** ++*** 10907,10918 **** ++ fi ++ ++ echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 ++- echo "configure:10911: checking for modern C++ template specialization syntax support" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < struct X { int a; }; ++ class Y {}; ++--- 10906,10917 ---- ++ fi ++ ++ echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 +++ echo "configure:10910: checking for modern C++ template specialization syntax support" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < struct X { int a; }; ++ class Y {}; ++*************** ++*** 10922,10928 **** ++ X y_x; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_modern_specialize_template_syntax=yes ++ else ++--- 10921,10927 ---- ++ X y_x; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_modern_specialize_template_syntax=yes ++ else ++*************** ++*** 10944,10955 **** ++ ++ ++ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 ++- echo "configure:10948: checking whether partial template specialization works" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Foo {}; ++ template class Foo {}; ++--- 10943,10954 ---- ++ ++ ++ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 +++ echo "configure:10947: checking whether partial template specialization works" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Foo {}; ++ template class Foo {}; ++*************** ++*** 10957,10963 **** ++ return 0; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_partial_specialization=yes ++ else ++--- 10956,10962 ---- ++ return 0; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_partial_specialization=yes ++ else ++*************** ++*** 10978,10989 **** ++ fi ++ ++ echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 ++- echo "configure:10982: checking whether operators must be re-defined for templates derived from templates" >&5 ++ if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Base { }; ++ template ++--- 10977,10988 ---- ++ fi ++ ++ echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 +++ echo "configure:10981: checking whether operators must be re-defined for templates derived from templates" >&5 ++ if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Base { }; ++ template ++*************** ++*** 10995,11001 **** ++ return 0; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:10999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_need_derived_template_operators=no ++ else ++--- 10994,11000 ---- ++ return 0; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:10998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_need_derived_template_operators=no ++ else ++*************** ++*** 11017,11028 **** ++ ++ ++ echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 ++- echo "configure:11021: checking whether we need to cast a derived template to pass as its base class" >&5 ++ if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Base { }; ++ template class Derived : public Base { }; ++--- 11016,11027 ---- ++ ++ ++ echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 +++ echo "configure:11020: checking whether we need to cast a derived template to pass as its base class" >&5 ++ if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class Base { }; ++ template class Derived : public Base { }; ++*************** ++*** 11031,11037 **** ++ Derived bar; return foo(bar); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_need_cpp_template_cast_to_base=no ++ else ++--- 11030,11036 ---- ++ Derived bar; return foo(bar); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_need_cpp_template_cast_to_base=no ++ else ++*************** ++*** 11052,11063 **** ++ fi ++ ++ echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 ++- echo "configure:11056: checking whether the compiler can resolve const ambiguities for templates" >&5 ++ if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class ptrClass { ++--- 11051,11062 ---- ++ fi ++ ++ echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 +++ echo "configure:11055: checking whether the compiler can resolve const ambiguities for templates" >&5 ++ if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < class ptrClass { ++*************** ++*** 11078,11084 **** ++ a(&i); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_can_resolve_const_ambiguity=yes ++ else ++--- 11077,11083 ---- ++ a(&i); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_can_resolve_const_ambiguity=yes ++ else ++*************** ++*** 11100,11111 **** ++ ++ ++ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 ++- echo "configure:11104: checking whether the C++ \"using\" keyword can change access" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:11103: checking whether the C++ \"using\" keyword can change access" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_access_changing_using2=no ++ else ++--- 11123,11129 ---- ++ B b; return b.foo(); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_access_changing_using2=no ++ else ++*************** ++*** 11152,11163 **** ++ fi ++ ++ echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 ++- echo "configure:11156: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:11155: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_ambiguity_resolving_using=yes ++ else ++--- 11172,11178 ---- ++ X x; Y y; y.jo(x); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_ambiguity_resolving_using=yes ++ else ++*************** ++*** 11194,11212 **** ++ fi ++ ++ echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 ++- echo "configure:11198: checking for \"std::\" namespace" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ return std::min(0, 1); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_namespace_std=yes ++ else ++--- 11193,11211 ---- ++ fi ++ ++ echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 +++ echo "configure:11197: checking for \"std::\" namespace" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ return std::min(0, 1); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_namespace_std=yes ++ else ++*************** ++*** 11227,11238 **** ++ fi ++ ++ echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 ++- echo "configure:11231: checking whether standard template operator!=() is ambiguous" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ struct T1 {}; ++--- 11226,11237 ---- ++ fi ++ ++ echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 +++ echo "configure:11230: checking whether standard template operator!=() is ambiguous" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ struct T1 {}; ++*************** ++*** 11242,11248 **** ++ T1 a,b; return a != b; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_unambiguous_std_notequal=unambiguous ++ else ++--- 11241,11247 ---- ++ T1 a,b; return a != b; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_unambiguous_std_notequal=unambiguous ++ else ++*************** ++*** 11264,11275 **** ++ ++ ++ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 ++- echo "configure:11268: checking for C++ reinterpret_cast" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:11267: checking for C++ reinterpret_cast" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <(z); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_reinterpret_cast=yes ++ else ++--- 11276,11282 ---- ++ X x; X*const z = &x;Y*y = reinterpret_cast(z); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_cpp_reinterpret_cast=yes ++ else ++*************** ++*** 11298,11304 **** ++ fi ++ ++ echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 ++- echo "configure:11302: checking for C++ dynamic_cast to void*" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 11297,11303 ---- ++ fi ++ ++ echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 +++ echo "configure:11301: checking for C++ dynamic_cast to void*" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 11306,11312 **** ++ ac_cv_cpp_dynamic_cast_void_ptr=no ++ else ++ cat > conftest.$ac_ext < conftest.$ac_ext <(suby)))); ++ } ++ EOF ++- if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_cpp_dynamic_cast_void_ptr=yes ++ else ++--- 11324,11330 ---- ++ ((void*)&mdo == dynamic_cast(suby)))); ++ } ++ EOF +++ if { (eval echo configure:11328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_cpp_dynamic_cast_void_ptr=yes ++ else ++*************** ++*** 11349,11367 **** ++ ++ ++ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 ++- echo "configure:11353: checking whether C++ requires implementation of unused virtual methods" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_cpp_unused_required=no ++ else ++--- 11348,11366 ---- ++ ++ ++ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 +++ echo "configure:11352: checking whether C++ requires implementation of unused virtual methods" >&5 ++ if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_cpp_unused_required=no ++ else ++*************** ++*** 11384,11395 **** ++ ++ ++ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 ++- echo "configure:11388: checking for trouble comparing to zero near std::operator!=()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ template class Foo {}; ++--- 11383,11394 ---- ++ ++ ++ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 +++ echo "configure:11387: checking for trouble comparing to zero near std::operator!=()" >&5 ++ if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ template class Foo {}; ++*************** ++*** 11400,11406 **** ++ Foo f; return (0 != f); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_trouble_comparing_to_zero=no ++ else ++--- 11399,11405 ---- ++ Foo f; return (0 != f); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_trouble_comparing_to_zero=no ++ else ++*************** ++*** 11432,11450 **** ++ ++ ++ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 ++- echo "configure:11436: checking for LC_MESSAGES" >&5 ++ if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ int category = LC_MESSAGES; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:11448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_i18n_lc_messages=yes ++ else ++--- 11431,11449 ---- ++ ++ ++ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +++ echo "configure:11435: checking for LC_MESSAGES" >&5 ++ if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ int category = LC_MESSAGES; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_i18n_lc_messages=yes ++ else ++*************** ++*** 11525,11531 **** ++ # Extract the first word of "nspr-config", so it can be a program name with args. ++ set dummy nspr-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:11529: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 11524,11530 ---- ++ # Extract the first word of "nspr-config", so it can be a program name with args. ++ set dummy nspr-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:11528: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 11560,11566 **** ++ ++ min_nspr_version=4.0.0 ++ echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 ++- echo "configure:11564: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++ ++ no_nspr="" ++ if test "$NSPR_CONFIG" = "no"; then ++--- 11559,11565 ---- ++ ++ min_nspr_version=4.0.0 ++ echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +++ echo "configure:11563: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 ++ ++ no_nspr="" ++ if test "$NSPR_CONFIG" = "no"; then ++*************** ++*** 11662,11668 **** ++ # Extract the first word of "nss-config", so it can be a program name with args. ++ set dummy nss-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:11666: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 11661,11667 ---- ++ # Extract the first word of "nss-config", so it can be a program name with args. ++ set dummy nss-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:11665: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 11697,11703 **** ++ ++ min_nss_version=3.0.0 ++ echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 ++- echo "configure:11701: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++ ++ no_nss="" ++ if test "$NSS_CONFIG" = "no"; then ++--- 11696,11702 ---- ++ ++ min_nss_version=3.0.0 ++ echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +++ echo "configure:11700: checking for NSS - version >= $min_nss_version (skipping)" >&5 ++ ++ no_nss="" ++ if test "$NSS_CONFIG" = "no"; then ++*************** ++*** 11770,11776 **** ++ SYSTEM_JPEG= ++ else ++ echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 ++- echo "configure:11774: checking for jpeg_destroy_compress in -ljpeg" >&5 ++ ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 11769,11775 ---- ++ SYSTEM_JPEG= ++ else ++ echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +++ echo "configure:11773: checking for jpeg_destroy_compress in -ljpeg" >&5 ++ ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 11778,11784 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-ljpeg $JPEG_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 11788,11794 ---- ++ jpeg_destroy_compress() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 11818,11824 **** ++ SYSTEM_JPEG= ++ else ++ cat > conftest.$ac_ext < ++ #include ++--- 11817,11823 ---- ++ SYSTEM_JPEG= ++ else ++ cat > conftest.$ac_ext < ++ #include ++*************** ++*** 11832,11838 **** ++ } ++ ++ EOF ++- if { (eval echo configure:11836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_JPEG=1 ++ else ++--- 11831,11837 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:11835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_JPEG=1 ++ else ++*************** ++*** 11873,11879 **** ++ SYSTEM_ZLIB= ++ else ++ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 ++- echo "configure:11877: checking for gzread in -lz" >&5 ++ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 11872,11878 ---- ++ SYSTEM_ZLIB= ++ else ++ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 +++ echo "configure:11876: checking for gzread in -lz" >&5 ++ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 11881,11887 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lz $ZLIB_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 11891,11897 ---- ++ gzread() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:11895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 11920,11926 **** ++ SYSTEM_ZLIB= ++ else ++ cat > conftest.$ac_ext < ++--- 11919,11925 ---- ++ SYSTEM_ZLIB= ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 11941,11947 **** ++ } ++ ++ EOF ++- if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_ZLIB=1 ++ else ++--- 11940,11946 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:11944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_ZLIB=1 ++ else ++*************** ++*** 11982,11988 **** ++ SYSTEM_BZ2= ++ else ++ echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 ++- echo "configure:11986: checking for BZ2_bzread in -lbz2" >&5 ++ ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 11981,11987 ---- ++ SYSTEM_BZ2= ++ else ++ echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 +++ echo "configure:11985: checking for BZ2_bzread in -lbz2" >&5 ++ ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 11990,11996 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lbz2 $MOZ_BZ2_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 12000,12006 ---- ++ BZ2_bzread() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:12004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 12052,12058 **** ++ SYSTEM_PNG= ++ else ++ echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 ++- echo "configure:12056: checking for png_get_valid in -lpng" >&5 ++ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 12051,12057 ---- ++ SYSTEM_PNG= ++ else ++ echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 +++ echo "configure:12055: checking for png_get_valid in -lpng" >&5 ++ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 12060,12066 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lpng $PNG_LIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 12070,12076 ---- ++ png_get_valid() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:12074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 12099,12105 **** ++ SYSTEM_PNG= ++ else ++ cat > conftest.$ac_ext < ++ #include ++--- 12098,12104 ---- ++ SYSTEM_PNG= ++ else ++ cat > conftest.$ac_ext < ++ #include ++*************** ++*** 12113,12119 **** ++ } ++ ++ EOF ++- if { (eval echo configure:12117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_PNG=1 ++ else ++--- 12112,12118 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:12116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ SYSTEM_PNG=1 ++ else ++*************** ++*** 12159,12165 **** ++ # 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:12163: 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 ++--- 12158,12164 ---- ++ # 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:12162: 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 ++*************** ++*** 12203,12221 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for hunspell""... $ac_c" 1>&6 ++- echo "configure:12207: checking for hunspell" >&5 ++ ++ if $PKG_CONFIG --exists "hunspell" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:12214: checking MOZ_HUNSPELL_CFLAGS" >&5 ++ MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` ++ echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 ++- echo "configure:12219: checking MOZ_HUNSPELL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"hunspell\"` `$PKG_CONFIG --libs-only-l \"hunspell\"`" ++--- 12202,12220 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for hunspell""... $ac_c" 1>&6 +++ echo "configure:12206: checking for hunspell" >&5 ++ ++ if $PKG_CONFIG --exists "hunspell" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:12213: checking MOZ_HUNSPELL_CFLAGS" >&5 ++ MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` ++ echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 +++ echo "configure:12218: checking MOZ_HUNSPELL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"hunspell\"` `$PKG_CONFIG --libs-only-l \"hunspell\"`" ++*************** ++*** 12473,12479 **** ++ # Extract the first word of "gtk-config", so it can be a program name with args. ++ set dummy gtk-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:12477: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 12472,12478 ---- ++ # Extract the first word of "gtk-config", so it can be a program name with args. ++ set dummy gtk-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:12476: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 12508,12514 **** ++ ++ min_gtk_version=$GTK_VERSION ++ echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 ++- echo "configure:12512: checking for GTK - version >= $min_gtk_version" >&5 ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++--- 12507,12513 ---- ++ ++ min_gtk_version=$GTK_VERSION ++ echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +++ echo "configure:12511: checking for GTK - version >= $min_gtk_version" >&5 ++ no_gtk="" ++ if test "$GTK_CONFIG" = "no" ; then ++ no_gtk=yes ++*************** ++*** 12531,12537 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 12530,12536 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 12609,12615 **** ++ } ++ ++ EOF ++- if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 12608,12614 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 12644,12650 **** ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ cat > conftest.$ac_ext < ++--- 12643,12649 ---- ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$LIBS $GTK_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 12654,12660 **** ++ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:12658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++--- 12653,12659 ---- ++ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:12657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GTK or finding the wrong" ++*************** ++*** 12706,12712 **** ++ # 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:12710: 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 ++--- 12705,12711 ---- ++ # 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:12709: 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 ++*************** ++*** 12750,12768 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 ++- echo "configure:12754: checking for gtk+-2.0 >= 1.3.7" >&5 ++ ++ if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:12761: checking MOZ_GTK2_CFLAGS" >&5 ++ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` ++ echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 ++- echo "configure:12766: checking MOZ_GTK2_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" ++--- 12749,12767 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 +++ echo "configure:12753: checking for gtk+-2.0 >= 1.3.7" >&5 ++ ++ if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:12760: checking MOZ_GTK2_CFLAGS" >&5 ++ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` ++ echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +++ echo "configure:12765: checking MOZ_GTK2_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" ++*************** ++*** 12827,12833 **** ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:12831: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 12826,12832 ---- ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:12830: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 12879,12885 **** ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 ++- echo "configure:12883: checking for main in -lqt" >&5 ++ ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 12878,12884 ---- ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 +++ echo "configure:12882: checking for main in -lqt" >&5 ++ ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 12887,12900 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lqt $LIBS" ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 12886,12899 ---- ++ ac_save_LIBS="$LIBS" ++ LIBS="-lqt $LIBS" ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 12913,12919 **** ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 ++- echo "configure:12917: checking for main in -lqt-mt" >&5 ++ ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 12912,12918 ---- ++ else ++ echo "$ac_t""no" 1>&6 ++ echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 +++ echo "configure:12916: checking for main in -lqt-mt" >&5 ++ ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 12921,12934 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lqt-mt $LIBS" ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 12920,12933 ---- ++ ac_save_LIBS="$LIBS" ++ LIBS="-lqt-mt $LIBS" ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 12964,12972 **** ++ LIBS="$LIBS $QT_LIBS" ++ ++ echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 ++- echo "configure:12968: checking Qt - version >= $QT_VERSION" >&5 ++ cat > conftest.$ac_ext < ++ int main() { ++--- 12963,12971 ---- ++ LIBS="$LIBS $QT_LIBS" ++ ++ echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 +++ echo "configure:12967: checking Qt - version >= $QT_VERSION" >&5 ++ cat > conftest.$ac_ext < ++ int main() { ++*************** ++*** 12977,12983 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:12981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ result="yes" ++ else ++--- 12976,12982 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:12980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ result="yes" ++ else ++*************** ++*** 13573,13579 **** ++ # 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:13577: 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 ++--- 13572,13578 ---- ++ # 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:13576: 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 ++*************** ++*** 13617,13635 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for xft""... $ac_c" 1>&6 ++- echo "configure:13621: checking for xft" >&5 ++ ++ if $PKG_CONFIG --exists "xft" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:13628: checking MOZ_XFT_CFLAGS" >&5 ++ MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` ++ echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 ++- echo "configure:13633: checking MOZ_XFT_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" ++--- 13616,13634 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for xft""... $ac_c" 1>&6 +++ echo "configure:13620: checking for xft" >&5 ++ ++ if $PKG_CONFIG --exists "xft" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:13627: checking MOZ_XFT_CFLAGS" >&5 ++ MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` ++ echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 +++ echo "configure:13632: checking MOZ_XFT_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" ++*************** ++*** 13664,13670 **** ++ # 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:13668: 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 ++--- 13663,13669 ---- ++ # 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:13667: 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 ++*************** ++*** 13708,13726 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 ++- echo "configure:13712: checking for pango >= 1.1.0" >&5 ++ ++ if $PKG_CONFIG --exists "pango >= 1.1.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:13719: checking _PANGOCHK_CFLAGS" >&5 ++ _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` ++ echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 ++- echo "configure:13724: checking _PANGOCHK_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" ++--- 13707,13725 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 +++ echo "configure:13711: checking for pango >= 1.1.0" >&5 ++ ++ if $PKG_CONFIG --exists "pango >= 1.1.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:13718: checking _PANGOCHK_CFLAGS" >&5 ++ _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` ++ echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 +++ echo "configure:13723: checking _PANGOCHK_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" ++*************** ++*** 13780,13786 **** ++ # 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:13784: 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 ++--- 13779,13785 ---- ++ # 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:13783: 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 ++*************** ++*** 13824,13842 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 ++- echo "configure:13828: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++ ++ if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:13835: checking MOZ_PANGO_CFLAGS" >&5 ++ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` ++ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 ++- echo "configure:13840: checking MOZ_PANGO_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" ++--- 13823,13841 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 +++ echo "configure:13827: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 ++ ++ if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:13834: checking MOZ_PANGO_CFLAGS" >&5 ++ MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` ++ echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +++ echo "configure:13839: checking MOZ_PANGO_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" ++*************** ++*** 13904,13910 **** ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$XLDFLAGS $LDFLAGS" ++ echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 ++- echo "configure:13908: checking for XpGetPrinterList in -lXp" >&5 ++ ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 13903,13909 ---- ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$XLDFLAGS $LDFLAGS" ++ echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 +++ echo "configure:13907: checking for XpGetPrinterList in -lXp" >&5 ++ ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 13912,13918 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 13922,13928 ---- ++ XpGetPrinterList() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 13996,14002 **** ++ # 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:14000: 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 ++--- 13995,14001 ---- ++ # 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:13999: 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 ++*************** ++*** 14040,14058 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 ++- echo "configure:14044: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:14051: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++ MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` ++ echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 ++- echo "configure:14056: checking MOZ_GNOMEVFS_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" ++--- 14039,14057 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 +++ echo "configure:14043: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:14050: checking MOZ_GNOMEVFS_CFLAGS" >&5 ++ MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` ++ echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 +++ echo "configure:14055: checking MOZ_GNOMEVFS_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" ++*************** ++*** 14103,14109 **** ++ # 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:14107: 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 ++--- 14102,14108 ---- ++ # 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:14106: 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 ++*************** ++*** 14147,14165 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 ++- echo "configure:14151: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:14158: checking MOZ_GCONF_CFLAGS" >&5 ++ MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` ++ echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 ++- echo "configure:14163: checking MOZ_GCONF_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" ++--- 14146,14164 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 +++ echo "configure:14150: checking for gconf-2.0 >= $GCONF_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:14157: checking MOZ_GCONF_CFLAGS" >&5 ++ MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` ++ echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 +++ echo "configure:14162: checking MOZ_GCONF_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" ++*************** ++*** 14206,14212 **** ++ # 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:14210: 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 ++--- 14205,14211 ---- ++ # 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:14209: 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 ++*************** ++*** 14250,14268 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 ++- echo "configure:14254: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:14261: checking MOZ_LIBGNOME_CFLAGS" >&5 ++ MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` ++ echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 ++- echo "configure:14266: checking MOZ_LIBGNOME_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" ++--- 14249,14267 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 +++ echo "configure:14253: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:14260: checking MOZ_LIBGNOME_CFLAGS" >&5 ++ MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` ++ echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 +++ echo "configure:14265: checking MOZ_LIBGNOME_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" ++*************** ++*** 14340,14346 **** ++ # 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:14344: 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 ++--- 14339,14345 ---- ++ # 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:14343: 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 ++*************** ++*** 14384,14402 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 ++- echo "configure:14388: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:14395: checking MOZ_GNOMEUI_CFLAGS" >&5 ++ MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` ++ echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 ++- echo "configure:14400: checking MOZ_GNOMEUI_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" ++--- 14383,14401 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 +++ echo "configure:14387: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:14394: checking MOZ_GNOMEUI_CFLAGS" >&5 ++ MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` ++ echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 +++ echo "configure:14399: checking MOZ_GNOMEUI_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" ++*************** ++*** 14882,14888 **** ++ # Extract the first word of "javac", so it can be a program name with args. ++ set dummy javac; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:14886: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 14881,14887 ---- ++ # Extract the first word of "javac", so it can be a program name with args. ++ set dummy javac; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:14885: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 14918,14924 **** ++ # Extract the first word of "jar", so it can be a program name with args. ++ set dummy jar; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:14922: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 14917,14923 ---- ++ # Extract the first word of "jar", so it can be a program name with args. ++ set dummy jar; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:14921: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 15165,15171 **** ++ gdiplus) ++ MOZ_SVG_RENDERER_GDIPLUS=1 ++ echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 ++- echo "configure:15169: checking for Gdiplus.h" >&5 ++ ++ ac_ext=C ++ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++--- 15164,15170 ---- ++ gdiplus) ++ MOZ_SVG_RENDERER_GDIPLUS=1 ++ echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 +++ echo "configure:15168: checking for Gdiplus.h" >&5 ++ ++ ac_ext=C ++ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++*************** ++*** 15175,15181 **** ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ cat > conftest.$ac_ext < ++ #include ++--- 15174,15180 ---- ++ cross_compiling=$ac_cv_prog_cxx_cross ++ ++ cat > conftest.$ac_ext < ++ #include ++*************** ++*** 15184,15190 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:15188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ echo "$ac_t""yes" 1>&6 ++ else ++--- 15183,15189 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:15187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ echo "$ac_t""yes" 1>&6 ++ else ++*************** ++*** 15264,15270 **** ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:15268: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 15263,15269 ---- ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:15267: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 15309,15315 **** ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:15313: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 15308,15314 ---- ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:15312: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 15378,15390 **** ++ msvc*|mks*|cygwin*|mingw*|wince*) ++ if test -n "$MOZ_UPDATER"; then ++ echo $ac_n "checking for iconv""... $ac_c" 1>&6 ++- echo "configure:15382: checking for iconv" >&5 ++ for ac_prog in $HOST_ICONV "iconv" ++ do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:15388: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 15377,15389 ---- ++ msvc*|mks*|cygwin*|mingw*|wince*) ++ if test -n "$MOZ_UPDATER"; then ++ echo $ac_n "checking for iconv""... $ac_c" 1>&6 +++ echo "configure:15381: checking for iconv" >&5 ++ for ac_prog in $HOST_ICONV "iconv" ++ do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:15387: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 15711,15717 **** ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 ++- echo "configure:15715: checking for readline in -lreadline" >&5 ++ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 15710,15716 ---- ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +++ echo "configure:15714: checking for readline in -lreadline" >&5 ++ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 15719,15725 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lreadline $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 15729,15735 ---- ++ readline() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:15733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 15823,15840 **** ++ ++ if test -n "$MOZ_DEBUG"; then ++ echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 ++- echo "configure:15827: checking for valid debug flags" >&5 ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:15838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _results=yes ++ else ++--- 15822,15839 ---- ++ ++ if test -n "$MOZ_DEBUG"; then ++ echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 +++ echo "configure:15826: checking for valid debug flags" >&5 ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:15837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _results=yes ++ else ++*************** ++*** 15875,15892 **** ++ if test "$COMPILE_ENVIRONMENT"; then ++ if test -n "$MOZ_OPTIMIZE"; then ++ echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 ++- echo "configure:15879: checking for valid optimization flags" >&5 ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:15890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _results=yes ++ else ++--- 15874,15891 ---- ++ if test "$COMPILE_ENVIRONMENT"; then ++ if test -n "$MOZ_OPTIMIZE"; then ++ echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 +++ echo "configure:15878: checking for valid optimization flags" >&5 ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:15889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _results=yes ++ else ++*************** ++*** 16103,16109 **** ++ ++ if test -n "$_ENABLE_EFENCE"; then ++ echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 ++- echo "configure:16107: checking for malloc in -lefence" >&5 ++ ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++--- 16102,16108 ---- ++ ++ if test -n "$_ENABLE_EFENCE"; then ++ echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 +++ echo "configure:16106: checking for malloc in -lefence" >&5 ++ ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++*************** ++*** 16111,16117 **** ++ ac_save_LIBS="$LIBS" ++ LIBS="-lefence $LIBS" ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++--- 16121,16127 ---- ++ malloc() ++ ; return 0; } ++ EOF +++ if { (eval echo configure:16125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++*************** ++*** 16223,16234 **** ++ for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++- echo "configure:16227: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:16226: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 16253,16259 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:16257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 16497,16508 **** ++ for ac_func in __cxa_demangle ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++- echo "configure:16501: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:16500: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 16527,16533 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:16531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 16614,16620 **** ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:16618: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 16613,16619 ---- ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:16617: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 16713,16719 **** ++ # Compiler Options ++ ++ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 ++- echo "configure:16717: checking for gcc -pipe support" >&5 ++ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then ++ echo '#include ' > dummy-hello.c ++ echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c ++--- 16712,16718 ---- ++ # Compiler Options ++ ++ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 +++ echo "configure:16716: checking for gcc -pipe support" >&5 ++ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then ++ echo '#include ' > dummy-hello.c ++ echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c ++*************** ++*** 16728,16741 **** ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS -pipe" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:16739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _res_gcc_pipe="yes" ++ else ++--- 16727,16740 ---- ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS -pipe" ++ cat > conftest.$ac_ext < ++ int main() { ++ printf("Hello World\n"); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _res_gcc_pipe="yes" ++ else ++*************** ++*** 16777,16792 **** ++ _SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" ++ echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 ++- echo "configure:16781: checking whether compiler supports -Wno-long-long" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" ++ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" ++--- 16776,16791 ---- ++ _SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" ++ echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 +++ echo "configure:16780: checking whether compiler supports -Wno-long-long" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" ++ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" ++*************** ++*** 16807,16822 **** ++ CFLAGS="$CFLAGS -fprofile-generate" ++ ++ echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 ++- echo "configure:16811: checking whether C compiler supports -fprofile-generate" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ PROFILE_GEN_CFLAGS="-fprofile-generate" ++ result="yes" ++--- 16806,16821 ---- ++ CFLAGS="$CFLAGS -fprofile-generate" ++ ++ echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 +++ echo "configure:16810: checking whether C compiler supports -fprofile-generate" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ PROFILE_GEN_CFLAGS="-fprofile-generate" ++ result="yes" ++*************** ++*** 16834,16849 **** ++ else ++ CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" ++ echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 ++- echo "configure:16838: checking whether C compiler supports -fprofile-arcs" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ PROFILE_GEN_CFLAGS="-fprofile-arcs" ++ result="yes" ++--- 16833,16848 ---- ++ else ++ CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" ++ echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 +++ echo "configure:16837: checking whether C compiler supports -fprofile-arcs" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ PROFILE_GEN_CFLAGS="-fprofile-arcs" ++ result="yes" ++*************** ++*** 16889,16904 **** ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" ++ echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 ++- echo "configure:16893: checking whether C++ compiler has -pedantic long long bug" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ result="no" ++ else ++--- 16888,16903 ---- ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" ++ echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 +++ echo "configure:16892: checking whether C++ compiler has -pedantic long long bug" >&5 ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ result="no" ++ else ++*************** ++*** 16923,16934 **** ++ fi ++ ++ echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 ++- echo "configure:16927: checking for correct temporary object destruction order" >&5 ++ if test "$cross_compiling" = yes; then ++ result="maybe" ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:16926: checking for correct temporary object destruction order" >&5 ++ if test "$cross_compiling" = yes; then ++ result="maybe" ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ result="yes" ++ else ++--- 16950,16956 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ result="yes" ++ else ++*************** ++*** 16972,16983 **** ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" ++ echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 ++- echo "configure:16976: checking for correct overload resolution with const and templates" >&5 ++ if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++--- 16971,16982 ---- ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" ++ echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 +++ echo "configure:16975: checking for correct overload resolution with const and templates" >&5 ++ if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 17007,17013 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:17011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_nscap_nonconst_opeq_bug="no" ++ else ++--- 17006,17012 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:17010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_nscap_nonconst_opeq_bug="no" ++ else ++*************** ++*** 17299,17305 **** ++ # 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:17303: 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 ++--- 17298,17304 ---- ++ # 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:17302: 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 ++*************** ++*** 17343,17361 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 ++- echo "configure:17347: checking for libIDL-2.0 >= 0.8.0" >&5 ++ ++ if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:17354: checking LIBIDL_CFLAGS" >&5 ++ LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` ++ echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 ++- echo "configure:17359: checking LIBIDL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" ++--- 17342,17360 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +++ echo "configure:17346: checking for libIDL-2.0 >= 0.8.0" >&5 ++ ++ if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:17353: checking LIBIDL_CFLAGS" >&5 ++ LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` ++ echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +++ echo "configure:17358: checking LIBIDL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" ++*************** ++*** 17478,17484 **** ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:17482: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 17477,17483 ---- ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:17481: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 17513,17519 **** ++ ++ min_glib_version=1.2.0 ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 ++- echo "configure:17517: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++--- 17512,17518 ---- ++ ++ min_glib_version=1.2.0 ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +++ echo "configure:17516: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++*************** ++*** 17536,17542 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 17535,17541 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 17612,17618 **** ++ } ++ ++ EOF ++- if { (eval echo configure:17616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 17611,17617 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:17615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 17646,17652 **** ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++--- 17645,17651 ---- ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 17656,17662 **** ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:17660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++--- 17655,17661 ---- ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:17659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++*************** ++*** 17700,17706 **** ++ # Extract the first word of "libIDL-config", so it can be a program name with args. ++ set dummy libIDL-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:17704: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 17699,17705 ---- ++ # Extract the first word of "libIDL-config", so it can be a program name with args. ++ set dummy libIDL-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:17703: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 17735,17741 **** ++ ++ min_libIDL_version=$LIBIDL_VERSION ++ echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 ++- echo "configure:17739: checking for libIDL - version >= $min_libIDL_version" >&5 ++ no_libIDL="" ++ if test "$LIBIDL_CONFIG" = "no" ; then ++ no_libIDL=yes ++--- 17734,17740 ---- ++ ++ min_libIDL_version=$LIBIDL_VERSION ++ echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +++ echo "configure:17738: checking for libIDL - version >= $min_libIDL_version" >&5 ++ no_libIDL="" ++ if test "$LIBIDL_CONFIG" = "no" ; then ++ no_libIDL=yes ++*************** ++*** 17762,17768 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 17761,17767 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 17848,17854 **** ++ } ++ ++ EOF ++- if { (eval echo configure:17852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 17847,17853 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 17882,17888 **** ++ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" ++ LIBS="$LIBS $LIBIDL_LIBS" ++ cat > conftest.$ac_ext < ++--- 17881,17887 ---- ++ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" ++ LIBS="$LIBS $LIBIDL_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 17893,17899 **** ++ return IDL_get_libver_string ? 1 : 0; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:17897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding libIDL or finding the wrong" ++--- 17892,17898 ---- ++ return IDL_get_libver_string ? 1 : 0; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:17896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding libIDL or finding the wrong" ++*************** ++*** 18021,18027 **** ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:18025: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 18020,18026 ---- ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:18024: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 18056,18062 **** ++ ++ min_glib_version=1.2.0 ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 ++- echo "configure:18060: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++--- 18055,18061 ---- ++ ++ min_glib_version=1.2.0 ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +++ echo "configure:18059: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++*************** ++*** 18079,18085 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 18078,18084 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 18155,18161 **** ++ } ++ ++ EOF ++- if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 18154,18160 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:18158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 18189,18195 **** ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++--- 18188,18194 ---- ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 18199,18205 **** ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:18203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++--- 18198,18204 ---- ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:18202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++*************** ++*** 18243,18249 **** ++ # Extract the first word of "libIDL-config", so it can be a program name with args. ++ set dummy libIDL-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:18247: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 18242,18248 ---- ++ # Extract the first word of "libIDL-config", so it can be a program name with args. ++ set dummy libIDL-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:18246: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 18278,18284 **** ++ ++ min_libIDL_version=$LIBIDL_VERSION ++ echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 ++- echo "configure:18282: checking for libIDL - version >= $min_libIDL_version" >&5 ++ no_libIDL="" ++ if test "$LIBIDL_CONFIG" = "no" ; then ++ no_libIDL=yes ++--- 18277,18283 ---- ++ ++ min_libIDL_version=$LIBIDL_VERSION ++ echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +++ echo "configure:18281: checking for libIDL - version >= $min_libIDL_version" >&5 ++ no_libIDL="" ++ if test "$LIBIDL_CONFIG" = "no" ; then ++ no_libIDL=yes ++*************** ++*** 18305,18311 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 18304,18310 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 18391,18397 **** ++ } ++ ++ EOF ++- if { (eval echo configure:18395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 18390,18396 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 18425,18431 **** ++ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" ++ LIBS="$LIBS $LIBIDL_LIBS" ++ cat > conftest.$ac_ext < ++--- 18424,18430 ---- ++ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" ++ LIBS="$LIBS $LIBIDL_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 18436,18442 **** ++ return IDL_get_libver_string ? 1 : 0; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:18440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding libIDL or finding the wrong" ++--- 18435,18441 ---- ++ return IDL_get_libver_string ? 1 : 0; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:18439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding libIDL or finding the wrong" ++*************** ++*** 18477,18483 **** ++ # 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:18481: 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 ++--- 18476,18482 ---- ++ # 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:18480: 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 ++*************** ++*** 18521,18539 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 ++- echo "configure:18525: checking for libIDL-2.0 >= 0.8.0" >&5 ++ ++ if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:18532: checking LIBIDL_CFLAGS" >&5 ++ LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` ++ echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 ++- echo "configure:18537: checking LIBIDL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" ++--- 18520,18538 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +++ echo "configure:18524: checking for libIDL-2.0 >= 0.8.0" >&5 ++ ++ if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:18531: checking LIBIDL_CFLAGS" >&5 ++ LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` ++ echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +++ echo "configure:18536: checking LIBIDL_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" ++*************** ++*** 18569,18575 **** ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:18573: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 18568,18574 ---- ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++ set dummy $ac_prog; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:18572: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 18606,18612 **** ++ ++ if test -n "$ORBIT_CONFIG"; then ++ echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 ++- echo "configure:18610: checking for ORBit libIDL usability" >&5 ++ _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` ++ _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` ++ _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` ++--- 18605,18611 ---- ++ ++ if test -n "$ORBIT_CONFIG"; then ++ echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 +++ echo "configure:18609: checking for ORBit libIDL usability" >&5 ++ _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` ++ _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` ++ _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` ++*************** ++*** 18623,18629 **** ++ result="maybe" ++ else ++ cat > conftest.$ac_ext < ++--- 18622,18628 ---- ++ result="maybe" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 18638,18644 **** ++ } ++ ++ EOF ++- if { (eval echo configure:18642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ _LIBIDL_FOUND=1 ++ result="yes" ++--- 18637,18643 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:18641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ _LIBIDL_FOUND=1 ++ result="yes" ++*************** ++*** 18695,18701 **** ++ # 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:18699: 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 ++--- 18694,18700 ---- ++ # 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:18698: 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 ++*************** ++*** 18739,18757 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 ++- echo "configure:18743: checking for glib-2.0 >= 1.3.7" >&5 ++ ++ if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:18750: checking GLIB_CFLAGS" >&5 ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` ++ echo "$ac_t""$GLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 ++- echo "configure:18755: checking GLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" ++--- 18738,18756 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 +++ echo "configure:18742: checking for glib-2.0 >= 1.3.7" >&5 ++ ++ if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:18749: checking GLIB_CFLAGS" >&5 ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` ++ echo "$ac_t""$GLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +++ echo "configure:18754: checking GLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" ++*************** ++*** 18835,18841 **** ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:18839: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 18834,18840 ---- ++ # Extract the first word of "glib-config", so it can be a program name with args. ++ set dummy glib-config; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:18838: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 18870,18876 **** ++ ++ min_glib_version=${GLIB_VERSION} ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 ++- echo "configure:18874: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++--- 18869,18875 ---- ++ ++ min_glib_version=${GLIB_VERSION} ++ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 +++ echo "configure:18873: checking for GLIB - version >= $min_glib_version" >&5 ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++*************** ++*** 18893,18899 **** ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++--- 18892,18898 ---- ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++ else ++ cat > conftest.$ac_ext < ++*************** ++*** 18969,18975 **** ++ } ++ ++ EOF ++- if { (eval echo configure:18973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++--- 18968,18974 ---- ++ } ++ ++ EOF +++ if { (eval echo configure:18972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++*************** ++*** 19003,19009 **** ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++--- 19002,19008 ---- ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat > conftest.$ac_ext < ++*************** ++*** 19013,19019 **** ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:19017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++--- 19012,19018 ---- ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:19016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++*************** ++*** 19093,19111 **** ++ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works ++ # for constant arguments. Useless! ++ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ++- echo "configure:19097: checking for working alloca.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ char *p = alloca(2 * sizeof(int)); ++ ; return 0; } ++ EOF ++- if { (eval echo configure:19109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_header_alloca_h=yes ++ else ++--- 19092,19110 ---- ++ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works ++ # for constant arguments. Useless! ++ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +++ echo "configure:19096: checking for working alloca.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ int main() { ++ char *p = alloca(2 * sizeof(int)); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:19108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_header_alloca_h=yes ++ else ++*************** ++*** 19126,19137 **** ++ fi ++ ++ echo $ac_n "checking for alloca""... $ac_c" 1>&6 ++- echo "configure:19130: checking for alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:19129: checking for alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_alloca_works=yes ++ else ++--- 19158,19164 ---- ++ char *p = (char *) alloca(1); ++ ; return 0; } ++ EOF +++ if { (eval echo configure:19162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_alloca_works=yes ++ else ++*************** ++*** 19191,19202 **** ++ ++ ++ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ++- echo "configure:19195: checking whether alloca needs Cray hooks" >&5 ++ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:19194: checking whether alloca needs Cray hooks" >&5 ++ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 ++- echo "configure:19225: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&6 +++ echo "configure:19224: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++--- 19248,19254 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:19252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++*************** ++*** 19276,19282 **** ++ fi ++ ++ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ++- echo "configure:19280: checking stack direction for C alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 19275,19281 ---- ++ fi ++ ++ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +++ echo "configure:19279: checking stack direction for C alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 19284,19290 **** ++ ac_cv_c_stack_direction=0 ++ else ++ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_c_stack_direction=1 ++ else ++--- 19302,19308 ---- ++ exit (find_stack_direction() < 0); ++ } ++ EOF +++ if { (eval echo configure:19306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_c_stack_direction=1 ++ else ++*************** ++*** 19352,19368 **** ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++- echo "configure:19356: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++- { (eval echo configure:19366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- 19351,19367 ---- ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +++ echo "configure:19355: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext < ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +++ { (eval echo configure:19365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++*************** ++*** 19453,19459 **** ++ # 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:19457: 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 ++--- 19452,19458 ---- ++ # 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:19456: 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 ++*************** ++*** 19497,19515 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 ++- echo "configure:19501: checking for cairo >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:19508: checking CAIRO_CFLAGS" >&5 ++ CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 ++- echo "configure:19513: checking CAIRO_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" ++--- 19496,19514 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 +++ echo "configure:19500: checking for cairo >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:19507: checking CAIRO_CFLAGS" >&5 ++ CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +++ echo "configure:19512: checking CAIRO_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" ++*************** ++*** 19549,19555 **** ++ # 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:19553: 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 ++--- 19548,19554 ---- ++ # 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:19552: 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 ++*************** ++*** 19593,19611 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6 ++- echo "configure:19597: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:19604: checking CAIRO_XLIB_CFLAGS" >&5 ++ CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 ++- echo "configure:19609: checking CAIRO_XLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" ++--- 19592,19610 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6 +++ echo "configure:19596: checking for cairo-xlib >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:19603: checking CAIRO_XLIB_CFLAGS" >&5 ++ CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6 +++ echo "configure:19608: checking CAIRO_XLIB_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`" ++*************** ++*** 19644,19650 **** ++ # 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:19648: 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 ++--- 19643,19649 ---- ++ # 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:19647: 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 ++*************** ++*** 19688,19706 **** ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 ++- echo "configure:19692: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 ++- echo "configure:19699: checking CAIRO_XRENDER_CFLAGS" >&5 ++ CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 ++- echo "configure:19704: checking CAIRO_XRENDER_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" ++--- 19687,19705 ---- ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 +++ echo "configure:19691: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 ++ ++ if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then ++ echo "$ac_t""yes" 1>&6 ++ succeeded=yes ++ ++ echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 +++ echo "configure:19698: checking CAIRO_XRENDER_CFLAGS" >&5 ++ CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` ++ echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 ++ ++ echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 +++ echo "configure:19703: checking CAIRO_XRENDER_LIBS" >&5 ++ ## don't use --libs since that can do evil things like add ++ ## -Wl,--export-dynamic ++ CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`" ++*************** ++*** 19771,19777 **** ++ # Extract the first word of "python", so it can be a program name with args. ++ set dummy python; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++- echo "configure:19775: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++--- 19770,19776 ---- ++ # Extract the first word of "python", so it can be a program name with args. ++ set dummy python; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +++ echo "configure:19774: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++*************** ++*** 20047,20060 **** ++ cross_compiling=$ac_cv_prog_cc_cross ++ ++ cat > conftest.$ac_ext < ++ int main() { ++ int x = 1; x++; ++ ; return 0; } ++ EOF ++- if { (eval echo configure:20058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ : ++ else ++ echo "configure: failed program was:" >&5 ++--- 20046,20059 ---- ++ cross_compiling=$ac_cv_prog_cc_cross ++ ++ cat > conftest.$ac_ext < ++ int main() { ++ int x = 1; x++; ++ ; return 0; } ++ EOF +++ if { (eval echo configure:20057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ : ++ else ++ echo "configure: failed program was:" >&5 ++*************** ++*** 20365,20371 **** ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $XCFLAGS" ++ cat > conftest.$ac_ext < ++--- 20364,20370 ---- ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $XCFLAGS" ++ cat > conftest.$ac_ext < ++*************** ++*** 20381,20387 **** ++ ++ ; return 0; } ++ EOF ++- if { (eval echo configure:20385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ : ++ else ++ echo "configure: failed program was:" >&5 ++--- 20380,20386 ---- ++ ++ ; return 0; } ++ EOF +++ if { (eval echo configure:20384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ : ++ else ++ echo "configure: failed program was:" >&5 --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/65_native_uconv.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/65_native_uconv.dpatch @@ -0,0 +1,799 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_native_uconv.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Don't build what is useless when native uconv is enabled. bz#331780. +## DP: - Properly load invalid UTF-8 files. bz#331748 +## DP: - Add the scriptableunicodeconverter component. bz#333261 +## DP: - Correct aliases for gbk and euc-tw. +## DP: - Allow claimed iso-8859-1 actually encoded as windows-1252 to be converted +## DP: flawlessly + +@DPATCH@ + +diff --git a/intl/uconv/Makefile.in b/intl/uconv/Makefile.in +index 7503e31..d12f417 100644 +--- a/intl/uconv/Makefile.in ++++ b/intl/uconv/Makefile.in +@@ -57,10 +57,12 @@ include $(DEPTH)/config/autoconf.mk + + MODULE = uconv + +-DIRS = idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm ++DIRS = idl public util + + ifdef MOZ_USE_NATIVE_UCONV + DIRS += native ++else ++DIRS += ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm + endif + + DIRS += src +diff --git a/intl/uconv/native/nsINativeUConvService.idl b/intl/uconv/native/nsINativeUConvService.idl +index c63a197..4227833 100644 +--- a/intl/uconv/native/nsINativeUConvService.idl ++++ b/intl/uconv/native/nsINativeUConvService.idl +@@ -45,8 +45,9 @@ + * nsIUnicodeEncoder + * nsICharRepresentable + */ +-[uuid(c60097ba-c79d-461b-9116-80a66404c0b0)] ++[uuid(99e23ae8-c334-44de-a208-a7aa6923f8f5)] + interface nsINativeUConvService : nsISupports + { +- nsISupports getNativeConverter(in string from, in string to); ++ nsISupports getNativeUnicodeDecoder(in string from); ++ nsISupports getNativeUnicodeEncoder(in string to); + }; +diff --git a/intl/uconv/native/nsNativeUConvService.cpp b/intl/uconv/native/nsNativeUConvService.cpp +index 6ee8d66..09bc9ef 100644 +--- a/intl/uconv/native/nsNativeUConvService.cpp ++++ b/intl/uconv/native/nsNativeUConvService.cpp +@@ -52,7 +52,15 @@ + #include // nl_langinfo + #include // iconv_open, iconv, iconv_close + #include ++#include // memcpy + ++#ifdef IS_LITTLE_ENDIAN ++const char UTF16[] = "UTF-16LE"; ++#else ++const char UTF16[] = "UTF-16BE"; ++#endif ++ ++#define NS_UCONV_CONTINUATION_BUFFER_LENGTH 8 + + class IConvAdaptor : public nsIUnicodeDecoder, + public nsIUnicodeEncoder, +@@ -102,21 +110,13 @@ public: + + + private: +- nsresult ConvertInternal(void * aSrc, +- PRInt32 * aSrcLength, +- PRInt32 aSrcCharSize, +- void * aDest, +- PRInt32 * aDestLength, +- PRInt32 aDestCharSize); +- +- + iconv_t mConverter; + PRBool mReplaceOnError; + PRUnichar mReplaceChar; ++ char mContinuationBuffer[NS_UCONV_CONTINUATION_BUFFER_LENGTH]; ++ PRInt32 mContinuationLength; + +-#ifdef DEBUG +- nsCString mFrom, mTo; +-#endif ++ const char *mFrom, *mTo; + }; + + NS_IMPL_ISUPPORTS3(IConvAdaptor, +@@ -128,6 +128,7 @@ IConvAdaptor::IConvAdaptor() + { + mConverter = 0; + mReplaceOnError = PR_FALSE; ++ mContinuationLength = 0; + } + + IConvAdaptor::~IConvAdaptor() +@@ -139,10 +140,8 @@ IConvAdaptor::~IConvAdaptor() + nsresult + IConvAdaptor::Init(const char* from, const char* to) + { +-#ifdef DEBUG + mFrom = from; + mTo = to; +-#endif + + mConverter = iconv_open(to, from); + if (mConverter == (iconv_t) -1 ) +@@ -153,22 +152,133 @@ IConvAdaptor::Init(const char* from, const char* to) + mConverter = nsnull; + return NS_ERROR_FAILURE; + } ++ mContinuationLength = 0; ++ + return NS_OK; + } + +-// From some charset to ucs2 ++// From some charset to UTF-16 + nsresult + IConvAdaptor::Convert(const char * aSrc, + PRInt32 * aSrcLength, + PRUnichar * aDest, + PRInt32 * aDestLength) + { +- return ConvertInternal( (void*) aSrc, +- aSrcLength, +- 1, +- (void*) aDest, +- aDestLength, +- 2); ++ nsresult res = NS_OK; ++ size_t inLeft, outLeft; ++ PRUnichar *out = aDest; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++ if (mTo != UTF16) { ++ NS_WARNING("Not an UnicodeDecoder"); ++ return NS_ERROR_UNEXPECTED; ++ } ++ ++ inLeft = (size_t) *aSrcLength; ++ outLeft = (size_t) *aDestLength * sizeof(PRUnichar); ++ ++ if (mContinuationLength > 0) { ++ PRInt32 bufLength = NS_UCONV_CONTINUATION_BUFFER_LENGTH - mContinuationLength, ++ oneChar = 2, continuationLength = mContinuationLength; ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength); ++#endif ++ ++ bufLength = bufLength > *aSrcLength ? *aSrcLength : bufLength; ++ memcpy(&mContinuationBuffer[mContinuationLength], ++ aSrc, bufLength); ++ bufLength = mContinuationLength + bufLength; ++ ++ mContinuationLength = 0; // We don't want to enter an infinite loop ++ ++ res = Convert(mContinuationBuffer, &bufLength, aDest, &oneChar); ++ switch (res) { ++ case NS_OK_UDEC_MOREINPUT: // Contination buffer ended before filling the 2 ++ // output words, with an incomplete sequence, filling ++ // a new continuation buffer. ++ if (bufLength < continuationLength) { // still not enough data ++ *aSrcLength = 0; ++ *aDestLength = 0; ++ return NS_OK_UDEC_MOREINPUT; ++ } ++ mContinuationLength = 0; ++ case NS_OK: // Continuation buffer ended, unlikely (8 input bytes leading ++ // exactly to 2 output words is quite unlikely) ++ case NS_OK_UDEC_MOREOUTPUT: // Standard case, we continue with the ++ // normal conversion ++ inLeft = (size_t) *aSrcLength - (bufLength - continuationLength); ++ outLeft -= oneChar * sizeof(PRUnichar); ++ aSrc += bufLength - continuationLength; ++ aDest += oneChar; ++ break; ++ case NS_ERROR_UDEC_ILLEGALINPUT: ++ *aSrcLength = 0; // Corner case: replacement won't be done as ++ // if it were in the middle of the buffer, since ++ // we can't tell the caller the bad character is ++ // at -mContinuationLength ++ *aDestLength = 0; ++ return res; ++ } ++ } ++ ++ do { ++ if ( iconv(mConverter, ++ (char **)&aSrc, ++ &inLeft, ++ (char **)&aDest, ++ &outLeft) == (size_t) -1 ) { ++ switch (errno) { ++ case EILSEQ: // Invalid multibyte sequence ++ if (mReplaceOnError) { ++ *(aDest++) = mReplaceChar; ++ outLeft -= sizeof(PRUnichar); ++ aSrc++; ++ inLeft--; ++ res = NS_OK; ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ } else { ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Bad input ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_ERROR_UDEC_ILLEGALINPUT; ++ } ++ break; ++ case EINVAL: // Incomplete multibyte sequence ++ mContinuationLength = inLeft; ++ memmove(mContinuationBuffer, aSrc, inLeft); ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Incomplete multibyte sequence in input ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UDEC_MOREINPUT; ++ break; ++ case E2BIG: // Output buffer full ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UDEC_MOREOUTPUT; ++ break; ++ } ++ } ++ } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0)); ++ ++ *aSrcLength -= inLeft; ++ *aDestLength -= (outLeft / sizeof(PRUnichar)); ++ ++ if (out[0] == 0xfeff) // If first character is BOM, remove it. ++ memmove(out, &out[1], (--*aDestLength) * sizeof(PRUnichar)); ++ ++ return res; + } + + nsresult +@@ -176,12 +286,14 @@ IConvAdaptor::GetMaxLength(const char * aSrc, + PRInt32 aSrcLength, + PRInt32 * aDestLength) + { +- if (!mConverter) +- return NS_ERROR_UENC_NOMAPPING; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + + *aDestLength = aSrcLength*4; // sick + #ifdef DEBUG +- printf(" * IConvAdaptor - - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom.get(), mTo.get()); ++ printf(" * IConvAdaptor - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom, mTo); + #endif + return NS_OK; + } +@@ -190,19 +302,16 @@ IConvAdaptor::GetMaxLength(const char * aSrc, + nsresult + IConvAdaptor::Reset() + { +- const char *zero_char_in_ptr = NULL; +- char *zero_char_out_ptr = NULL; +- size_t zero_size_in = 0, +- zero_size_out = 0; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + +- iconv(mConverter, +- (char **)&zero_char_in_ptr, +- &zero_size_in, +- &zero_char_out_ptr, +- &zero_size_out); ++ iconv(mConverter, NULL, NULL, NULL, NULL); ++ mContinuationLength = 0; + + #ifdef DEBUG +- printf(" * IConvAdaptor - - Reset\n"); ++ printf(" * IConvAdaptor - Reset\n"); + #endif + return NS_OK; + } +@@ -215,19 +324,139 @@ IConvAdaptor::Convert(const PRUnichar * aSrc, + char * aDest, + PRInt32 * aDestLength) + { +- return ConvertInternal( (void*) aSrc, +- aSrcLength, +- 2, +- (void*) aDest, +- aDestLength, +- 1); ++ nsresult res = NS_OK; ++ size_t inLeft, outLeft; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++ if (mFrom != UTF16) { ++ NS_WARNING("Not an UnicodeEncoder"); ++ return NS_ERROR_UNEXPECTED; ++ } ++ ++ inLeft = (size_t) *aSrcLength * sizeof(PRUnichar); ++ outLeft = (size_t) *aDestLength; ++ ++ if (mContinuationLength > 0) { ++ // If we're continuing, that means we have a word in the buffer, and ++ // that we only need one more word, UTF-16 characters being 2 or 4 bytes ++ // long. ++ PRInt32 bufLength = 2, destLength = *aDestLength; ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength); ++#endif ++ ++ mContinuationLength = 0; // We don't want to enter an infinite loop ++ ++ ((PRUnichar *) mContinuationBuffer)[1] = *aSrc; ++ ++ int i; ++ for (i = 0; i < 4; i++) { ++ printf("%02x ", mContinuationBuffer[i]); ++ } ++ printf("\n"); ++ ++ res = Convert((PRUnichar *) mContinuationBuffer, &bufLength, aDest, &destLength); ++ switch (res) { ++ case NS_OK_UENC_MOREOUTPUT: ++ case NS_ERROR_UENC_NOMAPPING: ++ *aSrcLength = 0; ++ *aDestLength = 0; ++ return res; ++ case NS_OK: ++ printf("NS_OK %d\n", bufLength); ++ outLeft -= destLength; ++ inLeft -= sizeof(PRUnichar); // We necessarily have consumed 1 word ++ aSrc++; ++ aDest += destLength; ++ } ++ } ++ ++ do { ++ if ( iconv(mConverter, ++ (char **)&aSrc, ++ &inLeft, ++ (char **)&aDest, ++ &outLeft) == (size_t) -1 ) { ++ switch (errno) { ++ case EILSEQ: // Invalid multibyte sequence ; there's no way ++ // to know if it's invalid input or input that ++ // doesn't have mapping in the output charset, ++ // but we'll assume our input UTF-16 is valid. ++ if (mReplaceOnError) { ++ *(aDest++) = (char)mReplaceChar; ++ outLeft--; ++ aSrc++; ++ inLeft -= sizeof(PRUnichar); ++ res = NS_OK; ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ } else { ++#ifdef DEBUG ++ printf(" * IConvAdaptor - No mapping in output charset ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ inLeft -= sizeof(PRUnichar); ++ res = NS_ERROR_UENC_NOMAPPING; ++ } ++ break; ++ case EINVAL: // Incomplete UTF-16 sequence. Happens when dealing with characters ++ // outside BMP split between 2 buffers. ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Incomplete UTF-16 character in input. ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ mContinuationLength = 2; ++ ((PRUnichar *) mContinuationBuffer)[0] = *aSrc; ++ res = NS_OK_UENC_MOREINPUT; ++ break; ++ case E2BIG: // Output buffer full ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n", ++ mFrom, mTo); ++#endif ++ res = NS_OK_UENC_MOREOUTPUT; ++ break; ++ } ++ } ++ } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0)); ++ ++ *aSrcLength -= (inLeft / sizeof(PRUnichar)); ++ *aDestLength -= outLeft; ++ ++ return res; + } + + + nsresult + IConvAdaptor::Finish(char * aDest, PRInt32 * aDestLength) + { ++ PRInt32 length = *aDestLength; ++ ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } ++ ++#ifdef DEBUG ++ printf(" * IConvAdaptor - Finish\n"); ++#endif + *aDestLength = 0; ++ // Flush continuation and send replacement character. ++ if ((mContinuationLength > 0) && (mReplaceOnError)) { ++ if (length > 0 ) { ++ *(aDest++) = (char) mReplaceChar; ++ *aDestLength = 1; ++ } else { ++ return NS_OK_UENC_MOREOUTPUT; ++ } ++ } + return NS_OK; + } + +@@ -236,8 +465,10 @@ IConvAdaptor::GetMaxLength(const PRUnichar * aSrc, + PRInt32 aSrcLength, + PRInt32 * aDestLength) + { +- if (!mConverter) +- return NS_ERROR_UENC_NOMAPPING; ++ if (!mConverter) { ++ NS_WARNING("Converter Not Initialized"); ++ return NS_ERROR_NOT_INITIALIZED; ++ } + + *aDestLength = aSrcLength*4; // sick + +@@ -251,13 +482,13 @@ IConvAdaptor::SetOutputErrorBehavior(PRInt32 aBehavior, + PRUnichar aChar) + { + +- if (aBehavior != kOnError_Replace) { ++ if (aBehavior == kOnError_Replace) { + mReplaceOnError = PR_TRUE; + mReplaceChar = aChar; + return NS_OK; + } + +- NS_WARNING("Uconv Error Behavior not support"); ++ NS_WARNING("Uconv Error: Behavior not supported"); + return NS_ERROR_FAILURE; + } + +@@ -272,103 +503,38 @@ IConvAdaptor::FillInfo(PRUint32* aInfo) + } + + +-nsresult +-IConvAdaptor::ConvertInternal(void * aSrc, +- PRInt32 * aSrcLength, +- PRInt32 aSrcCharSize, +- void * aDest, +- PRInt32 * aDestLength, +- PRInt32 aDestCharSize) ++NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService) ++ ++NS_IMETHODIMP ++NativeUConvService::GetNativeUnicodeDecoder(const char* from, ++ nsISupports** aResult) + { +- if (!mConverter) { +- NS_WARNING("Converter Not Initialize"); +- return NS_ERROR_NOT_INITIALIZED; +- } +- size_t res = 0; +- size_t inLeft = (size_t) *aSrcLength * aSrcCharSize; +- size_t outLeft = (size_t) *aDestLength * aDestCharSize; +- size_t outputAvail = outLeft; +- +- while (true){ +- +- res = iconv(mConverter, +- (char**)&aSrc, +- &inLeft, +- (char**)&aDest, +- &outLeft); +- +- if (res == (size_t) -1) { +- // on some platforms (e.g., linux) iconv will fail with +- // E2BIG if it cannot convert _all_ of its input. it'll +- // still adjust all of the in/out params correctly, so we +- // can ignore this error. the assumption is that we will +- // be called again to complete the conversion. +- if ((errno == E2BIG) && (outLeft < outputAvail)) { +- res = 0; +- break; +- } +- +- if (errno == EILSEQ) { ++ *aResult = nsnull; + +- if (mReplaceOnError) { +- if (aDestCharSize == 1) { +- (*(char*)aDest) = (char)mReplaceChar; +- aDest = (char*)aDest + sizeof(char); +- } +- else +- { +- (*(PRUnichar*)aDest) = (PRUnichar)mReplaceChar; +- aDest = (PRUnichar*)aDest + sizeof(PRUnichar); +- +- } +- inLeft -= aSrcCharSize; +- outLeft -= aDestCharSize; ++ IConvAdaptor* ucl = new IConvAdaptor(); ++ if (!ucl) ++ return NS_ERROR_OUT_OF_MEMORY; + +-#ifdef DEBUG +- printf(" * IConvAdaptor - replacing char in output ( %s -> %s )\n", +- mFrom.get(), mTo.get()); ++ // Trick to allow conversion of 0x5c into U+005c instead of U+00a5 with glibc's iconv ++ if (strcmp(from, "Shift_JIS") == 0) ++ from = "sjis-open"; + +-#endif +- res = 0; +- } +- } ++ // Trick to allow claimed iso-8859-1 actually encoded as windows-1252 to be converted flawlessly ++ if (strcmp(from, "ISO-8859-1") == 0) ++ from = "windows-1252"; + +- if (res == -1) { +-#ifdef DEBUG +- printf(" * IConvAdaptor - Bad input ( %s -> %s )\n", mFrom.get(), mTo.get()); +-#endif +- return NS_ERROR_UENC_NOMAPPING; +- } +- } ++ nsresult rv = ucl->Init(from, UTF16); + +- if (inLeft <= 0 || outLeft <= 0 || res == -1) +- break; ++ if (NS_SUCCEEDED(rv)) { ++ NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeDecoder*)ucl); + } + +- +- if (res != (size_t) -1) { +- +- // xp_iconv deals with how much is remaining in a given buffer +- // but what uconv wants how much we read/written already. So +- // we fix it up here. +- *aSrcLength -= (inLeft / aSrcCharSize); +- *aDestLength -= (outLeft / aDestCharSize); +- return NS_OK; +- } +- +-#ifdef DEBUG +- printf(" * IConvAdaptor - - xp_iconv error( %s -> %s )\n", mFrom.get(), mTo.get()); +-#endif +- Reset(); +- return NS_ERROR_UENC_NOMAPPING; ++ return rv; + } + +-NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService) +- + NS_IMETHODIMP +-NativeUConvService::GetNativeConverter(const char* from, +- const char* to, +- nsISupports** aResult) ++NativeUConvService::GetNativeUnicodeEncoder(const char* to, ++ nsISupports** aResult) + { + *aResult = nsnull; + +@@ -376,10 +542,10 @@ NativeUConvService::GetNativeConverter(const char* from, + if (!ucl) + return NS_ERROR_OUT_OF_MEMORY; + +- nsresult rv = ucl->Init(from, to); ++ nsresult rv = ucl->Init(UTF16, to); + + if (NS_SUCCEEDED(rv)) { +- NS_ADDREF(*aResult = (nsISupports*)(nsIUnicharEncoder*)ucl); ++ NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeEncoder*)ucl); + } + + return rv; +diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in +index 72e8ec1..6c49572 100644 +--- a/intl/uconv/src/Makefile.in ++++ b/intl/uconv/src/Makefile.in +@@ -82,13 +82,13 @@ CPPSRCS = \ + nsUTF8ConverterService.cpp \ + nsUTF8ToUnicode.cpp \ + nsUnicodeToUTF8.cpp \ ++ nsScriptableUConv.cpp \ + $(NULL) + + ifdef MOZ_USE_NATIVE_UCONV + REQUIRES += ucnative + else + CPPSRCS += \ +- nsScriptableUConv.cpp \ + nsUnicodeDecodeHelper.cpp \ + nsUnicodeEncodeHelper.cpp \ + nsMappingCache.cpp \ +diff --git a/intl/uconv/src/charsetalias.properties b/intl/uconv/src/charsetalias.properties +index 93a9a97..5cf95e2 100644 +--- a/intl/uconv/src/charsetalias.properties ++++ b/intl/uconv/src/charsetalias.properties +@@ -120,13 +120,13 @@ tis-620=TIS-620 + t.61-8bit=T.61-8bit + hz-gb-2312=HZ-GB-2312 + big5-hkscs=Big5-HKSCS +-gbk=x-gbk +-cns11643=x-euc-tw ++gbk=gbk ++cns11643=euc-tw + # + # Netscape private ... + # + x-imap4-modified-utf7=x-imap4-modified-utf7 +-x-euc-tw=x-euc-tw ++x-euc-tw=euc-tw + x-mac-roman=x-mac-roman + x-mac-ce=x-mac-ce + x-mac-turkish=x-mac-turkish +@@ -474,7 +474,7 @@ csviqr=VIQR + # + # Aliases for x-euc-tw + # +-zh_tw-euc=x-euc-tw ++zh_tw-euc=euc-tw + # + # Following names appears in unix nl_langinfo(CODESET) + # They can be compiled as platform specific if necessary +@@ -512,6 +512,6 @@ cp1258=windows-1258 + x-obsoleted-shift_jis=x-obsoleted-Shift_JIS + x-obsoleted-iso-2022-jp=x-obsoleted-ISO-2022-JP + x-obsoleted-euc-jp=x-obsoleted-EUC-JP +-x-gbk=x-gbk ++x-gbk=gbk + windows-936=windows-936 + ansi-1251=windows-1251 +diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp +index 2c18301..9e88118 100644 +--- a/intl/uconv/src/nsCharsetConverterManager.cpp ++++ b/intl/uconv/src/nsCharsetConverterManager.cpp +@@ -191,9 +191,8 @@ nsCharsetConverterManager::GetUnicodeEncoderRaw(const char * aDest, + #ifdef MOZ_USE_NATIVE_UCONV + if (mNativeUC) { + nsCOMPtr supports; +- mNativeUC->GetNativeConverter("UCS-2", +- aDest, +- getter_AddRefs(supports)); ++ mNativeUC->GetNativeUnicodeEncoder(aDest, ++ getter_AddRefs(supports)); + + encoder = do_QueryInterface(supports); + +@@ -202,7 +201,8 @@ nsCharsetConverterManager::GetUnicodeEncoderRaw(const char * aDest, + return NS_OK; + } + } +-#endif ++ return NS_ERROR_UCONV_NOCONV; ++#else + nsresult rv = NS_OK; + + nsCAutoString +@@ -220,6 +220,7 @@ nsCharsetConverterManager::GetUnicodeEncoderRaw(const char * aDest, + NS_ADDREF(*aResult); + } + return rv; ++#endif + } + + NS_IMETHODIMP +@@ -246,9 +247,8 @@ nsCharsetConverterManager::GetUnicodeDecoderRaw(const char * aSrc, + #ifdef MOZ_USE_NATIVE_UCONV + if (mNativeUC) { + nsCOMPtr supports; +- mNativeUC->GetNativeConverter(aSrc, +- "UCS-2", +- getter_AddRefs(supports)); ++ mNativeUC->GetNativeUnicodeDecoder(aSrc, ++ getter_AddRefs(supports)); + + decoder = do_QueryInterface(supports); + +@@ -257,7 +257,8 @@ nsCharsetConverterManager::GetUnicodeDecoderRaw(const char * aSrc, + return NS_OK; + } + } +-#endif ++ return NS_ERROR_UCONV_NOCONV; ++#else + nsresult rv = NS_OK; + + NS_NAMED_LITERAL_CSTRING(kUnicodeDecoderContractIDBase, +@@ -285,6 +286,7 @@ nsCharsetConverterManager::GetUnicodeDecoderRaw(const char * aSrc, + NS_ADDREF(*aResult); + } + return rv; ++#endif + } + + nsresult +diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp +index 448a769..1d6259d 100644 +--- a/intl/uconv/src/nsUConvModule.cpp ++++ b/intl/uconv/src/nsUConvModule.cpp +@@ -58,6 +58,7 @@ + #include "nsConverterInputStream.h" + #include "nsConverterOutputStream.h" + #include "nsPlatformCharset.h" ++#include "nsScriptableUConv.h" + + #ifndef MOZ_USE_NATIVE_UCONV + #include "nsIUnicodeDecodeHelper.h" +@@ -67,7 +68,6 @@ + + #include "nsUConvDll.h" + #include "nsIFile.h" +-#include "nsIScriptableUConv.h" + + #include "nsCRT.h" + +@@ -82,7 +82,6 @@ + #include "nsUnicodeToCP1252.h" + #include "nsUnicodeToMacRoman.h" + #include "nsUnicodeToUTF8.h" +-#include "nsScriptableUConv.h" + + // ucvlatin + #include "nsUCvLatinCID.h" +@@ -486,7 +485,6 @@ NS_IMPL_NSUCONVERTERREGSELF + + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeDecodeHelper) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeEncodeHelper) +-NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF8ToUnicode) + +@@ -715,6 +713,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCharsetAlias2) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterInputStream) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterOutputStream) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPlatformCharset, Init) ++NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter) + + static const nsModuleComponentInfo components[] = + { +@@ -747,6 +746,11 @@ static const nsModuleComponentInfo components[] = + "@mozilla.org/intl/converter-output-stream;1", + nsConverterOutputStreamConstructor + }, ++ { ++ "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID, ++ NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, ++ nsScriptableUnicodeConverterConstructor ++ }, + #ifdef MOZ_USE_NATIVE_UCONV + { + "Native UConv Service", +@@ -771,11 +775,6 @@ static const nsModuleComponentInfo components[] = + nsUTF8ConverterServiceConstructor + }, + { +- "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID, +- NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, +- nsScriptableUnicodeConverterConstructor +- }, +- { + "ISO-8859-1 To Unicode Converter", NS_ISO88591TOUNICODE_CID, + NS_ISO88591TOUNICODE_CONTRACTID, + nsISO88591ToUnicodeConstructor, --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_URI_fixup.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_URI_fixup.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_URI_fixup.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable keyword lookup by default in URI fixup. Temporary until Galeon +## DP: and Kazehakase are fixed + +@DPATCH@ + +--- xulrunner/docshell/base/nsDocShell.cpp ++++ xulrunner/docshell/base/nsDocShell.cpp +@@ -2864,6 +2864,8 @@ + rv = NS_NewURI(getter_AddRefs(uri), uriString); + if (uri) { + aLoadFlags = aLoadFlags & ~LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; ++ } else { ++ aLoadFlags |= LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; + } + + if (sURIFixup) { --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/30_killAll.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/30_killAll.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_killAll.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correctly install the killAll component. bz#333289. + +@DPATCH@ + +=== xpfe/components/killAll/Makefile.in +================================================================== +--- xulrunner/xpfe/components/killAll/Makefile.in (revision 69) ++++ xulrunner/xpfe/components/killAll/Makefile.in (local) +@@ -42,11 +42,10 @@ + + include $(DEPTH)/config/autoconf.mk + ++EXTRA_COMPONENTS = nsKillAll.js ++ + include $(topsrcdir)/config/rules.mk + +-libs:: +- $(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components +- + clean:: + rm -f $(DIST)/bin/components/nsKillAll.js + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_installer.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_installer.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_installer.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Install applications in /usr/local/lib instead of /usr/lib + +@DPATCH@ + +=== xulrunner/setup/nsXULAppInstall.js +================================================================== +--- xulrunner/xulrunner/setup/nsXULAppInstall.js (revision 72) ++++ xulrunner/xulrunner/setup/nsXULAppInstall.js (local) +@@ -246,7 +246,7 @@ + #else + aDirectory = Components.classes["@mozilla.org/file/local;1"]. + createInstance(nsILocalFile); +- aDirectory.initWithPath("/usr/lib"); ++ aDirectory.initWithPath("/usr/local/lib"); + if (vendor) + aDirectory.append(vendor.toLowerCase()); + #endif --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/65_mozjs_abi.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/65_mozjs_abi.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 65_mozjs_abi.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make 1.8.1 ABI compatible with version 1.8.0 + +@DPATCH@ + +--- xulrunner/js/src/jsapi.c (revision 224) ++++ xulrunner/js/src/jsapi.c (local) +@@ -4623,6 +4623,10 @@ + #endif + } + ++/* For backwards compatibility */ ++JS_PUBLIC_API(JSBool) ++JS_StringsAreUTF8() __attribute__((alias("JS_CStringsAreUTF8"))); ++ + /************************************************************************/ + + JS_PUBLIC_API(void) +--- xulrunner/js/src/jsstr.c (revision 224) ++++ xulrunner/js/src/jsstr.c (local) +@@ -2668,6 +2668,13 @@ + return bytes; + } + ++#undef js_ValueToPrintableString ++JS_FRIEND_API(const char *) ++js_ValueToPrintableString(JSContext *cx, jsval v) ++{ ++ return js_ValueToPrintable(cx, v, js_ValueToString); ++} ++ + JS_FRIEND_API(JSString *) + js_ValueToString(JSContext *cx, jsval v) + { --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_sparc64_unichar_alignment.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_sparc64_unichar_alignment.dpatch @@ -0,0 +1,181 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_sparc64_unichar_alignment.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from bz#161826 to fix alignment issues on sparc64. + +@DPATCH@ + +=== gfx/src/gtk/nsFontMetricsPango.cpp +================================================================== +--- xulrunner/gfx/src/gtk/nsFontMetricsPango.cpp (revision 101) ++++ xulrunner/gfx/src/gtk/nsFontMetricsPango.cpp (local) +@@ -532,11 +532,23 @@ + nsRenderingContextGTK *aContext) + { + nsresult rv = NS_OK; +- ++ gchar *text = NULL; + PangoLayout *layout = pango_layout_new(mPangoContext); + +- gchar *text = g_utf16_to_utf8(aString, aLength, +- NULL, NULL, NULL); ++ // Just copy the aString to ensure the alignment, ++ // it is not used anywhere else. ++ PRUnichar* dummy = (PRUnichar *) PR_Malloc(aLength*sizeof(PRUnichar)); ++ if(!dummy) { ++#ifdef DEBUG ++ NS_WARNING("nsFontMetricsPango::GetTextDimensions malloc() failed"); ++#endif ++ rv = NS_ERROR_FAILURE; ++ goto out; ++ } ++ memcpy(dummy, aString, aLength*sizeof(PRUnichar)); ++ text = g_utf16_to_utf8(dummy, aLength, ++ NULL, NULL, NULL); ++ PR_Free(dummy); + + if (!text) { + #ifdef DEBUG +@@ -577,6 +589,7 @@ + + loser: + g_free(text); ++ out: + g_object_unref(layout); + + return rv; +=== layout/generic/nsTextFrame.cpp +================================================================== +--- xulrunner/layout/generic/nsTextFrame.cpp (revision 101) ++++ xulrunner/layout/generic/nsTextFrame.cpp (local) +@@ -5101,8 +5101,8 @@ + + while (aNumChars-- > 0) { + // XXX: If you crash here then you may see the issue described +- // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44 +- *cp2-- = PRUnichar(*cp1--); ++ // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826 ++ SetUnichar(cp2--, PRUnichar(*cp1--)); + } + } + +@@ -6199,9 +6199,9 @@ + { + PRUnichar* end = aBuffer + aWordLen; + for (; aBuffer < end; aBuffer++) { +- PRUnichar ch = *aBuffer; ++ PRUnichar ch = GetUnichar(aBuffer); + if (ch == ' ') { +- *aBuffer = CH_NBSP; ++ SetUnichar(aBuffer, CH_NBSP); + } + } + } +=== intl/lwbrk/src/nsJISx4501LineBreaker.cpp +================================================================== +--- xulrunner/intl/lwbrk/src/nsJISx4501LineBreaker.cpp (revision 101) ++++ xulrunner/intl/lwbrk/src/nsJISx4501LineBreaker.cpp (local) +@@ -487,13 +487,13 @@ + PRUint32 cur; + for (cur = aPos; cur < aLen; ++cur) + { +- if (IS_SPACE(aText[cur])) ++ if (IS_SPACE(GetUnichar(&aText[cur]))) + { + *oNext = cur; + *oNeedMoreText = PR_FALSE; + return NS_OK; + } +- if (IS_CJK_CHAR(aText[cur])) ++ if (IS_CJK_CHAR(GetUnichar(&aText[cur]))) + goto ROUTE_CJK_NEXT; + } + *oNext = aLen; +@@ -503,13 +503,13 @@ + ROUTE_CJK_NEXT: + PRInt8 c1, c2; + cur = aPos; +- if(NEED_CONTEXTUAL_ANALYSIS(aText[cur])) ++ if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur]))) + { +- c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0, +- aText[cur], +- (cur<(aLen-1)) ?aText[cur+1]:0); ++ c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, ++ GetUnichar(&aText[cur]), ++ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); + } else { +- c1 = this->GetClass(aText[cur]); ++ c1 = this->GetClass(GetUnichar(&aText[cur])); + } + + if(CLASS_THAI == c1) +@@ -521,13 +521,13 @@ + + for(cur++; cur ContextualAnalysis((cur>0)?aText[cur-1]:0, +- aText[cur], +- (cur<(aLen-1)) ?aText[cur+1]:0); ++ c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0, ++ GetUnichar(&aText[cur]), ++ (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0); + } else { +- c2 = this->GetClass(aText[cur]); ++ c2 = this->GetClass(GetUnichar(&aText[cur])); + } + + if(GetPair(c1, c2)) { +=== intl/unicharutil/util/nsUnicharUtils.cpp +================================================================== +--- xulrunner/intl/unicharutil/util/nsUnicharUtils.cpp (revision 101) ++++ xulrunner/intl/unicharutil/util/nsUnicharUtils.cpp (local) +@@ -340,3 +340,28 @@ + return result; + } + ++PRUnichar ++GetUnichar(const void *ptr) ++{ ++ PRUnichar result; ++#if NEED_STRICT_ALIGNMENT ++ *((char *) &result) = *((char *) ptr); ++ *((char *) &result + 1) = *((char *) ptr + 1); ++#else ++ result = *((PRUnichar *) ptr); ++#endif ++ return result; ++} ++ ++void ++SetUnichar(void *ptr, PRUnichar aChar) ++{ ++#if NEED_STRICT_ALIGNMENT ++ *((char *) ptr) = *((char *) &aChar); ++ *((char *) ptr + 1) = *((char *) &aChar + 1); ++#else ++ *((PRUnichar *) ptr) = aChar; ++#endif ++} ++ ++ +=== intl/unicharutil/util/nsUnicharUtils.h +================================================================== +--- xulrunner/intl/unicharutil/util/nsUnicharUtils.h (revision 101) ++++ xulrunner/intl/unicharutil/util/nsUnicharUtils.h (local) +@@ -82,6 +82,11 @@ + PRUnichar ToUpperCase(PRUnichar); + PRUnichar ToLowerCase(PRUnichar); + ++#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__) || defined(__ia64) ++ ++PRUnichar GetUnichar(const void *); ++void SetUnichar(void *, PRUnichar); ++ + inline PRBool IsUpperCase(PRUnichar c) { + return ToLowerCase(c) != c; + } --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/10_toolkit_library.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/10_toolkit_library.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_toolkit_library.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add Freetype library to the list of linked libraries. Stolen from +## DP: bz#340795 + +@DPATCH@ + +--- xulrunner/toolkit/library/Makefile.in ++++ xulrunner/toolkit/library/Makefile.in +@@ -350,6 +350,10 @@ + EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(FT2_LIBS) ++endif ++ + ifdef MOZ_ENABLE_XPRINT + EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS) + endif --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_uname.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_uname.dpatch @@ -0,0 +1,64 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_uname.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use ${host_*} variables instead of uname in configure.in. Closes: +## DP: #377418. +## DP: This is a minimalist patch to solve the particular bad assembler +## DP: choice issue. It would need a much greater work to actually do +## DP: something totally clean, but the current patch should be enough +## DP: for Linux builds. +## DP: Also incorporates fix for bz#363263. + +@DPATCH@ + +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 151) ++++ xulrunner/configure.in (local) +@@ -811,19 +811,28 @@ + OS_RELEASE= + OS_TEST="${target_cpu}" + case "${target_os}" in +- linux*) OS_ARCH=Linux ;; ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; + kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; + gnu*) OS_ARCH=GNU ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; + esac + else +- OS_TARGET=`uname -s` +- OS_ARCH=`uname -s | sed -e 's|/|_|g'` ++ OS_TARGET="${host_os}" ++ OS_ARCH=`echo $host_os | sed -e 's|/|_|g'` + OS_RELEASE=`uname -r` +- OS_TEST=`uname -m` ++ OS_TEST="${host_cpu}" ++ case "${host_os}" in ++ linux*) OS_ARCH=Linux OS_TARGET=Linux;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; ++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ++ mingw*) OS_ARCH=WINNT ;; ++ wince*) OS_ARCH=WINCE ;; ++ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; ++ esac + fi + _COMPILER_PREFIX= + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 123) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -262,7 +262,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc) ++ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_sidebar.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_sidebar.dpatch @@ -0,0 +1,590 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_sidebar.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add sidebar component + +@DPATCH@ + +=== allmakefiles.sh +================================================================== +--- xulrunner/allmakefiles.sh (revision 4) ++++ xulrunner/allmakefiles.sh (local) +@@ -985,6 +985,9 @@ + toolkit/components/satchel/Makefile + toolkit/components/satchel/public/Makefile + toolkit/components/satchel/src/Makefile ++toolkit/components/sidebar/Makefile ++toolkit/components/sidebar/public/Makefile ++toolkit/components/sidebar/src/Makefile + toolkit/components/startup/Makefile + toolkit/components/startup/public/Makefile + toolkit/components/startup/src/Makefile +=== toolkit/components/Makefile.in +================================================================== +--- xulrunner/toolkit/components/Makefile.in (revision 206) ++++ xulrunner/toolkit/components/Makefile.in (local) +@@ -73,6 +73,7 @@ + history \ + passwordmgr \ + satchel \ ++ sidebar \ + $(NULL) + endif # MOZ_THUNDERBIRD + +=== toolkit/components/sidebar/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/Makefile.in (local) +@@ -0,0 +1,48 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org Code. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1999 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++DEPTH = ../../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++DIRS = public src ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/public/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/public/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/public/Makefile.in (local) +@@ -0,0 +1,50 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org Code. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1998 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++DEPTH = ../../../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++MODULE = sidebar ++ ++XPIDLSRCS = nsISidebar.idl ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/public/nsISidebar.idl +================================================================== +--- xulrunner/toolkit/components/sidebar/public/nsISidebar.idl (revision 4) ++++ xulrunner/toolkit/components/sidebar/public/nsISidebar.idl (local) +@@ -0,0 +1,70 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * ++ * ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* ++ ++ The Sidebar API for 3rd parties ++ ++*/ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] ++interface nsISidebar : nsISupports ++{ ++ void addPanel(in wstring aTitle, in string aContentURL, ++ in string aCustomizeURL); ++ void addPersistentPanel(in wstring aTitle, in string aContentURL, ++ in string aCustomizeURL); ++ void addSearchEngine(in string engineURL, in string iconURL, ++ in wstring suggestedTitle, in wstring suggestedCategory); ++}; ++ ++%{ C++ ++// {577CB744-8CAF-11d3-AAEF-00805F8A4905} ++#define NS_SIDEBAR_CID \ ++{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } ++ ++#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" ++%} ++ ++/* ++ var isidebar = Components.interfaces.nsISidebar; ++ var csidebar = Components.classes['@mozilla.org/sidebar;1']; ++ var sidebar = csidebar.createInstance(isidebar); ++*/ +=== toolkit/components/sidebar/src/Makefile.in +================================================================== +--- xulrunner/toolkit/components/sidebar/src/Makefile.in (revision 4) ++++ xulrunner/toolkit/components/sidebar/src/Makefile.in (local) +@@ -0,0 +1,48 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org Code. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1998 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++DEPTH = ../../../.. ++topsrcdir = @top_srcdir@ ++srcdir = @srcdir@ ++VPATH = @srcdir@ ++ ++include $(DEPTH)/config/autoconf.mk ++ ++EXTRA_COMPONENTS = nsSidebar.js ++ ++include $(topsrcdir)/config/rules.mk ++ +=== toolkit/components/sidebar/src/nsSidebar.js +================================================================== +--- xulrunner/toolkit/components/sidebar/src/nsSidebar.js (revision 4) ++++ xulrunner/toolkit/components/sidebar/src/nsSidebar.js (local) +@@ -0,0 +1,315 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1999 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Stephen Lamm ++ * Robert John Churchill ++ * David Hyatt ++ * Christopher A. Aillon ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++/* ++ * No magic constructor behaviour, as is de rigeur for XPCOM. ++ * If you must perform some initialization, and it could possibly fail (even ++ * due to an out-of-memory condition), you should use an Init method, which ++ * can convey failure appropriately (thrown exception in JS, ++ * NS_FAILED(nsresult) return in C++). ++ * ++ * In JS, you can actually cheat, because a thrown exception will cause the ++ * CreateInstance call to fail in turn, but not all languages are so lucky. ++ * (Though ANSI C++ provides exceptions, they are verboten in Mozilla code ++ * for portability reasons -- and even when you're building completely ++ * platform-specific code, you can't throw across an XPCOM method boundary.) ++ */ ++ ++const DEBUG = false; /* set to false to suppress debug messages */ ++ ++const SIDEBAR_CONTRACTID = "@mozilla.org/sidebar;1"; ++const SIDEBAR_CID = Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}"); ++const NETSEARCH_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=internetsearch" ++const nsISupports = Components.interfaces.nsISupports; ++const nsIFactory = Components.interfaces.nsIFactory; ++const nsISidebar = Components.interfaces.nsISidebar; ++const nsIInternetSearchService = Components.interfaces.nsIInternetSearchService; ++const nsIClassInfo = Components.interfaces.nsIClassInfo; ++ ++function nsSidebar() ++{ ++ const PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; ++ const nsIPromptService = Components.interfaces.nsIPromptService; ++ this.promptService = ++ Components.classes[PROMPTSERVICE_CONTRACTID].getService(nsIPromptService); ++} ++ ++nsSidebar.prototype.nc = "http://home.netscape.com/NC-rdf#"; ++ ++function sidebarURLSecurityCheck(url) ++{ ++ if (url.search(/(^http:|^ftp:|^https:)/) == -1) ++ throw "Script attempted to add sidebar panel from illegal source"; ++} ++ ++/* decorate prototype to provide ``class'' methods and property accessors */ ++nsSidebar.prototype.addPanel = ++function (aTitle, aContentURL, aCustomizeURL) ++{ ++ debug("addPanel(" + aTitle + ", " + aContentURL + ", " + ++ aCustomizeURL + ")"); ++ ++ return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, false); ++} ++ ++nsSidebar.prototype.addPersistentPanel = ++function(aTitle, aContentURL, aCustomizeURL) ++{ ++ debug("addPersistentPanel(" + aTitle + ", " + aContentURL + ", " + ++ aCustomizeURL + ")\n"); ++ ++ return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, true); ++} ++ ++nsSidebar.prototype.addPanelInternal = ++function (aTitle, aContentURL, aCustomizeURL, aPersist) ++{ ++ var WINMEDSVC = Components.classes['@mozilla.org/appshell/window-mediator;1'] ++ .getService(Components.interfaces.nsIWindowMediator); ++ var win = WINMEDSVC.getMostRecentWindow( "navigator:browser" ); ++ ++ sidebarURLSecurityCheck(aContentURL); ++ var dialogArgs = { ++ name: aTitle, ++ url: aContentURL, ++ bWebPanel: true ++ } ++ var features; ++ if (!/Mac/.test(win.navigator.platform)) ++ features = "centerscreen,chrome,dialog,resizable,dependent"; ++ else ++ features = "chrome,dialog,resizable,modal"; ++ win.openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "", ++ features, dialogArgs); ++} ++ ++/* decorate prototype to provide ``class'' methods and property accessors */ ++nsSidebar.prototype.addSearchEngine = ++function (engineURL, iconURL, suggestedTitle, suggestedCategory) ++{ ++ debug("addSearchEngine(" + engineURL + ", " + iconURL + ", " + ++ suggestedCategory + ", " + suggestedTitle + ")"); ++ ++ try ++ { ++ // make sure using HTTP (for both engine as well as icon URLs) ++ ++ if (engineURL.search(/^http:\/\//i) == -1) ++ { ++ debug ("must use HTTP to fetch search engine file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ if (iconURL.search(/^http:\/\//i) == -1) ++ { ++ debug ("must use HTTP to fetch search icon file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ // make sure engineURL refers to a .src file ++ if (engineURL.search(/\.src$/i) == -1) ++ { ++ debug ("engineURL doesn't reference a .src file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ // make sure iconURL refers to a .gif/.jpg/.jpeg/.png file ++ if (iconURL.search(/\.(gif|jpg|jpeg|png)$/i) == -1) ++ { ++ debug ("iconURL doesn't reference a supported image file"); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ } ++ catch(ex) ++ { ++ this.promptService.alert(null, "Failed to add the search engine."); ++ throw Components.results.NS_ERROR_INVALID_ARG; ++ } ++ ++ var titleMessage, dialogMessage; ++ try { ++ var stringBundle = srGetStrBundle("chrome://browser/locale/sidebar/sidebar.properties"); ++ if (stringBundle) { ++ titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle"); ++ dialogMessage = stringBundle.GetStringFromName("addEngineConfirmMessage"); ++ dialogMessage = dialogMessage.replace(/%title%/, suggestedTitle); ++ dialogMessage = dialogMessage.replace(/%category%/, suggestedCategory); ++ dialogMessage = dialogMessage.replace(/%url%/, engineURL); ++ dialogMessage = dialogMessage.replace(/#/g, "\n"); ++ } ++ } ++ catch (e) { ++ titleMessage = "Add Search Engine"; ++ dialogMessage = "Add the following search engine?\n\nName: " + suggestedTitle; ++ dialogMessage += "\nSearch Category: " + suggestedCategory; ++ dialogMessage += "\nSource: " + engineURL; ++ } ++ ++ var rv = this.promptService.confirm(null, titleMessage, dialogMessage); ++ ++ if (!rv) ++ return; ++ ++ var internetSearch = Components.classes[NETSEARCH_CONTRACTID].getService(); ++ if (internetSearch) ++ internetSearch = internetSearch.QueryInterface(nsIInternetSearchService); ++ if (internetSearch) ++ { ++ internetSearch.AddSearchEngine(engineURL, iconURL, suggestedTitle, ++ suggestedCategory); ++ } ++} ++ ++// property of nsIClassInfo ++nsSidebar.prototype.flags = nsIClassInfo.DOM_OBJECT; ++ ++// property of nsIClassInfo ++nsSidebar.prototype.classDescription = "Sidebar"; ++ ++// method of nsIClassInfo ++nsSidebar.prototype.getInterfaces = function(count) { ++ var interfaceList = [nsISidebar, nsIClassInfo]; ++ count.value = interfaceList.length; ++ return interfaceList; ++} ++ ++// method of nsIClassInfo ++nsSidebar.prototype.getHelperForLanguage = function(count) {return null;} ++ ++nsSidebar.prototype.QueryInterface = ++function (iid) { ++ if (!iid.equals(nsISidebar) && ++ !iid.equals(nsIClassInfo) && ++ !iid.equals(nsISupports)) ++ throw Components.results.NS_ERROR_NO_INTERFACE; ++ return this; ++} ++ ++var sidebarModule = new Object(); ++ ++sidebarModule.registerSelf = ++function (compMgr, fileSpec, location, type) ++{ ++ debug("registering (all right -- a JavaScript module!)"); ++ compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar); ++ ++ compMgr.registerFactoryLocation(SIDEBAR_CID, ++ "Sidebar JS Component", ++ SIDEBAR_CONTRACTID, ++ fileSpec, ++ location, ++ type); ++ const CATMAN_CONTRACTID = "@mozilla.org/categorymanager;1"; ++ const nsICategoryManager = Components.interfaces.nsICategoryManager; ++ var catman = Components.classes[CATMAN_CONTRACTID]. ++ getService(nsICategoryManager); ++ ++ const JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY = "JavaScript global property"; ++ catman.addCategoryEntry(JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY, ++ "sidebar", ++ SIDEBAR_CONTRACTID, ++ true, ++ true); ++} ++ ++sidebarModule.getClassObject = ++function (compMgr, cid, iid) { ++ if (!cid.equals(SIDEBAR_CID)) ++ throw Components.results.NS_ERROR_NO_INTERFACE; ++ ++ if (!iid.equals(Components.interfaces.nsIFactory)) ++ throw Components.results.NS_ERROR_NOT_IMPLEMENTED; ++ ++ return sidebarFactory; ++} ++ ++sidebarModule.canUnload = ++function(compMgr) ++{ ++ debug("Unloading component."); ++ return true; ++} ++ ++/* factory object */ ++var sidebarFactory = new Object(); ++ ++sidebarFactory.createInstance = ++function (outer, iid) { ++ debug("CI: " + iid); ++ if (outer != null) ++ throw Components.results.NS_ERROR_NO_AGGREGATION; ++ ++ return (new nsSidebar()).QueryInterface(iid); ++} ++ ++/* entrypoint */ ++function NSGetModule(compMgr, fileSpec) { ++ return sidebarModule; ++} ++ ++/* static functions */ ++if (DEBUG) ++ debug = function (s) { dump("-*- sidebar component: " + s + "\n"); } ++else ++ debug = function (s) {} ++ ++var strBundleService = null; ++function srGetStrBundle(path) ++{ ++ var strBundle = null; ++ if (!strBundleService) { ++ try { ++ strBundleService = ++ Components.classes["@mozilla.org/intl/stringbundle;1"].getService(); ++ strBundleService = ++ strBundleService.QueryInterface(Components.interfaces.nsIStringBundleService); ++ } catch (ex) { ++ dump("\n--** strBundleService failed: " + ex + "\n"); ++ return null; ++ } ++ } ++ strBundle = strBundleService.createBundle(path); ++ if (!strBundle) { ++ dump("\n--** strBundle createInstance failed **--\n"); ++ } ++ return strBundle; ++} --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_system_libs.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_system_libs.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_system_libs.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make sure we won't be bitten by upstream changing libjpeg, libpng +## DP: or zlib internal version, which makes system library not used even +## DP: though --with-system-* argument is given to configure. + +@DPATCH@ + +--- xulrunner/configure.in ++++ xulrunner/configure.in +@@ -3785,7 +3785,7 @@ + AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"], SYSTEM_JPEG=, $JPEG_LIBS) + fi + +-if test "$SYSTEM_JPEG" = 1; then ++if test "$SYSTEM_JPEG" = 0; then + LIBS="$JPEG_LIBS $LIBS" + AC_TRY_RUN( + #include +@@ -3830,7 +3830,7 @@ + AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"], + [SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS) + fi +-if test "$SYSTEM_ZLIB" = 1; then ++if test "$SYSTEM_ZLIB" = 0; then + LIBS="$ZLIB_LIBS $LIBS" + AC_TRY_RUN([ + #include +@@ -3883,7 +3883,7 @@ + AC_CHECK_LIB(png, png_get_valid, [SYSTEM_PNG=1 PNG_LIBS="-lpng $PNG_LIBS"], + SYSTEM_PNG=, $PNG_LIBS) + fi +-if test "$SYSTEM_PNG" = 1; then ++if test "$SYSTEM_PNG" = 0; then + LIBS="$PNG_LIBS $LIBS" + AC_TRY_RUN( + #include --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_hppa_xpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_hppa_xpcom.dpatch @@ -0,0 +1,245 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_hppa_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch from Ivar (Contributed by Randolph Chung) to fix Firefox on hppa. +## DP: bz#287150 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -184,6 +184,20 @@ + endif + endif + ++# ++# Linux/HPPA/GCC ++# ++ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter hppa,$(OS_TEST))) ++ifeq ($(CC),gcc) ++CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp ++ASFILES := xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s ++CXXFLAGS += -O0 ++endif ++endif ++endif ++ ++ + ###################################################################### + # M68k + ###################################################################### +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s (local) +@@ -0,0 +1,128 @@ ++ ++ .LEVEL 1.1 ++ .text ++ .align 4 ++ ++framesz: ++ .equ 128 ++ ++; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex, ++; PRUint32 paramCount, nsXPTCVariant* params); ++ ++.globl XPTC_InvokeByIndex ++ .type XPTC_InvokeByIndex, @function ++ ++ ++XPTC_InvokeByIndex: ++ .PROC ++ .CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3 ++ .ENTRY ++ ++ ; frame marker takes 48 bytes, ++ ; register spill area takes 8 bytes, ++ ; local stack area takes 72 bytes result in 128 bytes total ++ ++ STW %rp,-20(%sp) ++ STW,MA %r3,128(%sp) ++ ++ LDO -framesz(%r30),%r28 ++ STW %r28,-4(%r30) ; save previous sp ++ STW %r19,-32(%r30) ++ ++ STW %r26,-36-framesz(%r30) ; save argument registers in ++ STW %r25,-40-framesz(%r30) ; in PREVIOUS frame ++ STW %r24,-44-framesz(%r30) ; ++ STW %r23,-48-framesz(%r30) ; ++ ++; B,L .+8,%r2 ++; ADDIL L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1 ++; ; LDO R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1 ++;$PIC_pcrel$1 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$2 ++; MTSP %r31,%sr0 ++ ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28 ++ BL invoke_count_bytes,%r31 ++ COPY %r31,%r2 ++ ++ CMPIB,>= 0,%r28, .+76 ++ COPY %r30,%r3 ; copy stack ptr to saved stack ptr ++ ADD %r30,%r28,%r30 ; extend stack frame ++ LDW -4(%r3),%r28 ; move frame ++ STW %r28,-4(%r30) ++ LDW -8(%r3),%r28 ++ STW %r28,-8(%r30) ++ LDW -12(%r3),%r28 ++ STW %r28,-12(%r30) ++ LDW -16(%r3),%r28 ++ STW %r28,-16(%r30) ++ LDW -20(%r3),%r28 ++ STW %r28,-20(%r30) ++ LDW -24(%r3),%r28 ++ STW %r28,-24(%r30) ++ LDW -28(%r3),%r28 ++ STW %r28,-28(%r30) ++ LDW -32(%r3),%r28 ++ STW %r28,-32(%r30) ++ ++ LDO -40(%r30),%r26 ; load copy address ++ LDW -44-framesz(%r3),%r25 ; load rest of 2 arguments ++ LDW -48-framesz(%r3),%r24 ; ++ ++ LDW -32(%r30),%r19 ; shared lib call destroys r19; reload ++; B,L .+8,%r2 ++; ADDIL L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1 ++; LDO R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1 ++;$PIC_pcrel$3 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$4 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26 ++ BL invoke_copy_to_stack,%r31 ++ COPY %r31,%r2 ++ ++ LDO -48(%r30),%r20 ++ EXTRW,U,= %r28,31,1,%r22 ++ FLDD 0(%r20),%fr7 ; load double arg 1 ++ EXTRW,U,= %r28,30,1,%r22 ++ FLDW 8(%r20),%fr5L ; load float arg 1 ++ EXTRW,U,= %r28,29,1,%r22 ++ FLDW 4(%r20),%fr6L ; load float arg 2 ++ EXTRW,U,= %r28,28,1,%r22 ++ FLDW 0(%r20),%fr7L ; load float arg 3 ++ ++ LDW -36-framesz(%r3),%r26 ; load ptr to 'that' ++ LDW -40(%r30),%r25 ; load the rest of dispatch argument registers ++ LDW -44(%r30),%r24 ++ LDW -48(%r30),%r23 ++ ++ LDW -36-framesz(%r3),%r20 ; load vtable addr ++ LDW -40-framesz(%r3),%r28 ; load index ++ LDW 0(%r20),%r20 ; follow vtable ++; LDO 0(%r20),%r20 ; offset vtable by 16 bytes (g++: 8, aCC: 16) ++ SH2ADDL %r28,%r20,%r28 ; add 4*index to vtable entry ++ LDW 0(%r28),%r22 ; load vtable entry ++ ++; B,L .+8,%r2 ++; ADDIL L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1 ++; LDO R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1 ++;$PIC_pcrel$5 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$6 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28; ++ BL $$dyncall,%r31 ++ COPY %r31,%r2 ++ ++ LDW -32(%r30),%r19 ++ COPY %r3,%r30 ; restore saved stack ptr ++ ++ LDW -148(%sp),%rp ++ LDWM -128(%sp),%r3 ++ BV,N (%rp) ++ NOP ++ .EXIT ++ .PROCEND ;in=23,24,25,26; ++ .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ++ +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s (local) +@@ -0,0 +1,73 @@ ++ .LEVEL 1.1 ++ .TEXT ++ .ALIGN 4 ++ ++curframesz: ++ .EQU 128 ++ ++ ++; SharedStub has stack size of 128 bytes ++ ++lastframesz: ++ .EQU 64 ++ ++; the StubN C++ function has a small stack size of 64 bytes ++ ++ ++.globl SharedStub ++ .type SharedStub, @function ++ ++SharedStub: ++ .PROC ++ .CALLINFO CALLER,FRAME=80,SAVE_RP ++ ++ .ENTRY ++ STW %rp,-20(%sp) ++ LDO 128(%sp),%sp ++ ++ STW %r19,-32(%r30) ++ STW %r26,-36-curframesz(%r30) ; save arg0 in previous frame ++ ++ LDO -80(%r30),%r28 ++ FSTD,MA %fr5,8(%r28) ; save darg0 ++ FSTD,MA %fr7,8(%r28) ; save darg1 ++ FSTW,MA %fr4L,4(%r28) ; save farg0 ++ FSTW,MA %fr5L,4(%r28) ; save farg1 ++ FSTW,MA %fr6L,4(%r28) ; save farg2 ++ FSTW,MA %fr7L,4(%r28) ; save farg3 ++ ++ ; Former value of register 26 is already properly saved by StubN, ++ ; but register 25-23 are not because of the arguments mismatch ++ STW %r25,-40-curframesz-lastframesz(%r30) ; save r25 ++ STW %r24,-44-curframesz-lastframesz(%r30) ; save r24 ++ STW %r23,-48-curframesz-lastframesz(%r30) ; save r23 ++ COPY %r26,%r25 ; method index is arg1 ++ LDW -36-curframesz-lastframesz(%r30),%r26 ; self is arg0 ++ LDO -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2 ++ LDO -80(%r30),%r23 ; floating args is arg3 ++ ++; BL .+8,%r2 ++; ADDIL L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2 ++; LDO R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1 ++;$PIC_pcrel$0 ++; LDSID (%r1),%r31 ++;$PIC_pcrel$1 ++; MTSP %r31,%sr0 ++ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28; ++ BL PrepareAndDispatch, %r31 ++ COPY %r31,%r2 ++ ++ LDW -32(%r30),%r19 ++ ++ LDW -148(%sp),%rp ++ LDO -128(%sp),%sp ++ ++ ++ BV,N (%rp) ++ NOP ++ NOP ++ ++ .EXIT ++ .PROCEND ;in=26;out=28; ++ ++ .SIZE SharedStub, .-SharedStub --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_mips_xpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_mips_xpcom.dpatch @@ -0,0 +1,492 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_mips_xpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Thiemo Seufer to fix mips. bz#258429 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/Makefile.in +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/Makefile.in (local) +@@ -227,13 +227,9 @@ + ifneq (,$(findstring mips, $(OS_TEST))) + CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp + ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s +-#xptcstubs_mips.cpp +-# xptcstubs_asm_mips.s +-ifdef GNU_CC +-ASFLAGS += $(INCLUDES) -x assembler-with-cpp -D__GNUC__ ++AS := $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp + endif + endif +-endif + + ###################################################################### + # PowerPC +@@ -378,10 +374,8 @@ + + ifeq ($(OS_ARCH),Linux) + ifneq (,$(findstring mips, $(OS_TEST))) +-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc +- m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \ +- $(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s +- $(RM) -f ./xptcstubs_asm_mips.s ++xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc ++ $(AS) -o $@ $< + endif + endif + +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s (local) +@@ -21,6 +21,7 @@ + * Contributor(s): + * Brendan Eich + * Stuart Parmenter ++ * Thiemo Seufer + */ + + /* This code is for MIPS using the O32 ABI. */ +@@ -28,139 +29,123 @@ + #include + #include + +-.text +-.globl invoke_count_words +-.globl invoke_copy_to_stack ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif + +-# We need a variable number of words allocated from the stack for copies of +-# the params, and this space must come between the high frame (where ra, gp, +-# and s0 are saved) and the low frame (where a0-a3 are saved by the callee +-# functions we invoke). ++#define LOCALSZ 3 /* gp, fp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) + +-LOCALSZ=4 # s0, s1, ra, gp +-NARGSAVE=4 # a0, a1, a2, a3 +-HIFRAMESZ=(LOCALSZ*SZREG) +-LOFRAMESZ=(NARGSAVE*SZREG) +-FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define FPOFF (FRAMESZ - (2*SZREG)) ++#define GPOFF (FRAMESZ - (3*SZREG)) + +-# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause +-# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12. +-RAOFF=FRAMESZ - (2*SZREG) +-GPOFF=FRAMESZ - (3*SZREG) +-S0OFF=FRAMESZ - (4*SZREG) +-S1OFF=FRAMESZ - (5*SZREG) ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) + +-# These are not magic -- they are just our argsave slots in the caller frame. +-A0OFF=FRAMESZ +-A1OFF=FRAMESZ + (1*SZREG) +-A2OFF=FRAMESZ + (2*SZREG) +-A3OFF=FRAMESZ + (3*SZREG) ++ .text + +- # +- # _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) +- # a0 a1 a2 a3 ++# ++# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params) ++# a0 a1 a2 a3 + +-NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra) +- +- .set noreorder +- .cpload t9 +- .set reorder +- ++ .globl _XPTC_InvokeByIndex ++ .align 2 ++ .type _XPTC_InvokeByIndex,@function ++ .ent _XPTC_InvokeByIndex,0 ++ .frame fp, FRAMESZ, ra ++_XPTC_InvokeByIndex: ++ SETUP_GP + subu sp, FRAMESZ + +- # specify the save register mask -- XXX do we want the a0-a3 here, given +- # our "split" frame where the args are saved below a dynamicly allocated +- # region under the high frame? +- # +- # 10010000000000010000000011110000 +- .mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG) ++ # specify the save register mask for gp, fp, ra, a3 - a0 ++ .mask 0xD00000F0, RAOFF-FRAMESZ + +- # thou shalt not use .cprestore if yer frame has variable size... +- # .cprestore GPOFF ++ sw ra, RAOFF(sp) ++ sw fp, FPOFF(sp) + +- REG_S ra, RAOFF(sp) ++ # we can't use .cprestore in a variable stack frame ++ sw gp, GPOFF(sp) + +- # this happens automatically with .cprestore, but we cannot use that op... +- REG_S gp, GPOFF(sp) +- REG_S s0, S0OFF(sp) +- REG_S s1, S1OFF(sp) ++ sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) + +- REG_S a0, A0OFF(sp) +- REG_S a1, A1OFF(sp) +- REG_S a2, A2OFF(sp) +- REG_S a3, A3OFF(sp) ++ # save bottom of fixed frame ++ move fp, sp + +- # invoke_count_words(paramCount, params) ++ # extern "C" uint32 ++ # invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s); ++ la t9, invoke_count_words + move a0, a2 + move a1, a3 ++ jalr t9 ++ lw gp, GPOFF(fp) + +- jal invoke_count_words +- lw gp, GPOFF(sp) ++ # allocate variable stack, with a size of: ++ # wordsize (of 4 bytes) * result (already aligned to dword) ++ # but a minimum of 16 byte ++ sll v0, 2 ++ slt t0, v0, 16 ++ beqz t0, 1f ++ li v0, 16 ++1: subu sp, v0 + +- # save the old sp so we can pop the param area and any "low frame" +- # needed as an argsave area below the param block for callees that +- # we invoke. +- move s0, sp +- +- REG_L a1, A2OFF(sp) # a1 = paramCount +- REG_L a2, A3OFF(sp) # a2 = params +- +- # we define a word as 4 bytes, period end of story! +- sll v0, 2 # 4 bytes * result of invoke_copy_words +- subu v0, LOFRAMESZ # but we take back the argsave area built into +- # our stack frame -- SWEET! +- subu sp, sp, v0 # make room +- move a0, sp # a0 = param stack address +- move s1, a0 # save it for later -- it should be safe here +- +- # the old sp is still saved in s0, but we now need another argsave +- # area ("low frame") for the invoke_copy_to_stack call. +- subu sp, sp, LOFRAMESZ +- +- # copy the param into the stack areas ++ # let a0 point to the bottom of the variable stack, allocate ++ # another fixed stack for: ++ # extern "C" void + # invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, +- # nsXPTCVariant* s) +- jal invoke_copy_to_stack +- lw gp, GPOFF(s0) ++ # nsXPTCVariant* s); ++ la t9, invoke_copy_to_stack ++ move a0, sp ++ lw a1, A2OFF(fp) ++ lw a2, A3OFF(fp) ++ subu sp, 16 ++ jalr t9 ++ lw gp, GPOFF(fp) + +- move sp, s0 # get orig sp back, popping params and argsave ++ # back to the variable stack frame ++ addu sp, 16 + +- REG_L a0, A0OFF(sp) # a0 = set "that" to be "this" +- REG_L a1, A1OFF(sp) # a1 = methodIndex +- +- # t1 = methodIndex * 4 +- # (use shift instead of mult) +- sll t1, a1, 2 +- +- # calculate the function we need to jump to, +- # which must then be saved in t9 ++ # calculate the function we need to jump to, which must then be ++ # stored in t9 ++ lw a0, A0OFF(fp) # a0 = set "that" to be "this" ++ lw t0, A1OFF(fp) # a1 = methodIndex + lw t9, 0(a0) +- addu t9, t9, t1 +- lw t9, 8(t9) ++ # t0 = methodIndex << PTRLOG ++ sll t0, t0, PTRLOG ++ addu t9, t0 ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++ lw t9, (t9) ++#else /* not G++ V3 ABI */ ++ lw t9, 2*PTRSIZE(t9) ++#endif /* G++ V3 ABI */ + +- # a1..a3 and f13..f14 should now be set to what +- # invoke_copy_to_stack told us. skip a0 and f12 +- # because that is the "this" pointer ++ # Set a1-a3 to what invoke_copy_to_stack told us. a0 is already ++ # the "this" pointer. We don't have to care about floating ++ # point arguments, the non-FP "this" pointer as first argument ++ # means they'll never be used. ++ lw a1, 1*SZREG(sp) ++ lw a2, 2*SZREG(sp) ++ lw a3, 3*SZREG(sp) + +- REG_L a1, 1*SZREG(s1) +- REG_L a2, 2*SZREG(s1) +- REG_L a3, 3*SZREG(s1) ++ jalr t9 ++ # Micro-optimization: There's no gp usage below this point, so ++ # we don't reload. ++ # lw gp, GPOFF(fp) + +- l.d $f13, 8(s1) +- l.d $f14, 16(s1) ++ # leave variable stack frame ++ move sp, fp + +- # Create the stack pointer for the function, which must have 4 words +- # of space for callee-saved args. invoke_count_words allocated space +- # for a0 starting at s1, so we just move s1 into sp. +- move sp, s1 ++ lw ra, RAOFF(sp) ++ lw fp, FPOFF(sp) + +- jalr ra, t9 +- lw gp, GPOFF(s0) +- +- move sp, s0 +- +- REG_L ra, RAOFF(sp) +- REG_L s0, S0OFF(sp) +- addu sp, FRAMESZ ++ addiu sp, FRAMESZ + j ra +-.end _XPTC_InvokeByIndex ++END(_XPTC_InvokeByIndex) +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp (local) +@@ -24,6 +24,7 @@ + * Contributor(s): + * Stuart Parmenter + * Brendan Eich ++ * Thiemo Seufer + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), +@@ -52,10 +53,8 @@ + // Count a word for a0 even though it's never stored or loaded + // We do this only for alignment of register pairs. + PRUint32 result = 1; +- for (PRUint32 i = 0; i < paramCount; i++, s++) ++ for (PRUint32 i = 0; i < paramCount; i++, result++, s++) + { +- result++; +- + if (s->IsPtrData()) + continue; + +@@ -68,6 +67,9 @@ + result++; + result++; + break; ++ ++ default: ++ break; + } + } + return (result + 1) & ~(PRUint32)1; +@@ -88,8 +90,6 @@ + continue; + } + +- *((void**)d) = s->val.p; +- + switch(s->type) + { + case nsXPTType::T_I64 : +@@ -104,6 +104,9 @@ + if ((PRWord)d & 4) d++; + *((double*) d) = s->val.d; d++; + break; ++ default: ++ *((void**)d) = s->val.p; ++ break; + } + } + } +@@ -118,5 +121,4 @@ + PRUint32 paramCount, nsXPTCVariant* params) + { + return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params); +-} +- ++} +=== xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s (local) +@@ -0,0 +1,142 @@ ++/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corp, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2001 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Stuart Parmenter ++ * Chris Waterson ++ * Thiemo Seufer ++ */ ++ ++/* This code is for MIPS using the O32 ABI. */ ++ ++#include ++#include ++ ++# NARGSAVE is the argument space in the callers frame, including extra ++# 'shadowed' space for the argument registers. The minimum of 4 ++# argument slots is sometimes predefined in the header files. ++#ifndef NARGSAVE ++#define NARGSAVE 4 ++#endif ++ ++#define LOCALSZ 2 /* gp, ra */ ++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK) ++ ++#define RAOFF (FRAMESZ - (1*SZREG)) ++#define GPOFF (FRAMESZ - (2*SZREG)) ++ ++#define A0OFF (FRAMESZ + (0*SZREG)) ++#define A1OFF (FRAMESZ + (1*SZREG)) ++#define A2OFF (FRAMESZ + (2*SZREG)) ++#define A3OFF (FRAMESZ + (3*SZREG)) ++ ++ .text ++ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .if x < 10; \ ++ .globl _ZN14nsXPTCStubBase5Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase5Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase5Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase5Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 100; \ ++ .globl _ZN14nsXPTCStubBase6Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase6Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase6Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase6Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .elseif x < 1000; \ ++ .globl _ZN14nsXPTCStubBase7Stub ##x ##Ev; \ ++ .type _ZN14nsXPTCStubBase7Stub ##x ##Ev,@function; \ ++ .aent _ZN14nsXPTCStubBase7Stub ##x ##Ev,0; \ ++_ZN14nsXPTCStubBase7Stub ##x ##Ev:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub; \ ++ .else; \ ++ .err; \ ++ .endif ++#else /* not G++ V3 ABI */ ++#define STUB_ENTRY(x) \ ++ .globl Stub ##x ##__14nsXPTCStubBase; \ ++ .type Stub ##x ##__14nsXPTCStubBase,@function; \ ++ .aent Stub ##x ##__14nsXPTCStubBase,0; \ ++Stub ##x ##__14nsXPTCStubBase:; \ ++ SETUP_GP; \ ++ li t0,x; \ ++ b sharedstub ++#endif /* G++ V3 ABI */ ++ ++# SENTINEL_ENTRY is handled in the cpp file. ++#define SENTINEL_ENTRY(x) ++ ++# ++# open a dummy frame for the function entries ++# ++ .align 2 ++ .type dummy,@function ++ .ent dummy, 0 ++ .frame sp, FRAMESZ, ra ++dummy: ++ SETUP_GP ++ ++#include "xptcstubsdef.inc" ++ ++sharedstub: ++ subu sp, FRAMESZ ++ ++ # specify the save register mask for gp, ra, a0-a3 ++ .mask 0x900000F0, RAOFF-FRAMESZ ++ ++ sw ra, RAOFF(sp) ++ SAVE_GP(GPOFF) ++ ++ # Micro-optimization: a0 is already loaded, and its slot gets ++ # ignored by PrepareAndDispatch, so no need to save it here. ++ # sw a0, A0OFF(sp) ++ sw a1, A1OFF(sp) ++ sw a2, A2OFF(sp) ++ sw a3, A3OFF(sp) ++ ++ la t9, PrepareAndDispatch ++ ++ # t0 is methodIndex ++ move a1, t0 ++ # have a2 point to the begin of the argument space on stack ++ addiu a2, sp, FRAMESZ ++ ++ # PrepareAndDispatch(that, methodIndex, args) ++ jalr t9 ++ ++ # Micro-optimization: Using jalr explicitly has the side-effect ++ # of not triggering .cprestore. This is ok because we have no ++ # gp reference below this point. It also allows better ++ # instruction sscheduling. ++ # lw gp, GPOFF(fp) ++ ++ lw ra, RAOFF(sp) ++ addiu sp, FRAMESZ ++ j ra ++ END(dummy) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_install_path.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_install_path.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_install_path.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: hook to set application directory name + +@DPATCH@ + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 7) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -54,13 +54,13 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/$(MOZ_APP_NAME) + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @datadir@/idl/$(MOZ_APP_NAME) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/$(MOZ_APP_NAME) + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/35_pango_null_char.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/35_pango_null_char.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_pango_null_char.dpatch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid freeze/crash when null characters are present in justified text +## DP: by discarding NULL characters before displaying. bz#366902 +## DP: I don't like to have the two backends do different things, so we +## DP: just unconditionally apply the workaround. + +@DPATCH@ + +=== layout/generic/nsTextTransformer.h +================================================================== +--- xulrunner/layout/generic/nsTextTransformer.h (revision 161) ++++ xulrunner/layout/generic/nsTextTransformer.h (local) +@@ -80,10 +80,10 @@ + #ifdef IBMBIDI + // added BIDI formatting codes + #define IS_DISCARDED(_ch) \ +- (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch)) ++ (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch) || ((_ch) == '\0')) + #else + #define IS_DISCARDED(_ch) \ +- (((_ch) == CH_SHY) || ((_ch) == '\r')) ++ (((_ch) == CH_SHY) || ((_ch) == '\r') || ((_ch) == '\0')) + #endif + + #define IS_ASCII_CHAR(ch) ((ch&0xff80) == 0) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/25_xpidl.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/25_xpidl.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_xpidl.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix crash when no file is given on the command line. +## DP: Fix the error message about extra arguments given showing before +## DP: the crash. bz#331818. + +@DPATCH@ + +=== xpcom/typelib/xpidl/xpidl.c +================================================================== +--- xulrunner/xpcom/typelib/xpidl/xpidl.c (revision 62) ++++ xulrunner/xpcom/typelib/xpidl/xpidl.c (local) +@@ -260,7 +260,7 @@ + xpidl_usage(argc, argv); + return 1; + } +- if (argc != i + 1) { ++ if (argc > i + 1) { + fprintf(stderr, "ERROR: extra arguments after input file\n"); + } + +@@ -268,7 +268,9 @@ + * Don't try to process multiple files, given that we don't handle -o + * multiply. + */ +- if (xpidl_process_idl(argv[i], inc_head, file_basename, mode)) ++ if (i >= argc) ++ fprintf(stderr, "ERROR: no file to process\n"); ++ else if (xpidl_process_idl(argv[i], inc_head, file_basename, mode)) + return 0; + + return 1; --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/35_zip_cache.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/35_zip_cache.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_zip_cache.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Invalidate cache for a zip file that got modified. It will prevent +## DP: corruption of the XUL FastLoad cache when upgrade is performed +## DP: while an instance of the application is running. bz#368428. + +@DPATCH@ + +--- iceape/modules/libjar/nsJAR.h ++++ iceape/modules/libjar/nsJAR.h +@@ -117,6 +117,10 @@ + mCache = cache; + } + ++ PRInt64 GetMtime() { ++ return mMtime; ++ } ++ + PRFileDesc* OpenFile(); + protected: + //-- Private data members +@@ -131,6 +135,7 @@ + PRLock* mLock; + PRInt32 mTotalItemsInManifest; + PRFileDesc* mFd; ++ PRInt64 mMtime; + + //-- Private functions + nsresult ParseManifest(nsISignatureVerifier* verifier); +--- iceape/modules/libjar/nsJAR.cpp ++++ iceape/modules/libjar/nsJAR.cpp +@@ -214,6 +214,7 @@ + nsJAR::Init(nsIFile* zipFile) + { + mZipFile = zipFile; ++ zipFile->GetLastModifiedTime(&mMtime); + mLock = PR_NewLock(); + return mLock ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + } +@@ -1216,15 +1217,24 @@ + rv = zipFile->GetNativePath(path); + if (NS_FAILED(rv)) return rv; + ++ PRInt64 Mtime; ++ rv = zipFile->GetLastModifiedTime(&Mtime); ++ if (NS_FAILED(rv)) return rv; ++ + nsCStringKey key(path); + nsJAR* zip = NS_STATIC_CAST(nsJAR*, NS_STATIC_CAST(nsIZipReader*,mZips.Get(&key))); // AddRefs +- if (zip) { ++ if (zip && LL_EQ(Mtime, zip->GetMtime())) { + #ifdef ZIP_CACHE_HIT_RATE + mZipCacheHits++; + #endif + zip->ClearReleaseTime(); + } + else { ++ if (zip) { ++ lock.unlock(); ++ mZips.Remove(&key); ++ lock.lock(); ++ } + zip = new nsJAR(); + if (zip == nsnull) + return NS_ERROR_OUT_OF_MEMORY; --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_config.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_config.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh -e +## 80_config.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use config.guess and config.sub from autotools-dev + +AUTOCONF_DIRS="./build/autoconf/ ./directory/c-sdk/config/autoconf/" + +dpatch_patch () +{ + for dir in $AUTOCONF_DIRS; do + for file in config.guess config.sub; do + sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$file'" "$@"' $dir/$file + done + done +} + +dpatch_unpatch () +{ + for dir in $AUTOCONF_DIRS; do + for file in config.guess config.sub; do + sed -i '2!b;/^exec "/ d' $dir/$file + done + done +} + +DPATCH_LIB_NO_DEFAULT=1 + +. /usr/share/dpatch/dpatch.lib.sh --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/60_config_install.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/60_config_install.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_config_install.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correct installation of all the headers files from the config/ +## DP: directory. + +@DPATCH@ + +=== config/Makefile.in +================================================================== +--- xulrunner/config/Makefile.in (revision 77) ++++ xulrunner/config/Makefile.in (local) +@@ -157,8 +157,7 @@ + echo "(nsBuildID.h is missing.)"; \ + exit 1; \ + fi; +- $(SYSINSTALL) $(IFLAGS1) nsBuildID.h $(DESTDIR)$(includedir) +- $(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir) ++ $(SYSINSTALL) $(IFLAGS1) $(HEADERS) $(DESTDIR)$(includedir) + + GARBAGE += build_number nsBuildID \ + $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_xpcomglue.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_xpcomglue.dpatch @@ -0,0 +1,261 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_xpcomglue.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Build the xpcom glue as a shared library. Still hackish. +## DP: - Load DSOs from . when directory is not given. + +@DPATCH@ + +=== xpcom/glue/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/Makefile.in (revision 62) ++++ xulrunner/xpcom/glue/Makefile.in (local) +@@ -45,6 +45,7 @@ + + DIRS = standalone + ++ifeq (1,0) + MODULE = xpcom + LIBRARY_NAME = xpcomglue_s + +@@ -64,6 +65,7 @@ + $(XPCOM_GLUE_SRC_LCPPSRCS) \ + $(XPCOM_GLUENS_SRC_LCPPSRCS) \ + $(NULL) ++endif + + EXPORTS = \ + pldhash.h \ +@@ -96,6 +98,7 @@ + nsVersionComparator.h \ + $(NULL) + ++ifeq (1,0) + SDK_LIBRARY = \ + $(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ + $(NULL) +@@ -105,6 +108,7 @@ + + # Force use of PIC + FORCE_USE_PIC = 1 ++endif + + include $(topsrcdir)/config/rules.mk + +=== xpcom/glue/standalone/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/standalone/Makefile.in (revision 245) ++++ xulrunner/xpcom/glue/standalone/Makefile.in (local) +@@ -45,10 +45,13 @@ + + MODULE = xpcom + LIBRARY_NAME = xpcomglue ++SO_VERSION = 0d + + REQUIRES = string \ + $(NULL) + ++EXTRA_DSO_LDOPTS= -L$(topsrcdir)/dist/lib -lnspr4 ++ + LOCAL_INCLUDES = \ + -I$(srcdir)/../../build \ + $(NULL) +@@ -87,11 +90,11 @@ + $(NULL) + + SDK_LIBRARY = \ +- $(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \ ++ $(DLL_PREFIX)xpcomglue$(DLL_SUFFIX) \ + $(NULL) + + # we don't want the shared lib, but we want to force the creation of a static lib. +-FORCE_STATIC_LIB = 1 ++#FORCE_STATIC_LIB = 1 + + # Force use of PIC + FORCE_USE_PIC = 1 +=== xpcom/glue/standalone/nsGlueLinking.h +================================================================== +--- xulrunner/xpcom/glue/standalone/nsGlueLinking.h (revision 62) ++++ xulrunner/xpcom/glue/standalone/nsGlueLinking.h (local) +@@ -42,15 +42,15 @@ + + #define XPCOM_DEPENDENT_LIBS_LIST "dependentlibs.list" + +-NS_HIDDEN_(GetFrozenFunctionsFunc) ++NS_EXPORT_(GetFrozenFunctionsFunc) + XPCOMGlueLoad(const char *xpcomFile); + +-NS_HIDDEN_(void) ++NS_EXPORT_(void) + XPCOMGlueUnload(); + + typedef void (*DependentLibsCallback)(const char *aDependentLib); + +-NS_HIDDEN_(void) ++NS_EXPORT_(void) + XPCOMGlueLoadDependentLibs(const char *xpcomDir, DependentLibsCallback cb); + + #endif // nsGlueLinking_h__ +=== xpcom/glue/standalone/nsXPCOMGlue.h +================================================================== +--- xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h (revision 62) ++++ xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h (local) +@@ -99,7 +99,7 @@ + * Initialize the XPCOM glue by dynamically linking against the XPCOM + * shared library indicated by xpcomFile. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueStartup(const char* xpcomFile); + + typedef void (*NSFuncPtr)(); +@@ -118,13 +118,13 @@ + * @throws NS_ERROR_LOSS_OF_SIGNIFICANT_DATA if only some of the required + * functions were found. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueLoadXULFunctions(const nsDynamicFunctionLoad *symbols); + + /** + * Finish the XPCOM glue after it is no longer needed. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + XPCOMGlueShutdown(); + + +@@ -139,7 +139,7 @@ + * not need to free this buffer. + * @status DEPRECATED - Use GRE_GetGREPathWithProperties + */ +-extern "C" NS_HIDDEN_(char const *) ++extern "C" NS_EXPORT_(char const *) + GRE_GetXPCOMPath(); + + +@@ -148,7 +148,7 @@ + * + * @param _retval Ordinary XPCOM getter, returns an addrefed interface. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_GetGREDirectory(nsILocalFile* *_retval); + + +@@ -157,14 +157,14 @@ + * directoryserviceprovider may use GRE_Startup to start the XPCOM + * glue and initialize the GRE in one step. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_Startup(); + + + /** + * Shut down XPCOM and the XPCOM glue in one step. + */ +-extern "C" NS_HIDDEN_(nsresult) ++extern "C" NS_EXPORT_(nsresult) + GRE_Shutdown(); + + #endif // XPCOM_GLUE +=== xpcom/string/public/nsStringAPI.h +================================================================== +--- xulrunner/xpcom/string/public/nsStringAPI.h (revision 62) ++++ xulrunner/xpcom/string/public/nsStringAPI.h (local) +@@ -75,7 +75,7 @@ + #include "nscore.h" + + #if defined( XPCOM_GLUE ) +-#define NS_STRINGAPI(type) extern "C" NS_HIDDEN_(type) ++#define NS_STRINGAPI(type) extern "C" NS_EXPORT_(type) + #elif defined( _IMPL_NS_STRINGAPI ) + #define NS_STRINGAPI(type) extern "C" NS_EXPORT type + #else +=== xpcom/tools/registry/Makefile.in +================================================================== +--- xulrunner/xpcom/tools/registry/Makefile.in (revision 62) ++++ xulrunner/xpcom/tools/registry/Makefile.in (local) +@@ -55,7 +55,6 @@ + + LIBS = \ + $(XPCOM_STANDALONE_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ + $(NULL) + + # Need to link with CoreFoundation on Mac +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 62) ++++ xulrunner/configure.in (local) +@@ -754,7 +754,7 @@ + XPCOM_FROZEN_LDOPTS='-L$(DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom' + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul' + XPCOM_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' +-XPCOM_STANDALONE_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' ++XPCOM_STANDALONE_GLUE_LDOPTS='-L$(DIST)/lib -lxpcomglue' + + MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' + MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat' +=== xpcom/glue/standalone/nsGlueLinkingDlopen.cpp +================================================================== +--- xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp (revision 65) ++++ xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp (local) +@@ -86,20 +86,22 @@ + GetFrozenFunctionsFunc + XPCOMGlueLoad(const char *xpcomFile) + { +- char xpcomDir[MAXPATHLEN]; +- if (realpath(xpcomFile, xpcomDir)) { +- char *lastSlash = strrchr(xpcomDir, '/'); +- if (lastSlash) { +- *lastSlash = '\0'; ++ char xulFile[MAXPATHLEN]; ++ char *lastSlash = strrchr(xpcomFile, '/'); ++ if (!lastSlash) { ++ snprintf(xulFile, MAXPATHLEN, "./%s", xpcomFile); ++ return XPCOMGlueLoad(xulFile); ++ } ++ *lastSlash = '\0'; + +- XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB); ++ XPCOMGlueLoadDependentLibs(xpcomFile, ReadDependentCB); + +- snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), "/" XUL_DLL); ++ snprintf(xulFile, MAXPATHLEN - strlen(xpcomFile), "%s/" XUL_DLL, xpcomFile); + +- sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY); +- } +- } ++ sXULLibHandle = dlopen(xulFile, RTLD_GLOBAL | RTLD_LAZY); + ++ *lastSlash = '/'; ++ + // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is + // (void*) 0 in any case. + +=== xpcom/base/nscore.h +================================================================== +--- xulrunner/xpcom/base/nscore.h (revision 245) ++++ xulrunner/xpcom/base/nscore.h (local) +@@ -235,8 +235,6 @@ + #define NS_COM NS_EXPORT + #elif defined(_IMPL_NS_COM_OFF) + #define NS_COM +-#elif defined(XPCOM_GLUE) +-#define NS_COM + #else + #define NS_COM NS_IMPORT + #endif +@@ -253,7 +251,7 @@ + # define nsAString nsAString_internal + # define nsACString nsACString_internal + #else +-# define NS_COM_GLUE ++# define NS_COM_GLUE NS_COM + #endif + + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/30_embedding_tests.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/30_embedding_tests.dpatch @@ -0,0 +1,93 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_embedding_tests.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: embedding tests. bz#93213 + +@DPATCH@ + +Index: configure.in +=================================================================== +RCS file: /cvsroot/mozilla/configure.in,v +retrieving revision 1.1503 +diff -u -r1.1503 configure.in +--- xulrunner/configure.in 9 Aug 2005 07:41:30 -0000 1.1503 ++++ xulrunner/configure.in 30 Aug 2005 08:09:43 -0000 +@@ -5152,6 +5152,19 @@ + ENABLE_TESTS=, + ENABLE_TESTS=1 ) + ++ ++dnl ======================================================== ++dnl you can enable some tests even if tests are disabled by ++dnl previous option ++dnl ======================================================== ++ENABLE_EMBEDDING_TESTS=$ENABLE_TESTS ++MOZ_ARG_ENABLE_BOOL(embedding-tests, ++[ --enable-embedding-tests ++ Do build embedding tests libraries & programs, ++ even if tests are disabled], ++ ENABLE_EMBEDDING_TESTS=1, ++ ENABLE_EMBEDDING_TESTS= ) ++ + dnl ======================================================== + dnl = + dnl = Module specific options +@@ -6703,6 +6716,7 @@ + AC_SUBST(MOZ_STATIC_COMPONENT_LIBS) + AC_SUBST(MOZ_ENABLE_LIBXUL) + AC_SUBST(ENABLE_TESTS) ++AC_SUBST(ENABLE_EMBEDDING_TESTS) + AC_SUBST(IBMBIDI) + AC_SUBST(SUNCTL) + AC_SUBST(ACCESSIBILITY) +Index: config/autoconf.mk.in +=================================================================== +RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v +retrieving revision 3.363 +diff -u -r3.363 autoconf.mk.in +--- xulrunner/config/autoconf.mk.in 5 Aug 2005 17:09:41 -0000 3.363 ++++ xulrunner/config/autoconf.mk.in 30 Aug 2005 08:09:44 -0000 +@@ -106,6 +106,7 @@ + MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@ + MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@ + ENABLE_TESTS = @ENABLE_TESTS@ ++ENABLE_EMBEDDING_TESTS = @ENABLE_EMBEDDING_TESTS@ + IBMBIDI = @IBMBIDI@ + SUNCTL = @SUNCTL@ + ACCESSIBILITY = @ACCESSIBILITY@ +Index: embedding/browser/gtk/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/embedding/browser/gtk/Makefile.in,v +retrieving revision 1.8 +diff -u -r1.8 Makefile.in +--- xulrunner/embedding/browser/gtk/Makefile.in 18 Apr 2004 22:00:31 -0000 1.8 ++++ xulrunner/embedding/browser/gtk/Makefile.in 30 Aug 2005 08:09:50 -0000 +@@ -44,7 +44,10 @@ + include $(DEPTH)/config/autoconf.mk + + MODULE = gtkembedmoz +-DIRS=src tests ++DIRS = src ++ifdef ENABLE_EMBEDDING_TESTS ++DIRS += tests ++endif + + PACKAGE_FILE = gtkembed.pkg + +Index: embedding/browser/gtk/gtkembed.pkg +=================================================================== +RCS file: /cvsroot/mozilla/embedding/browser/gtk/gtkembed.pkg,v +retrieving revision 1.2 +diff -u -r1.2 gtkembed.pkg +--- xulrunner/embedding/browser/gtk/gtkembed.pkg 7 Jan 2004 01:21:23 -0000 1.2 ++++ xulrunner/embedding/browser/gtk/gtkembed.pkg 30 Aug 2005 08:09:50 -0000 +@@ -1,6 +1,8 @@ + [gtkembed] + dist/bin/@DLLP@gtkembedmoz@DLLS@ ++#if ENABLE_EMBEDDING_TESTS + dist/bin/TestGtkEmbed ++#endif + + #if ENABLE_TESTS + dist/bin/TestGtkEmbedNotebook@BINS@ --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_no_sys_profile.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_no_sys_profile.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_no_sys_profile.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't install system profile + +@DPATCH@ + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 61) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -49,8 +49,6 @@ + + MOZILLA_INTERNAL_API = 1 + +-DIRS = profile +- + PREF_JS_EXPORTS = $(srcdir)/xulrunner.js + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js) + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/30_distclean.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/30_distclean.dpatch @@ -0,0 +1,220 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_distclean.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make distclean cleaner. bz#333308. + +@DPATCH@ + +=== Makefile.in +================================================================== +--- xulrunner/Makefile.in (revision 73) ++++ xulrunner/Makefile.in (local) +@@ -456,6 +456,7 @@ + DIST_GARBAGE = config.cache config.log config.status config-defs.h \ + dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \ + unallmakefiles mozilla-config.h \ ++ gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ + $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out + + # Build pseudo-external modules first when export is explicitly called +=== build/unix/Makefile.in +================================================================== +--- xulrunner/build/unix/Makefile.in (revision 73) ++++ xulrunner/build/unix/Makefile.in (local) +@@ -71,7 +71,7 @@ + $(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \ + $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc + +-GARBAGE = $(pkg_config_files) mozilla-config ++GARBAGE = $(pkg_config_files) $(MOZ_APP_NAME)-config + + $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed \ +=== extensions/java/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/src/Makefile.in (revision 73) ++++ xulrunner/extensions/java/xpcom/src/Makefile.in (local) +@@ -92,7 +92,7 @@ + $(MOZ_COMPONENT_LIBS) \ + $(NULL) + +-GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files ++GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files .done + GARBAGE_DIRS += _javagen org + + include $(topsrcdir)/config/rules.mk +=== extensions/pref/system-pref/src/gconf/Makefile.in +================================================================== +--- xulrunner/extensions/pref/system-pref/src/gconf/Makefile.in (revision 73) ++++ xulrunner/extensions/pref/system-pref/src/gconf/Makefile.in (local) +@@ -84,3 +84,5 @@ + + export:: + $(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp . ++ ++GARBAGE += nsSystemPrefFactory.cpp +=== profile/dirserviceprovider/standalone/Makefile.in +================================================================== +--- xulrunner/profile/dirserviceprovider/standalone/Makefile.in (revision 73) ++++ xulrunner/profile/dirserviceprovider/standalone/Makefile.in (local) +@@ -65,3 +65,5 @@ + + export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS) + $(INSTALL) $^ . ++ ++GARBAGE = $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)) +=== security/manager/Makefile.in +================================================================== +--- xulrunner/security/manager/Makefile.in (revision 73) ++++ xulrunner/security/manager/Makefile.in (local) +@@ -158,6 +158,8 @@ + endif + touch $@ + ++GARBAGE += .nss.cleaned ++ + .nss.checkout: + touch $(srcdir)/$@ + +=== toolkit/library/Makefile.in +================================================================== +--- xulrunner/toolkit/library/Makefile.in (revision 73) ++++ xulrunner/toolkit/library/Makefile.in (local) +@@ -369,9 +369,13 @@ + dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp + $(INSTALL) $^ . + ++GARBAGE += dlldeps.cpp dlldeps-obs.cpp ++ + ifdef MOZ_JAVAXPCOM + export:: dlldeps-javaxpcom.cpp + + dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp + $(INSTALL) $^ . ++ ++GARBAGE += dlldeps-javaxpcom.cpp + endif +=== toolkit/mozapps/downloads/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/downloads/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/downloads/src/Makefile.in (local) +@@ -45,6 +45,7 @@ + MODULE = helperAppDlg + + EXTRA_COMPONENTS = nsHelperAppDlg.js ++GARBAGE += nsHelperAppDlg.js + + include $(topsrcdir)/config/rules.mk + +=== toolkit/mozapps/extensions/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/extensions/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/extensions/src/Makefile.in (local) +@@ -45,6 +45,7 @@ + MODULE = extensions + + EXTRA_COMPONENTS = nsExtensionManager.js ++GARBAGE += nsExtensionManager.js + + include $(topsrcdir)/config/rules.mk + +=== toolkit/mozapps/update/src/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/update/src/Makefile.in (revision 73) ++++ xulrunner/toolkit/mozapps/update/src/Makefile.in (local) +@@ -49,6 +49,7 @@ + endif + + EXTRA_COMPONENTS = nsUpdateService.js ++GARBAGE += nsUpdateService.js + + ifeq ($(OS_ARCH),WINNT) + EXTRA_COMPONENTS += nsPostUpdateWin.js +=== toolkit/xre/Makefile.in +================================================================== +--- xulrunner/toolkit/xre/Makefile.in (revision 73) ++++ xulrunner/toolkit/xre/Makefile.in (local) +@@ -156,16 +156,14 @@ + SHAREDCPPSRCS += nsSigHandlers.cpp + endif + +-GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + ifeq ($(OS_ARCH),WINNT) +-GARBAGE += $(addprefix $(srcdir)/,$(SHAREDSRCS)) ++GARBAGE += $(addprefix $(srcdir)/,$(SHAREDCPPSRCS)) + endif + + ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +-ifndef MOZ_ENABLE_LIBXUL + GARBAGE += $(STACKWALK_SRC_LCSRCS) + endif +-endif + + SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX) + +=== xpcom/build/Makefile.in +================================================================== +--- xulrunner/xpcom/build/Makefile.in (revision 73) ++++ xulrunner/xpcom/build/Makefile.in (local) +@@ -149,7 +149,7 @@ + # UNIX98 iconv support + OS_LIBS += $(LIBICONV) + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + include $(topsrcdir)/config/rules.mk + +=== xpcom/glue/standalone/Makefile.in +================================================================== +--- xulrunner/xpcom/glue/standalone/Makefile.in (revision 73) ++++ xulrunner/xpcom/glue/standalone/Makefile.in (local) +@@ -96,7 +96,7 @@ + # Force use of PIC + FORCE_USE_PIC = 1 + +-GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) ++GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) + + SRCS_IN_OBJDIR = 1 + +=== xpfe/components/filepicker/src/Makefile.in +================================================================== +--- xulrunner/xpfe/components/filepicker/src/Makefile.in (revision 73) ++++ xulrunner/xpfe/components/filepicker/src/Makefile.in (local) +@@ -68,6 +68,7 @@ + $(NULL) + + EXTRA_COMPONENTS = nsFilePicker.js ++GARBAGE += nsFilePicker.js + + include $(topsrcdir)/config/rules.mk + +=== config/static-rules.mk +================================================================== +--- xulrunner/config/static-rules.mk ++++ xulrunner/config/static-rules.mk +@@ -14,6 +14,8 @@ + sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \ + > $(_TARGET) + ++GARBAGE += nsStaticComponents.cpp ++ + ifeq ($(OS_ARCH),IRIX) + LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=80 + endif +=== config/Makefile.in +================================================================== +--- xulrunner/config/Makefile.in (revision 167) ++++ xulrunner/config/Makefile.in (local) +@@ -144,6 +144,8 @@ + -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ + $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers + $(INSTALL) system_wrappers $(DIST)/include ++ ++GARBAGE_DIRS += system_wrappers + endif + + # we don't use an explicit dependency here because then we would --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/81_sonames.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/81_sonames.dpatch @@ -0,0 +1,280 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 81_sonames.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add soname support + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 206) ++++ xulrunner/config/rules.mk (local) +@@ -132,6 +132,25 @@ + endif + + SHARED_LIBRARY := $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX) ++SONAME := $(notdir $(SHARED_LIBRARY)) ++ ++ifdef SO_VERSION ++ifneq (,$(findstring $(SONAME),$(MKSHLIB))) ++SO_VERSION_MAJOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/') ++SO_VERSION_MINOR := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/') ++SO_VERSION_MICRO := $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/') ++ ++SHARED_LIBRARY_LINKS := $(SONAME) ++ifdef SO_VERSION_MINOR ++SHARED_LIBRARY_LINKS += $(SONAME).$(SO_VERSION_MAJOR) ++endif ++ ++SONAME := $(SONAME).$(SO_VERSION_MAJOR) ++SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) ++ ++MKSHLINKS = (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done) ++endif ++endif + + ifeq ($(OS_ARCH),OS2) + DEF_FILE := $(SHARED_LIBRARY:.dll=.def) +@@ -264,7 +283,7 @@ + $(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\ + $(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \ + $(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \ +- $(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \ ++ $(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(SHARED_LIBRARY_LINKS) $(wildcard *.ilk) \ + $(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \ + $(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \ + $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \ +@@ -502,6 +521,7 @@ + ifeq ($(OS_ARCH),Linux) + ifdef IS_COMPONENT + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++else + endif + endif + +@@ -658,8 +678,10 @@ + $(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib + else + $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib ++ $(call MKSHLINKS,$(DIST)/lib) + endif + $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) ++ $(call MKSHLINKS,$(FINAL_TARGET)) + ifdef BEOS_ADDON_WORKAROUND + ( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) + endif +@@ -705,45 +727,32 @@ + endif + endif + ++ifdef MRE_DIST ++DESTSUBDIR=$(mredir) ++else ++DESTSUBDIR=$(mozappdir) ++endif ++ + install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) + ifndef NO_INSTALL + #ifdef LIBRARY + #ifndef IS_COMPONENT +-#ifdef MRE_DIST +-# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mredir) +-#else +-# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mozappdir) +-#endif ++# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(DESTSUBDIR) + #endif # !IS_COMPONENT + #endif # LIBRARY + ifdef SHARED_LIBRARY + ifdef IS_COMPONENT +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR)/components + else +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components +-endif +-else +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR) ++ $(call MKSHLINKS,$(DESTDIR)$(DESTSUBDIR)) + endif + endif # SHARED_LIBRARY + ifdef PROGRAM +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(DESTSUBDIR) + endif # PROGRAM + ifdef SIMPLE_PROGRAMS +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mredir) +-else +- $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mozappdir) +-endif ++ $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(DESTSUBDIR) + endif # SIMPLE_PROGRAMS + endif # NO_INSTALL + +@@ -975,6 +984,8 @@ + SUB_SHLOBJS = $(SUB_LOBJS) + endif + ++$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY) ++ + $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) Makefile Makefile.in + ifndef INCREMENTAL_LINKER + rm -f $@ +@@ -1001,6 +1012,7 @@ + endif # SHARED_LIBRARY_LIBS + endif # NO_LD_ARCHIVE_FLAGS + $(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) ++ $(call MKSHLINKS,.) + @rm -f foodummyfilefoo $(SUB_SHLOBJS) $(DELETE_AFTER_LINK) + else # os2 vacpp + $(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) +@@ -1340,11 +1352,7 @@ + + install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt + ifndef NO_INSTALL +-ifdef MRE_DIST +- $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/components +-else +- $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/components +-endif ++ $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(DESTSUBDIR)/components + endif # NO_INSTALL + endif # NO_GEN_XPT + +=== configure.in +--- xulrunner/configure.in (revision 206) ++++ xulrunner/configure.in (local) +@@ -1118,8 +1125,8 @@ + dnl GNU specific defaults + dnl ======================================================== + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + DSO_LDOPTS='-shared' + if test "$GCC_USE_GNU_LD"; then + # Don't allow undefined symbols in libraries +@@ -1149,8 +1156,8 @@ + _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT' + _USE_CPP_INCLUDE_FLAG=1 + else +- MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@' ++ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@' + + DSO_LDOPTS='-shared' + if test "$GNU_LD"; then +@@ -1386,7 +1393,7 @@ + + *-beos*) + no_x=yes +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@' + _PLATFORM_DEFAULT_TOOLKIT="beos" + DSO_LDOPTS='-nostart' + TK_LIBS='-lbe -lroot' +@@ -1896,8 +1904,8 @@ + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + ;; + + *-nto*) +@@ -2063,8 +2072,8 @@ + + alpha*-*-osf*) + if test "$GNU_CC"; then +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@' + + else + MOZ_DEBUG_FLAGS='-g' +@@ -2074,8 +2083,8 @@ + DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations' + DSO_CFLAGS= + DSO_PIC_CFLAGS= +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-all' + MKSHLIB_UNFORCE_ALL='-none' + dnl Might fix the libxpcom.so breakage on this platform as well.... +@@ -2132,8 +2141,8 @@ + [LDFLAGS=$_SAVE_LDFLAGS]) + fi + MOZ_OPTIMIZE_FLAGS="-xO4" +- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' +- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(SONAME) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $(SONAME) -o $@' + MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' + MKSHLIB_UNFORCE_ALL='' + DSO_LDOPTS='-G -Qoption ld -z,muldefs' +=== embedding/browser/gtk/src/Makefile.in +--- xulrunner/embedding/browser/gtk/src/Makefile.in (revision 8) ++++ xulrunner/embedding/browser/gtk/src/Makefile.in (local) +@@ -46,6 +46,7 @@ + MODULE = gtkembedmoz + LIBRARY_NAME = gtkembedmoz + MOZILLA_INTERNAL_API = 1 ++SO_VERSION = 0d + + REQUIRES = xpcom \ + string \ +=== js/src/Makefile.in +--- xulrunner/js/src/Makefile.in (revision 8) ++++ xulrunner/js/src/Makefile.in (local) +@@ -48,6 +48,7 @@ + LIBRARY_NAME = mozjs + LIB_IS_C_ONLY = 1 + GRE_MODULE = 1 ++SO_VERSION = 0d + + ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) + LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER) +=== toolkit/library/Makefile.in +--- xulrunner/toolkit/library/Makefile.in (revision 8) ++++ xulrunner/toolkit/library/Makefile.in (local) +@@ -48,6 +48,7 @@ + FORCE_USE_PIC = 1 + FORCE_SHARED_LIB = 1 + MOZILLA_INTERNAL_API = 1 ++SO_VERSION = 0d + + ifeq ($(OS_ARCH),Darwin) + # This is going to be a framework named "XUL", not an ordinary library named +=== xpcom/stub/Makefile.in +--- xulrunner/xpcom/stub/Makefile.in (revision 8) ++++ xulrunner/xpcom/stub/Makefile.in (local) +@@ -44,6 +44,7 @@ + + MODULE = xpcom + LIBRARY_NAME = xpcom ++SO_VERSION = 0d + + # The XPCOM glue uses realpath() on libxpcom.so to resolve any symlinks. We + # want it to find dist/bin and not xpcom/stub so we copy instead of symlinking. +=== configure.in +================================================================== +--- configure.in (revision 206) ++++ configure.in (local) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_zip.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_zip.dpatch @@ -0,0 +1,95 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_zip.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid needing zip if not required. bz#331785. + +@DPATCH@ + +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 42) ++++ xulrunner/configure.in (local) +@@ -518,10 +518,6 @@ + AC_PATH_PROG(WHOAMI, whoami, :) + AC_PATH_PROG(AUTOCONF, autoconf, :) + AC_PATH_PROG(UNZIP, unzip, :) +-AC_PATH_PROGS(ZIP, zip) +-if test -z "$ZIP" || test "$ZIP" = ":"; then +- AC_MSG_ERROR([zip not found in \$PATH]) +-fi + AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend) + AC_PATH_PROG(XARGS, xargs) + if test -z "$XARGS" || test "$XARGS" = ":"; then +@@ -5660,6 +5656,14 @@ + AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, both, or symlink]) + fi + ++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" || ++ test "$MOZ_CHROME_FILE_FORMAT" = "both"; then ++ AC_PATH_PROGS(ZIP, zip) ++ if test -z "$ZIP" || test "$ZIP" = ":"; then ++ AC_MSG_ERROR([zip not found in \$PATH]) ++ fi ++fi ++ + dnl ======================================================== + dnl = Define default location for MOZILLA_FIVE_HOME + dnl ======================================================== +=== config/config.mk +================================================================== +--- xulrunner/config/config.mk (revision 42) ++++ xulrunner/config/config.mk (local) +@@ -475,10 +475,14 @@ + # Flags passed to make-jars.pl + + MAKE_JARS_FLAGS = \ +- -s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \ ++ -s $(srcdir) -t $(topsrcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl \ + -f $(MOZ_CHROME_FILE_FORMAT) \ + $(NULL) + ++ifdef ZIP ++MAKE_JARS_FLAGS += -z $(ZIP) ++endif ++ + ifdef NO_JAR_AUTO_REG + MAKE_JARS_FLAGS += -a + endif +=== config/make-jars.pl +================================================================== +--- xulrunner/config/make-jars.pl (revision 42) ++++ xulrunner/config/make-jars.pl (local) +@@ -137,7 +137,7 @@ + $zipprog = $::opt_z; + } + +-if ($zipprog eq "") { ++if (($fileformat eq "jar" || $fileformat eq "both") && $zipprog eq "") { + print "A valid zip program must be given via the -z option or the ZIP environment variable. Exiting.\n"; + exit(1); + } +@@ -509,6 +509,7 @@ + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0) if ($fileformat eq "flat"); + $args = "$args$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && + $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) +@@ -521,6 +522,7 @@ + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0) if ($fileformat eq "flat"); + $overrides = "$overrides$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) + { +@@ -533,6 +535,7 @@ + my $dest = $1; + my $srcPath = defined($2) ? substr($2, 1, -1) : $2; + EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1); ++ EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1) if ($fileformat eq "flat"); + $overrides = "$overrides$dest "; + if (!foreignPlatformFile($jarfile) && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/) + { --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/61_javaxpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/61_javaxpcom.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 61_javaxpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Correctly build java files. This part is fixed on upstream trunk. +## DP: - Install jar file with appropriate permissions. bz#350886 comment #17. + +@DPATCH@ + +=== extensions/java/xpcom/interfaces/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/interfaces/Makefile.in (revision 210) ++++ xulrunner/extensions/java/xpcom/interfaces/Makefile.in (local) +@@ -87,7 +87,7 @@ + @echo Compiling Java classes + find _java -name "*.java" > java.files + find $(JAVA_DIST_DIR)/default -name "*.java" >> java.files +- $(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath _java -sourcepath $(JAVA_DIST_DIR)/default @java.files ++ $(JAVAC) $(JAVAC_FLAGS) -classpath . -d . -sourcepath $(JAVA_DIST_DIR)/default @java.files + + $(JARFILE): $(COMPILED_JAVA_CLASSES) + $(JAR) cf $@ org +=== extensions/java/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/src/Makefile.in (revision 223) ++++ xulrunner/extensions/java/xpcom/src/Makefile.in (local) +@@ -151,5 +151,5 @@ + $(INSTALL) $(IFLAGS1) $(JARFILE) $(FINAL_TARGET) + + jar-install:: $(JARFILE) +- $(SYSINSTALL) $(IFLAGS2) $(JARFILE) $(DESTDIR)$(mozappdir) ++ $(SYSINSTALL) $(IFLAGS1) $(JARFILE) $(DESTDIR)$(mozappdir) + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/60_pyxpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/60_pyxpcom.dpatch @@ -0,0 +1,57 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_pyxpcom.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - Fix installation directory for PyXPCOM +## DP: - Use a make variable for PYTHON_SO + +@DPATCH@ + +=== extensions/python/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/Makefile.in (local) +@@ -90,9 +90,9 @@ + $(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools + + install:: +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client +- $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client ++ $(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server + + clobber:: + rm -rf $(DIST)/bin/python/xpcom +=== extensions/python/xpcom/src/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/src/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/src/Makefile.in (local) +@@ -104,9 +104,11 @@ + + install:: + ifneq ($(OS_ARCH),WINNT) +- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom +- mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX) ++ $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom ++ mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX) + endif ++ rm -f $(DESTDIR)$(mozappdir)/$(SHARED_LIBRARY) ++ rm -f $(DESTDIR)$(mozappdir)/$(IMPORT_LIBRARY) + + clobber:: + rm -f *.ilk *.pdb +=== extensions/python/xpcom/src/loader/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/src/loader/Makefile.in (revision 94) ++++ xulrunner/extensions/python/xpcom/src/loader/Makefile.in (local) +@@ -61,7 +61,7 @@ + include $(topsrcdir)/config/config.mk + + include $(topsrcdir)/config/rules.mk +-CXXFLAGS += -DPYTHON_SO=\"libpython$(PYTHON_VER_DOTTED).so\" ++CXXFLAGS += -DPYTHON_SO=\"$(PYTHON_SO)\" + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + + clobber:: --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/25_xrender_bug_workaround.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/25_xrender_bug_workaround.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_xrender_bug_workaround.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to work around a bug in XRender. bz#252033 +## DP: Ultimately, the rendering is going to be done by cairo, so the bug +## DP: will disappear by itself when the gtk gfx engine will stop being used. + +@DPATCH@ + +=== gfx/src/gtk/nsFontMetricsXft.cpp +================================================================== +--- xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp (revision 22) ++++ xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp (local) +@@ -2188,19 +2188,27 @@ + nsAutoDrawSpecBuffer::Flush() + { + if (mSpecPos) { +- // Some Xft libraries will crash if none of the glyphs have any +- // area. So before we draw, we scan through the glyphs. If we +- // find any that have area, we can draw. +- for (PRUint32 i = 0; i < mSpecPos; i++) { +- XftGlyphFontSpec *sp = &mSpecBuffer[i]; +- XGlyphInfo info; +- XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info); +- if (info.width && info.height) { +- // If we get here it means we found a drawable glyph. We will +- // Draw all the remaining glyphs and then break out of the loop +- XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+i, mSpecPos-i); +- break; ++ // There are two Xft problems to work around here: ++ // 1. Some Xft libraries reportedly crash if none of the ++ // glyphs have any area. ++ // 2. Because of an apparent X server bug (see bug 252033), ++ // a glyph with no area may cause all following glyphs to be ++ // dropped under some circumstances. ++ // For this reason, we manually ship out blocks of glyphs with ++ // area and skip blocks of glyphs with no area. ++ PRUint32 start = 0; ++ while (start < mSpecPos) { ++ PRUint32 i; ++ for (i = start; i < mSpecPos; i++) { ++ XftGlyphFontSpec *sp = &mSpecBuffer[i]; ++ XGlyphInfo info; ++ XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info); ++ if (!info.width || !info.height) ++ break; + } ++ if (i > start) ++ XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+start, i-start); ++ start = i + 1; + } + mSpecPos = 0; + } --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_kbsd.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_kbsd.dpatch @@ -0,0 +1,340 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_kbsd.dpatch by Petr Salinger +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GNU/kFreeBSD support. bz#356011 + +@DPATCH@ + +diff -ur mozilla/xpcom/glue/standalone/Makefile.in mozilla/xpcom/glue/standalone/Makefile.in +--- mozilla/xpcom/glue/standalone/Makefile.in 2007-07-14 16:24:55.000000000 +0200 ++++ mozilla/xpcom/glue/standalone/Makefile.in 2007-07-14 16:24:55.000000000 +0200 +@@ -62,7 +62,7 @@ + ifeq (WINNT,$(OS_ARCH)) + LINKSRC = nsGlueLinkingWin.cpp + endif +-ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH))) ++ifneq (,$(filter AIX DragonFly FreeBSD GNU GNU_% Linux NetBSD OpenBSD SunOS,$(OS_ARCH))) + LINKSRC = nsGlueLinkingDlopen.cpp + endif + ifeq (OS2,$(OS_ARCH)) +diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c +--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100 ++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100 +@@ -106,7 +106,7 @@ + } + #endif /* NEXTSTEP */ + +-#ifdef LINUX ++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__) + #include + #endif + +diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client +--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100 ++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100 +@@ -161,7 +161,7 @@ + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME) + EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib + endif +@@ -237,7 +237,7 @@ + ifeq ($(OS_ARCH), AIX) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + $(LINK_LIB) $(EXTRA_LIBS) +diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in +--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100 ++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100 +@@ -560,6 +560,8 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -1260,7 +1262,7 @@ + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -1271,8 +1273,12 @@ + AC_DEFINE(_SVID_SOURCE) + AC_DEFINE(_LARGEFILE64_SOURCE) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) +- AC_DEFINE(LINUX) +- AC_DEFINE(linux) ++ case "${target_os}" in ++ linux*) ++ AC_DEFINE(LINUX) ++ AC_DEFINE(linux) ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -2186,7 +2192,7 @@ + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu|*-gnu*) + AC_DEFINE(_REENTRANT) + ;; + esac +@@ -2262,7 +2268,7 @@ + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi +diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure +--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100 ++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100 +@@ -2753,6 +2754,8 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + darwin*) OS_ARCH=Darwin ;; +@@ -3766,7 +3769,7 @@ + esac + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH +@@ -3795,14 +3798,18 @@ + #define HAVE_FCNTL_FILE_LOCKING 1 + EOF + +- cat >> confdefs.h <<\EOF ++ case "${target_os}" in ++ linux*) ++ cat >> confdefs.h <<\EOF + #define LINUX 1 + EOF + +- cat >> confdefs.h <<\EOF ++ cat >> confdefs.h <<\EOF + #define linux 1 + EOF + ++ ;; ++ esac + LD='$(CC)' + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +@@ -5281,7 +5288,7 @@ + _PTHREAD_LDFLAGS= + fi + ;; +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu|*-gnu*) + cat >> confdefs.h <<\EOF + #define _REENTRANT 1 + EOF +@@ -5404,7 +5411,7 @@ + fi + fi + ;; +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + if test -n "$USE_NSPR_THREADS"; then + cat >> confdefs.h <<\EOF + #define _PR_LOCAL_THREADS_ONLY 1 +diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h +--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200 ++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100 +@@ -116,7 +116,7 @@ + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined(__GNU__) || defined(__GLIBC__) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX + #endif + #endif +@@ -145,7 +145,7 @@ + * Is snprintf() part of the standard C runtime library? + */ + #if !defined(HAVE_SNPRINTF) +-#if defined(SOLARIS) || defined(LINUX) || defined(HPUX) ++#if defined(SOLARIS) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(HPUX) + #define HAVE_SNPRINTF + #endif + #endif +@@ -165,7 +165,7 @@ + * for select() + */ + #if !defined(WINSOCK) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2) +-#if defined(hpux) || defined(LINUX) || defined(SUNOS4) || defined(XP_BEOS) ++#if defined(hpux) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(XP_BEOS) + #include + #else + #include +@@ -252,15 +252,14 @@ + #define HAVE_GETGRNAM_R + #endif + +-#if defined(SNI) || defined(LINUX1_2) ++#if defined(SNI) || defined(LINUX1_2) || defined(__GNU__) || defined(__GLIBC__) + int strcasecmp(const char *, const char *); + #ifdef SNI + int strncasecmp(const char *, const char *, int); +-#endif /* SNI */ +-#ifdef LINUX1_2 ++#else /* SNI */ + int strncasecmp(const char *, const char *, size_t); +-#endif /* LINUX1_2 */ +-#endif /* SNI || LINUX1_2 */ ++#endif ++#endif /* SNI || LINUX1_2 || __GNU__ || __GLIBC__ */ + + #if defined(_WINDOWS) || defined(macintosh) || defined(XP_OS2) || defined(DARWIN) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -276,7 +275,7 @@ + defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \ + defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \ + ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \ +- defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \ ++ defined(UnixWare) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(NETBSD) || \ + defined(FREEBSD) || defined(OPENBSD) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) +@@ -300,7 +299,7 @@ + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname_r( n, r, b, l, e ) + #endif + #if defined(HPUX9) || defined(LINUX1_2) || defined(LINUX2_0) || \ +- defined(LINUX2_1) || defined(SUNOS4) || defined(SNI) || \ ++ defined(LINUX2_1) || defined(__GNU__) || defined(__GLIBC__) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || \ + defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT)) || \ + (defined(AIX) && !defined(USE_REENTRANT_LIBC)) +@@ -320,7 +319,7 @@ + #endif + #if defined(hpux9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \ + defined(SCOOS) || defined(BSDI) || defined(NCR) || defined(VMS) || \ +- defined(NEC) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) ++ defined(NEC) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) + #define STRTOK( s1, s2, l ) strtok( s1, s2 ) + #else + #define HAVE_STRTOK_R +diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in +--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200 ++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100 +@@ -168,7 +168,7 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc + endif + +-ifeq ($(OS_ARCH), Linux) ++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH))) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif + +@@ -286,7 +286,7 @@ + ifdef SO_FILES_TO_REMOVE + -$(RM) $(SO_FILES_TO_REMOVE) + endif +-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) ++ifneq (,$(filter AIX Linux GNU GNU_% HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH))) + $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a + else + ifeq ($(OS_ARCH),OS2) +diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c +--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100 ++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100 +@@ -218,7 +218,7 @@ + + #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \ + defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \ +- defined(OPENBSD) || defined(NETBSD) ++ defined(OPENBSD) || defined(NETBSD) || defined(__FreeBSD_kernel__) + #define EDEADLOCK -1 + #endif + +diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100 +@@ -70,7 +70,7 @@ + # New code for Linux, et. al., with gcc + # Migrate other platforms here after testing + # +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) + # Linux/x86-64 + ifeq (x86_64,$(OS_TEST)) + CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100 +@@ -67,7 +67,7 @@ + * + */ + +-#if defined(LINUX) ++#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__)) + + #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7) + /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */ +diff -urN mozilla/configure.in mozilla/configure.in +--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100 ++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100 +@@ -812,6 +812,8 @@ + OS_TEST="${target_cpu}" + case "${target_os}" in + linux*) OS_ARCH=Linux ;; ++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;; ++ gnu*) OS_ARCH=GNU ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; +@@ -1261,7 +1263,7 @@ + LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc' + ;; + +-*-linux*) ++*-linux*|*-kfreebsd*-gnu|*-gnu*) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" +@@ -2169,7 +2171,7 @@ + dnl = Flags to strip unused symbols from .so components + dnl ======================================================== + case "$target" in +- *-linux*) ++ *-linux*|*-kfreebsd*-gnu|*-gnu*) + MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' + ;; + *-solaris*) +@@ -2735,7 +2737,7 @@ + fi + ;; + +- *-*-linux*) ++ *-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*) + AC_DEFINE(_REENTRANT) + ;; + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/25_gnome_helpers_with_params.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/25_gnome_helpers_with_params.dpatch @@ -0,0 +1,389 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_gnome_helpers_with_params.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make helper applications with parameters work. Adapted patch from +## DP: bz#273524 + +@DPATCH@ + +=== uriloader/exthandler/Makefile.in +================================================================== +--- xulrunner/uriloader/exthandler/Makefile.in (revision 116) ++++ xulrunner/uriloader/exthandler/Makefile.in (local) +@@ -102,7 +102,7 @@ + LOCAL_INCLUDES = -I$(srcdir) + + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +-OSHELPER += nsGNOMERegistry.cpp ++OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),beos) +=== uriloader/exthandler/unix/nsGNOMERegistry.cpp +--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp (local) +@@ -42,7 +42,6 @@ + #include "nsString.h" + #include "nsIComponentManager.h" + #include "nsILocalFile.h" +-#include "nsMIMEInfoImpl.h" + #include "nsAutoPtr.h" + + #include +@@ -56,12 +55,12 @@ + typedef struct _GnomeProgram GnomeProgram; + typedef struct _GnomeModuleInfo GnomeModuleInfo; + +-typedef struct { ++struct GnomeVFSMimeApplication { + char *id; + char *name; + char *command; + /* there is more here, but we don't need it */ +-} GnomeVFSMimeApplication; ++}; + + typedef GConfClient * (*_gconf_client_get_default_fn)(); + typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, +@@ -264,7 +263,7 @@ + } + + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromExtension(const char *aFileExt) + { + if (!gconfLib) +@@ -286,7 +285,7 @@ + return GetFromType(mimeType); + } + +-/* static */ already_AddRefed ++/* static */ already_AddRefed + nsGNOMERegistry::GetFromType(const char *aMIMEType) + { + if (!gconfLib) +@@ -296,7 +295,7 @@ + if (!handlerApp) + return nsnull; + +- nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType); ++ nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType); + NS_ENSURE_TRUE(mimeInfo, nsnull); + + // Get the list of extensions and append then to the mimeInfo. +@@ -320,11 +319,21 @@ + return nsnull; + } + +- gchar *commandPath = g_find_program_in_path(nativeCommand); ++ gchar **argv; ++ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); ++ if (!res) { ++ NS_ERROR("Could not convert helper app command to filesystem encoding"); ++ _gnome_vfs_mime_application_free(handlerApp); ++ return nsnull; ++ } + ++ gchar *commandPath = g_find_program_in_path(argv[0]); ++ + g_free(nativeCommand); ++ g_strfreev(argv); + + if (!commandPath) { ++ NS_WARNING("could not find command in path"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } +@@ -342,7 +351,7 @@ + + _gnome_vfs_mime_application_free(handlerApp); + +- nsMIMEInfoBase* retval; ++ nsMIMEInfoUnix* retval; + NS_ADDREF((retval = mimeInfo)); + return retval; + } +=== uriloader/exthandler/unix/nsGNOMERegistry.h +--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h (local) +@@ -35,10 +35,13 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#ifndef nsGNOMERegistry_h__ ++#define nsGNOMERegistry_h__ ++ + #include "nsIURI.h" + #include "nsCOMPtr.h" + +-class nsMIMEInfoBase; ++#include "nsMIMEInfoUnix.h" + + class nsGNOMERegistry + { +@@ -52,7 +55,9 @@ + static void GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc); + +- static already_AddRefed GetFromExtension(const char *aFileExt); ++ static already_AddRefed GetFromExtension(const char *aFileExt); + +- static already_AddRefed GetFromType(const char *aMIMEType); ++ static already_AddRefed GetFromType(const char *aMIMEType); + }; ++ ++#endif // nsGNOMERegistry_h__ +=== uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp (local) +@@ -0,0 +1,196 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsMIMEInfoUnix.h" ++#include "prlink.h" ++#include "prmem.h" ++#include ++#include ++ ++static PRLibrary *gnomeLib; ++static PRLibrary *vfsLib; ++ ++typedef struct _GnomeProgram GnomeProgram; ++typedef struct _GnomeModuleInfo GnomeModuleInfo; ++ ++typedef enum { ++ GNOME_VFS_OK // there's more but we don't care about them. ++} GnomeVFSResult; ++ ++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) ++ (GnomeVFSMimeApplication *app, ++ GList *uris); ++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); ++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); ++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, ++ const GnomeModuleInfo *, int, ++ char **, const char *, ...); ++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); ++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); ++typedef GnomeProgram * (*_gnome_program_get_fn)(); ++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); ++ ++#define DECL_FUNC_PTR(func) static _##func##_fn _##func ++ ++DECL_FUNC_PTR(gnome_vfs_mime_application_launch); ++DECL_FUNC_PTR(gnome_vfs_mime_application_free); ++DECL_FUNC_PTR(gnome_vfs_mime_application_copy); ++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); ++DECL_FUNC_PTR(gnome_program_init); ++DECL_FUNC_PTR(gnome_program_get); ++DECL_FUNC_PTR(libgnome_module_info_get); ++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); ++ ++static PRLibrary * ++LoadVersionedLibrary(const char* libName, const char* libVersion) ++{ ++ char *platformLibName = PR_GetLibraryName(nsnull, libName); ++ nsCAutoString versionLibName(platformLibName); ++ versionLibName.Append(libVersion); ++ PR_Free(platformLibName); ++ return PR_LoadLibrary(versionLibName.get()); ++} ++ ++static void ++Cleanup() ++{ ++ // Unload all libraries ++ if (gnomeLib) ++ PR_UnloadLibrary(gnomeLib); ++ if (vfsLib) ++ PR_UnloadLibrary(vfsLib); ++ ++ gnomeLib = vfsLib = nsnull; ++} ++ ++static void ++InitGnomeVFS() ++{ ++ static PRBool initialized = PR_FALSE; ++ ++ if (initialized) ++ return; ++ ++ #define ENSURE_LIB(lib) \ ++ PR_BEGIN_MACRO \ ++ if (!lib) { \ ++ Cleanup(); \ ++ return; \ ++ } \ ++ PR_END_MACRO ++ ++ #define GET_LIB_FUNCTION(lib, func, failure) \ ++ PR_BEGIN_MACRO \ ++ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ ++ if (!_##func) { \ ++ failure; \ ++ } \ ++ PR_END_MACRO ++ ++ // Attempt to open libgnome ++ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ ENSURE_LIB(gnomeLib); ++ ++ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); ++ ++ // Attempt to open libgnomevfs ++ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ ENSURE_LIB(vfsLib); ++ ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); ++ ++ // Initialize GNOME, if it's not already initialized. It's not ++ // necessary to tell GNOME about our actual command line arguments. ++ ++ if (!_gnome_program_get()) { ++ char *argv[1] = { "gecko" }; ++ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), ++ 1, argv, NULL); ++ } ++ ++ // Note: after GNOME has been initialized, do not ever unload these ++ // libraries. They register atexit handlers, so if they are unloaded, we'll ++ // crash on exit. ++} ++ ++void ++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) ++{ ++ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { ++ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); ++ ++ mPreferredAction = nsIMIMEInfo::useSystemDefault; ++ ++ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); ++ if (name) ++ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); ++ } ++} ++ ++nsMIMEInfoUnix::~nsMIMEInfoUnix() ++{ ++ if (mDefaultVFSApplication) ++ _gnome_vfs_mime_application_free(mDefaultVFSApplication); ++} ++ ++nsresult ++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) ++{ ++ NS_ENSURE_ARG_POINTER(aFile); ++ ++ InitGnomeVFS(); ++ ++ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { ++ nsCAutoString nativePath; ++ aFile->GetNativePath(nativePath); ++ ++ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); ++ ++ GList *uris = NULL; ++ uris = g_list_append(uris, uri); ++ ++ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); ++ ++ g_free(uri); ++ g_list_free(uris); ++ ++ if (result != GNOME_VFS_OK) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++ } ++ ++ if (!mDefaultApplication) ++ return NS_ERROR_FILE_NOT_FOUND; ++ ++ return LaunchWithIProcess(mDefaultApplication, aFile); ++} +=== uriloader/exthandler/unix/nsMIMEInfoUnix.h +--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h (revision 116) ++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h (local) +@@ -0,0 +1,48 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org Code. ++ * ++ * The Initial Developer of the Original Code is ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef nsMimeInfoUnix_h__ ++#define nsMimeInfoUnix_h__ ++ ++#include "nsMIMEInfoImpl.h" ++ ++struct GnomeVFSMimeApplication; ++ ++class nsMIMEInfoUnix : public nsMIMEInfoImpl ++{ ++public: ++ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} ++ virtual ~nsMIMEInfoUnix(); ++ ++ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); ++ ++protected: ++ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); ++ ++ GnomeVFSMimeApplication *mDefaultVFSApplication; ++}; ++ ++#endif // nsMimeInfoUnix_h__ --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/10_components_no_exec.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/10_components_no_exec.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_components_no_exec.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: install extra components without exec premissions. bz#331777 + +@DPATCH@ + +--- xulrunner/config/rules.mk 2005-08-11 18:41:53.000000000 +0200 ++++ xulrunner/config/rules.mk 2005-10-03 10:02:57.000000000 +0200 +@@ -1486,12 +1486,12 @@ + ifdef EXTRA_COMPONENTS + libs:: $(EXTRA_COMPONENTS) + ifndef NO_DIST_INSTALL +- $(INSTALL) $(IFLAGS2) $^ $(FINAL_TARGET)/components ++ $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/components + endif + + install:: $(EXTRA_COMPONENTS) + ifndef NO_INSTALL +- $(SYSINSTALL) $(IFLAGS2) $^ $(DESTDIR)$(mozappdir)/components ++ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/components + endif + endif + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/31_system_bz2.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/31_system_bz2.dpatch @@ -0,0 +1,216 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 31_system_bz2.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use system bz2. bz#305782. + +@DPATCH@ + +=== Makefile.in +================================================================== +--- xulrunner/Makefile.in (revision 10) ++++ xulrunner/Makefile.in (local) +@@ -126,7 +126,9 @@ + endif + + ifdef MOZ_UPDATER ++ifndef MOZ_NATIVE_BZ2 + tier_1_dirs += modules/libbz2 ++endif + tier_1_dirs += modules/libmar + endif + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 10) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -181,6 +181,7 @@ + NECKO_COOKIES = @NECKO_COOKIES@ + + MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@ ++MOZ_NATIVE_BZ2 = @SYSTEM_BZ2@ + MOZ_NATIVE_JPEG = @SYSTEM_JPEG@ + MOZ_NATIVE_PNG = @SYSTEM_PNG@ + MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@ +@@ -370,6 +371,14 @@ + ZLIB_REQUIRES = zlib + endif + ++MOZ_BZ2_CFLAGS = @MOZ_BZ2_CFLAGS@ ++MOZ_BZ2_LIBS = @MOZ_BZ2_LIBS@ ++ifdef MOZ_NATIVE_BZ2 ++BZ2_REQUIRES = ++else ++BZ2_REQUIRES = libbz2 ++endif ++ + ifdef MOZ_NATIVE_PNG + PNG_CFLAGS = @PNG_CFLAGS@ + PNG_LIBS = @PNG_LIBS@ +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 10) ++++ xulrunner/configure.in (local) +@@ -732,6 +732,8 @@ + MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg' + MOZ_ZLIB_CFLAGS= + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++MOZ_BZ2_CFLAGS= ++MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_CFLAGS= + MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng' + +@@ -1524,6 +1526,7 @@ + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' + MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + OBJ_SUFFIX=obj + RANLIB='echo not_ranlib' + STRIP='echo not_strip' +@@ -1579,6 +1582,7 @@ + RCFLAGS='-O coff --use-temp-file' + MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz' ++ MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2' + MOZ_PNG_LIBS='-L$(DIST)/lib -lpng' + MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)' + MOZ_FIX_LINK_PATHS= +@@ -1618,6 +1622,7 @@ + MOZ_OPTIMIZE_FLAGS='-O1' + MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib' + MOZ_PNG_LIBS='$(DIST)/lib/png.lib' + MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' + MOZ_FIX_LINK_PATHS= +@@ -1923,6 +1928,7 @@ + LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib' + MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' + MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)' ++ MOZ_BZ2_LIBS='$(DIST)/lib/bz2.$(LIB_SUFFIX)' + MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)' + MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)' + MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)' +@@ -3569,6 +3575,35 @@ + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi + ++dnl system BZIP2 Support ++dnl ======================================================== ++MOZ_ARG_WITH_STRING(system-bz2, ++[ --with-system-bz2[=PFX] ++ Use system libbz2 [installed at prefix PFX]], ++ BZ2_DIR=$withval) ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LDFLAGS=$LDFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then ++ CFLAGS="-I${BZ2_DIR}/include $CFLAGS" ++ LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS" ++fi ++if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then ++ SYSTEM_BZ2= ++else ++ AC_CHECK_LIB(bz2, BZ2_bzread, [SYSTEM_BZ2=1 MOZ_BZ2_LIBS="-lbz2"], ++ [SYSTEM_BZ2= MOZ_BZ2_CFLAGS= MOZ_BZ2_LIBS=], $MOZ_BZ2_LIBS) ++fi ++CFLAGS=$_SAVE_CFLAGS ++LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS ++ ++if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then ++ MOZ_BZ2_CFLAGS="-I${BZ2_DIR}/include" ++ MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}" ++fi ++ + dnl system PNG Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-png, +@@ -6679,6 +6714,7 @@ + AC_SUBST(SYSTEM_JPEG) + AC_SUBST(SYSTEM_PNG) + AC_SUBST(SYSTEM_ZLIB) ++AC_SUBST(SYSTEM_BZ2) + + AC_SUBST(JPEG_CFLAGS) + AC_SUBST(JPEG_LIBS) +@@ -6691,6 +6727,8 @@ + AC_SUBST(MOZ_JPEG_LIBS) + AC_SUBST(MOZ_ZLIB_CFLAGS) + AC_SUBST(MOZ_ZLIB_LIBS) ++AC_SUBST(MOZ_BZ2_CFLAGS) ++AC_SUBST(MOZ_BZ2_LIBS) + AC_SUBST(MOZ_PNG_CFLAGS) + AC_SUBST(MOZ_PNG_LIBS) + +=== toolkit/mozapps/update/src/updater/Makefile.in +================================================================== +--- xulrunner/toolkit/mozapps/update/src/updater/Makefile.in (revision 10) ++++ xulrunner/toolkit/mozapps/update/src/updater/Makefile.in (local) +@@ -52,11 +52,11 @@ + + PROGRAM = updater$(BIN_SUFFIX) + +-REQUIRES = libmar libbz2 ++REQUIRES = libmar \ ++ $(BZ2_REQUIRES) + + LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ + $(NULL) + + ifeq ($(OS_ARCH),WINNT) +@@ -118,3 +118,6 @@ + # Pick up nsWindowsRestart.cpp + LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + endif ++ ++CXXFLAGS += $(MOZ_BZ2_CFLAGS) ++EXTRA_LIBS += $(MOZ_BZ2_LIBS) +=== toolkit/mozapps/update/src/updater/updater.cpp +================================================================== +--- xulrunner/toolkit/mozapps/update/src/updater/updater.cpp (revision 10) ++++ xulrunner/toolkit/mozapps/update/src/updater/updater.cpp (local) +@@ -52,6 +52,7 @@ + #include "archivereader.h" + #include "errors.h" + #include "bzlib.h" ++#include "nscore.h" + + #include + #include +@@ -121,7 +122,7 @@ + + // This variable lives in libbz2. It's declared in bzlib_private.h, so we just + // declare it here to avoid including that entire header file. +-extern "C" unsigned int BZ2_crc32Table[256]; ++extern "C" NS_IMPORT_(unsigned int) BZ2_crc32Table[256]; + + static unsigned int + crc32(const unsigned char *buf, unsigned int len) +=== config/Makefile.in +================================================================== +--- xulrunner/config/Makefile.in (revision 245) ++++ xulrunner/config/Makefile.in (local) +@@ -137,6 +137,7 @@ + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ + -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \ ++ -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ + -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ + -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ + $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers +=== config/system-headers +================================================================== +--- xulrunner/config/system-headers (revision 245) ++++ xulrunner/config/system-headers (local) +@@ -931,3 +931,6 @@ + #if MOZ_NATIVE_ZLIB==1 + zlib.h + #endif ++#if MOZ_NATIVE_BZ2==1 ++bzlib.h ++#endif --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_libxpcom_hack.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_libxpcom_hack.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_libxpcom_hack.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force libxpcom to be linked to xulrunner-bin, xpcshell and libgtkmozembed +## DP: so that it is loaded in most of the cases. + +@DPATCH@ + +=== embedding/browser/gtk/src/Makefile.in +================================================================== +--- xulrunner/embedding/browser/gtk/src/Makefile.in (revision 118) ++++ xulrunner/embedding/browser/gtk/src/Makefile.in (local) +@@ -120,7 +120,9 @@ + + ifdef MOZ_ENABLE_GTK2 + EXTRA_DSO_LDOPTS = \ ++ -Wl,--no-as-needed \ + $(MOZ_COMPONENT_LIBS) \ ++ -Wl,--as-needed \ + $(NULL) + endif + +=== js/src/xpconnect/shell/Makefile.in +================================================================== +--- xulrunner/js/src/xpconnect/shell/Makefile.in (revision 118) ++++ xulrunner/js/src/xpconnect/shell/Makefile.in (local) +@@ -57,7 +57,9 @@ + + LIBS = \ + $(MOZ_JS_LIBS) \ ++ -Wl,--no-as-needed \ + $(XPCOM_LIBS) \ ++ -Wl,--as-needed \ + $(NSPR_LIBS) \ + $(NULL) + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 118) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -104,7 +104,9 @@ + $(STATIC_COMPONENTS_LINKER_PATH) \ + $(EXTRA_DSO_LIBS) \ + $(MOZ_JS_LIBS) \ ++ -Wl,--no-as-needed \ + $(XPCOM_LIBS) \ ++ -Wl,--as-needed \ + $(NSPR_LIBS) \ + $(TK_LIBS) \ + $(NULL) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/15_pyxpcom_deadcode.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/15_pyxpcom_deadcode.dpatch @@ -0,0 +1,131 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_pyxpcom_deadcode.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove pyxpcom dead code and fix FTBFS on alpha this way. Closes: +## DP: #381662. bz#347865 + +@DPATCH@ + +=== extensions/python/xpcom/src/PyGBase.cpp +================================================================== +--- xulrunner/extensions/python/xpcom/src/PyGBase.cpp (revision 107) ++++ xulrunner/extensions/python/xpcom/src/PyGBase.cpp (local) +@@ -595,101 +595,6 @@ + return nr == NS_OK ? NS_OK : HandleNativeGatewayError(szMethodName); + } + +-nsresult PyG_Base::InvokeNativeGetViaPolicy( +- const char *szPropertyName, +- PyObject **ppResult /* = NULL */ +- ) +-{ +- PyObject *ob_ret = NULL; +- nsresult ret = NS_OK; +- PyObject *real_ob = NULL; +- if ( m_pPyObject == NULL || szPropertyName == NULL ) +- return NS_ERROR_NULL_POINTER; +- // First see if we have a method of that name. +- char buf[256]; +- strcpy(buf, "get_"); +- strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1); +- buf[sizeof(buf)/sizeof(buf[0])-1] = '\0'; +- ret = InvokeNativeViaPolicyInternal(buf, ppResult, nsnull, nsnull); +- if (ret == NS_PYXPCOM_NO_SUCH_METHOD) { +- // No method of that name - just try a property. +- // Bit to a hack here to maintain the use of a policy. +- // We actually get the policies underlying object +- // to make the call on. +- real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_"); +- if (real_ob == NULL) { +- PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute."); +- ret = HandleNativeGatewayError(szPropertyName); +- goto done; +- } +- ob_ret = PyObject_GetAttrString(real_ob, (char *)szPropertyName); +- if (ob_ret==NULL) { +- PyErr_Format(PyExc_AttributeError, +- "The object does not have a 'get_%s' function, or a '%s attribute.", +- szPropertyName, szPropertyName); +- } else { +- ret = NS_OK; +- if (ppResult) +- *ppResult = ob_ret; +- else +- Py_XDECREF(ob_ret); +- } +- } +- if (ret != NS_OK) +- ret = HandleNativeGatewayError(szPropertyName); +- +-done: +- Py_XDECREF(real_ob); +- return ret; +-} +- +-nsresult PyG_Base::InvokeNativeSetViaPolicy( +- const char *szPropertyName, +- ... +- ) +-{ +- if ( m_pPyObject == NULL || szPropertyName == NULL ) +- return NS_ERROR_NULL_POINTER; +- nsresult ret = NS_OK; +- PyObject *real_ob = NULL; +- char buf[256]; +- strcpy(buf, "set_"); +- strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1); +- buf[sizeof(buf)/sizeof(buf[0])-1] = '\0'; +- va_list va; +- va_start(va, szPropertyName); +- ret = InvokeNativeViaPolicyInternal(buf, NULL, "O", va); +- va_end(va); +- if (ret == NS_PYXPCOM_NO_SUCH_METHOD) { +- // No method of that name - just try a property. +- // Bit to a hack here to maintain the use of a policy. +- // We actually get the policies underlying object +- // to make the call on. +- real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_"); +- if (real_ob == NULL) { +- PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute."); +- ret = HandleNativeGatewayError(szPropertyName); +- goto done; +- } +- va_list va2; +- va_start(va2, szPropertyName); +- PyObject *arg = va_arg( va2, PyObject *); +- va_end(va2); +- if (PyObject_SetAttrString(real_ob, (char *)szPropertyName, arg) == 0) +- ret = NS_OK; +- else { +- PyErr_Format(PyExc_AttributeError, +- "The object does not have a 'set_%s' function, or a '%s attribute.", +- szPropertyName, szPropertyName); +- } +- } +- if (ret != NS_OK) +- ret = HandleNativeGatewayError(szPropertyName); +-done: +- Py_XDECREF(real_ob); +- return ret; +-} +- + // Get at the underlying Python object. + PyObject *PyG_Base::UnwrapPythonObject(void) + { +=== extensions/python/xpcom/src/PyXPCOM.h +================================================================== +--- xulrunner/extensions/python/xpcom/src/PyXPCOM.h (revision 107) ++++ xulrunner/extensions/python/xpcom/src/PyXPCOM.h (local) +@@ -416,11 +416,6 @@ + PyObject **ppResult, + const char *szFormat, + va_list va); +- nsresult InvokeNativeGetViaPolicy(const char *szPropertyName, +- PyObject **ppResult = NULL +- ); +- nsresult InvokeNativeSetViaPolicy(const char *szPropertyName, +- ...); + }; + + class PYXPCOM_EXPORT PyXPCOM_XPTStub : public PyG_Base, public nsXPTCStubBase --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/10_no_chromelist.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/10_no_chromelist.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_no_chromelist.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't build chromelist.txt files. bz#331781 +## DP: Also correctly call make-jars.pl. bz#333543 + +@DPATCH@ + +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 69) ++++ xulrunner/config/rules.mk (local) +@@ -1561,8 +1561,6 @@ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \ + -d $(MAKE_JARS_TARGET)/chrome -j $(FINAL_TARGET)/chrome \ + $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \ +- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \ +- $(FINAL_TARGET)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \ + fi + endif + +@@ -1575,10 +1573,8 @@ + $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \ + $(JAR_MANIFEST) | \ + $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \ +- -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \ ++ -d $(MAKE_JARS_TARGET)/chrome -j $(DESTDIR)$(mozappdir)/chrome \ + $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \ +- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \ +- $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \ + fi + endif + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/60_xpcomstub.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/60_xpcomstub.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_xpcomstub.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correctly install dependentlibs.list + +@DPATCH@ + +=== xpcom/stub/Makefile.in +================================================================== +--- xulrunner/xpcom/stub/Makefile.in (revision 73) ++++ xulrunner/xpcom/stub/Makefile.in (local) +@@ -118,8 +125,14 @@ + + include $(topsrcdir)/config/rules.mk + +-libs:: $(FINAL_TARGET)/dependentlibs.list ++libs:: dependentlibs.list ++ $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) + +-$(FINAL_TARGET)/dependentlibs.list: Makefile.in ++install:: dependentlibs.list ++ $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) ++ ++dependentlibs.list: Makefile.in + $(EXIT_ON_ERROR) \ + ( $(foreach dlib,$(DEPENDENT_LIBS_LIST),echo $(dlib);) ) > $@ ++ ++GARBAGE += dependentlibs.list --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/10_gdkpango_system_wrapper.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/10_gdkpango_system_wrapper.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_gdkpango_system_wrapper.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Create a system wrapper for gdkpango.h to avoid FTBFS because of +## DP: default visibility. + +@DPATCH@ + +diff --git a/config/system-headers b/config/system-headers +index 1088e4f..10890ec 100644 +--- a/config/system-headers ++++ b/config/system-headers +@@ -210,6 +210,7 @@ gdk/gdk.h + gdk/gdkkeysyms.h + gdk/gdkprivate.h + gdk/gdkregion.h ++gdk/gdkpango.h + gdk/gdkwindow.h + gdk/gdkx.h + gdk-pixbuf/gdk-pixbuf.h --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_ia64_align.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_ia64_align.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_ia64_align.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from David Mosberger-Tang (fixed up by Eric Dorland) to fix +## DP: unaligned access on ia64 (and perhaps other platforms). bz#289394. + +@DPATCH@ + +=== extensions/transformiix/source/base/Double.cpp +================================================================== +--- xulrunner/extensions/transformiix/source/base/Double.cpp (revision 22) ++++ xulrunner/extensions/transformiix/source/base/Double.cpp (local) +@@ -75,14 +75,7 @@ + #define CPU_IS_ARM + #endif + +-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 +-/** +- * This version of the macros is safe for the alias optimizations +- * that gcc does, but uses gcc-specific extensions. +- */ +- + typedef union txdpun { +- PRFloat64 d; + struct { + #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) + PRUint32 lo, hi; +@@ -90,8 +83,14 @@ + PRUint32 hi, lo; + #endif + } s; ++ PRFloat64 d; + } txdpun; + ++#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 ++/** ++ * This version of the macros is safe for the alias optimizations ++ * that gcc does, but uses gcc-specific extensions. ++ */ + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + +@@ -117,20 +116,20 @@ + + //-- Initialize Double related constants + #ifdef IS_BIG_ENDIAN +-const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, +- 0xffffffff}; +-const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; +-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; ++const txdpun nanMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, ++ 0xffffffff}; ++const txdpun infMask = {TX_DOUBLE_HI32_EXPMASK, 0}; ++const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; + #else +-const PRUint32 nanMask[2] = {0xffffffff, +- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; +-const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; +-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; ++const txdpun nanMask = {0xffffffff, ++ TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; ++const txdpun infMask = {0, TX_DOUBLE_HI32_EXPMASK}; ++const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; + #endif + +-const double Double::NaN = *((double*)nanMask); +-const double Double::POSITIVE_INFINITY = *((double*)infMask); +-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); ++const double Double::NaN = nanMask.d; ++const double Double::POSITIVE_INFINITY = infMask.d; ++const double Double::NEGATIVE_INFINITY = negInfMask.d; + + /* + * Determines whether the given double represents positive or negative --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/82_prefs.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/82_prefs.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_prefs.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Set javascript.options.showInConsole. +## DP: Set DPI to system settings. +## DP: Fix font defaults. + +@DPATCH@ + +=== modules/libpref/src/init/all.js +================================================================== +--- xulrunner/modules/libpref/src/init/all.js (revision 67) ++++ xulrunner/modules/libpref/src/init/all.js (local) +@@ -439,6 +439,7 @@ + pref("javascript.enabled", true); + pref("javascript.allow.mailnews", false); + pref("javascript.options.strict", false); ++pref("javascript.options.showInConsole", true); + + // advanced prefs + pref("security.enable_java", true); +@@ -1844,7 +1844,7 @@ + pref("network.hosts.smtp_server", "localhost"); + pref("network.hosts.pop_server", "pop"); + pref("network.protocol-handler.warn-external.file", false); +-pref("layout.css.dpi", -1); // max(96dpi, System setting) ++pref("layout.css.dpi", 0); // System setting + pref("browser.drag_out_of_frame_style", 1); + pref("editor.singleLine.pasteNewlines", 0); + +@@ -1872,33 +1873,33 @@ + + // th + +-pref("font.name.serif.tr", "Times"); +-pref("font.name.sans-serif.tr", "Helvetica"); +-pref("font.name.monospace.tr", "Courier"); ++pref("font.name.serif.tr", "serif"); ++pref("font.name.sans-serif.tr", "sans-serif"); ++pref("font.name.monospace.tr", "monospace"); + + pref("font.name.serif.x-baltic", "serif"); + pref("font.name.sans-serif.x-baltic", "sans-serif"); + pref("font.name.monospace.x-baltic", "monospace"); + +-pref("font.name.serif.x-central-euro", "Times"); +-pref("font.name.sans-serif.x-central-euro", "Helvetica"); +-pref("font.name.monospace.x-central-euro", "Courier"); ++pref("font.name.serif.x-central-euro", "serif"); ++pref("font.name.sans-serif.x-central-euro", "sans-serif"); ++pref("font.name.monospace.x-central-euro", "monospace"); + + pref("font.name.serif.x-cyrillic", "serif"); + pref("font.name.sans-serif.x-cyrillic", "sans-serif"); + pref("font.name.monospace.x-cyrillic", "monospace"); + +-pref("font.name.serif.x-unicode", "Times"); +-pref("font.name.sans-serif.x-unicode", "Helvetica"); +-pref("font.name.monospace.x-unicode", "Courier"); ++pref("font.name.serif.x-unicode", "serif"); ++pref("font.name.sans-serif.x-unicode", "sans-serif"); ++pref("font.name.monospace.x-unicode", "monospace"); + +-pref("font.name.serif.x-user-def", "Times"); +-pref("font.name.sans-serif.x-user-def", "Helvetica"); +-pref("font.name.monospace.x-user-def", "Courier"); ++pref("font.name.serif.x-user-def", "serif"); ++pref("font.name.sans-serif.x-user-def", "sans-serif"); ++pref("font.name.monospace.x-user-def", "monospace"); + +-pref("font.name.serif.x-western", "Times"); +-pref("font.name.sans-serif.x-western", "Helvetica"); +-pref("font.name.monospace.x-western", "Courier"); ++pref("font.name.serif.x-western", "serif"); ++pref("font.name.sans-serif.x-western", "sans-serif"); ++pref("font.name.monospace.x-western", "monospace"); + + pref("font.name.serif.zh-CN", "serif"); + pref("font.name.sans-serif.zh-CN", "sans-serif"); --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_no_register.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_no_register.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_no_register.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove (un|)registering system. + +@DPATCH@ + +=== xulrunner/app/nsXULRunnerApp.cpp +================================================================== +--- xulrunner/xulrunner/app/nsXULRunnerApp.cpp (revision 69) ++++ xulrunner/xulrunner/app/nsXULRunnerApp.cpp (local) +@@ -43,7 +43,6 @@ + + #include "nsXULAppAPI.h" + #include "nsXPCOMGlue.h" +-#include "nsRegisterGRE.h" + #include "nsAppRunner.h" + #include "nsINIParser.h" + #include "nsILocalFile.h" +@@ -264,12 +263,6 @@ + " -h, --help show this message\n" + " -v, --version show version\n" + " --gre-version print the GRE version string on stdout\n" +- " --register-global register this GRE in the machine registry\n" +- " --register-user register this GRE in the user registry\n" +- " --unregister-global unregister this GRE formerly registered with\n" +- " --register-global\n" +- " --unregister-user unregister this GRE formely registered with\n" +- " --register-user\n" + " --find-gre Find a GRE with version and print\n" + " the path on stdout\n" + " --install-app [ []]\n" +@@ -373,40 +366,6 @@ + } + + if (argc > 1) { +- PRBool registerGlobal = IsArg(argv[1], "register-global"); +- PRBool registerUser = IsArg(argv[1], "register-user"); +- if (registerGlobal || registerUser) { +- if (argc != 2) { +- Usage(); +- return 1; +- } +- +- nsCOMPtr regDir; +- nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir)); +- if (NS_FAILED(rv)) +- return 2; +- +- return RegisterXULRunner(registerGlobal, regDir, +- kGREProperties, +- NS_ARRAY_LENGTH(kGREProperties)) ? 0 : 2; +- } +- +- registerGlobal = IsArg(argv[1], "unregister-global"); +- registerUser = IsArg(argv[1], "unregister-user"); +- if (registerGlobal || registerUser) { +- if (argc != 2) { +- Usage(); +- return 1; +- } +- +- nsCOMPtr regDir; +- nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir)); +- if (NS_FAILED(rv)) +- return 2; +- UnregisterXULRunner(registerGlobal, regDir); +- return 0; +- } +- + if (IsArg(argv[1], "find-gre")) { + if (argc != 3) { + Usage(); --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/85_useragent.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/85_useragent.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_useragent.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove useless useragent setter at startup. bz#331783. + +@DPATCH@ + +=== layout/build/Makefile.in +================================================================== +--- xulrunner/layout/build/Makefile.in (revision 42) ++++ xulrunner/layout/build/Makefile.in (local) +@@ -105,7 +105,6 @@ + + CPPSRCS = \ + nsLayoutModule.cpp \ +- nsContentHTTPStartup.cpp \ + nsContentDLF.cpp \ + $(NULL) + +=== layout/build/nsLayoutModule.cpp +================================================================== +--- xulrunner/layout/build/nsLayoutModule.cpp (revision 42) ++++ xulrunner/layout/build/nsLayoutModule.cpp (local) +@@ -43,7 +43,6 @@ + #include "nsCSSProps.h" // to addref/release table + #include "nsColorNames.h" // to addref/release table + #include "nsContentCID.h" +-#include "nsContentHTTPStartup.h" + #include "nsContentDLF.h" + #include "nsContentPolicyUtils.h" + #include "nsContentUtils.h" +@@ -593,7 +592,6 @@ + #ifdef MOZ_SVG + MAKE_CTOR(CreateSVGRect, nsIDOMSVGRect, NS_NewSVGRect) + #endif +-NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentHTTPStartup) + MAKE_CTOR(CreateContentDLF, nsIDocumentLoaderFactory, NS_NewContentDocumentLoaderFactory) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSSOMFactory) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils) +@@ -1258,13 +1256,6 @@ + CreateSVGRect }, + #endif + +- { "Content HTTP Startup Listener", +- NS_CONTENTHTTPSTARTUP_CID, +- NS_CONTENTHTTPSTARTUP_CONTRACTID, +- nsContentHTTPStartupConstructor, +- nsContentHTTPStartup::RegisterHTTPStartup, +- nsContentHTTPStartup::UnregisterHTTPStartup }, +- + { "Document Loader Factory", + NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID, + "@mozilla.org/content/document-loader-factory;1", --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_gnu.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_gnu.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_gnu.dpatch by Samuel Thibault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GNU/Hurd support. bz#408745 + +@DPATCH@ + +--- mozilla/config/rules.mk 2007-12-30 20:47:00.120197000 +0000 ++++ mozilla/config/rules.mk 2007-12-30 20:47:27.127970000 +0000 +@@ -506,6 +506,14 @@ + endif + + # ++# GNU doesn't have path length limitation ++# ++ ++ifeq ($(OS_ARCH),GNU) ++OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 ++endif ++ ++# + # BeOS: add -Bsymbolic flag for components + # + ifeq ($(OS_ARCH),BeOS) --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/10_icons.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/10_icons.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_icons.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Apply patch from bz#314927 to install default.xpm in the right place + +@DPATCH@ + +=== xulrunner/app/Makefile.in +================================================================== +--- xulrunner/xulrunner/app/Makefile.in (revision 72) ++++ xulrunner/xulrunner/app/Makefile.in (local) +@@ -274,7 +274,7 @@ + $(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default + + install:: +- $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons ++ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default + endif + + # XXX applications would need to supply this file --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/60_js_binary.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/60_js_binary.dpatch @@ -0,0 +1,147 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_js_binary.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: - JS binary. bz#331776 +## DP: - Add readline support to xpcshell. +## DP: - Avoid visibility hidden issues with readline symbols. + +@DPATCH@ + +=== config/autoconf.mk.in +================================================================== +--- xulrunner/config/autoconf.mk.in (revision 7) ++++ xulrunner/config/autoconf.mk.in (local) +@@ -73,6 +73,9 @@ + MOZ_X11 = @MOZ_X11@ + + MOZ_JS_LIBS = @MOZ_JS_LIBS@ ++ENABLE_JS_BINARY = @ENABLE_JS_BINARY@ ++HAVE_READLINE = @HAVE_READLINE@ ++READLINE_LIBS = @READLINE_LIBS@ + + MOZ_GFX_TOOLKIT_LDFLAGS = @MOZ_GFX_TOOLKIT_LDFLAGS@ + MOZ_WIDGET_TOOLKIT_LDFLAGS = @MOZ_WIDGET_TOOLKIT_LDFLAGS@ +=== config/rules.mk +================================================================== +--- xulrunner/config/rules.mk (revision 7) ++++ xulrunner/config/rules.mk (local) +@@ -898,7 +898,7 @@ + ifeq ($(CPP_PROG_LINK),1) + $(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) + else +- $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) ++ $(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) $(PROG_LIBS) + endif # CPP_PROG_LINK + endif # WINNT && !GNU_CC + endif # OS/2 VACPP +=== configure.in +================================================================== +--- xulrunner/configure.in (revision 7) ++++ xulrunner/configure.in (local) +@@ -5116,6 +5116,40 @@ + AC_SUBST(JS_ULTRASPARC_OPTS) + + dnl ======================================================== ++dnl = Enable building of the js standalone binary ++dnl ======================================================== ++MOZ_ARG_ENABLE_BOOL(js-binary, ++[ --enable-js-binary Build the standalone JS program], ++ ENABLE_JS_BINARY=1, ++ ENABLE_JS_BINARY= ) ++AC_SUBST(ENABLE_JS_BINARY) ++ ++if test -n "$ENABLE_JS_BINARY"; then ++ dnl readline Support ++ dnl ======================================================== ++ READLINE_DIR=no ++ MOZ_ARG_WITH_STRING(readline, ++ [ --with-readline[=PFX] ++ Use libreadline [installed at prefix PFX]], ++ READLINE_DIR=$withval) ++ ++ if test -n "${READLINE_DIR}" -a "${READLINE_DIR}" != "no"; then ++ _SAVE_LDFLAGS=$LDFLAGS ++ LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS" ++ AC_CHECK_LIB(readline, readline, [HAVE_READLINE=1 READLINE_LIBS="-lreadline"], ++ [HAVE_READLINE= READLINE_LIBS=]) ++ LDFLAGS=$_SAVE_LDFLAGS ++ fi ++ ++ if test "${READLINE_DIR}" -a -d "${READLINE_DIR}" -a "$HAVE_READLINE" = 1; then ++ READLINE_LIBS="-L${READLINE_DIR}/lib ${READLINE_LIBS}" ++ fi ++fi ++ ++AC_SUBST(HAVE_READLINE) ++AC_SUBST(READLINE_LIBS) ++ ++dnl ======================================================== + dnl = + dnl = Feature options that require extra sources to be pulled + dnl = +=== js/src/Makefile.in +================================================================== +--- xulrunner/js/src/Makefile.in (revision 7) ++++ xulrunner/js/src/Makefile.in (local) +@@ -54,6 +54,16 @@ + RESFILE = js$(MOZ_BITS)40.res + endif + ++ifdef ENABLE_JS_BINARY ++SIMPLE_PROGRAMS = js ++PROG_LIBS = -L. $(MOZ_JS_LIBS) $(NSPR_LIBS) ++$(SIMPLE_PROGRAMS): $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX) ++ifdef HAVE_READLINE ++PROG_LIBS += $(READLINE_LIBS) ++DEFINES = -DEDITLINE ++endif ++endif ++ + PACKAGE_FILE = js.pkg + + # JavaScript must be built shared, even for static builds, as it is used by +=== js/src/xpconnect/shell/Makefile.in +================================================================== +--- xulrunner/js/src/xpconnect/shell/Makefile.in (revision 69) ++++ xulrunner/js/src/xpconnect/shell/Makefile.in (local) +@@ -74,7 +74,7 @@ + # look at mozilla/js/src/editline, which is license-free (but not part + # of the mozilla build.) + # +-ifdef JS_READLINE ++ifdef HAVE_READLINE + DEFINES += -DEDITLINE +-LIBS += -lreadline $(JS_READLINE_EXTRA_LIBS) ++LIBS += $(READLINE_LIBS) + endif +=== js/src/js.c +================================================================== +--- xulrunner/js/src/js.c ++++ xulrunner/js/src/js.c +@@ -134,8 +134,8 @@ + split_setup(JSContext *cx); + + #ifdef EDITLINE +-extern char *readline(const char *prompt); +-extern void add_history(char *line); ++extern JS_EXPORT_API(char) *readline(const char *prompt); ++extern JS_EXPORT_API(void) add_history(char *line); + #endif + + static JSBool +=== js/src/xpconnect/shell/xpcshell.cpp +================================================================== +--- xulrunner/js/src/xpconnect/shell/xpcshell.cpp ++++ xulrunner/js/src/xpconnect/shell/xpcshell.cpp +@@ -515,8 +515,8 @@ + + #ifdef EDITLINE + extern "C" { +-extern char *readline(const char *prompt); +-extern void add_history(char *line); ++extern JS_EXPORT_API(char) *readline(const char *prompt); ++extern JS_EXPORT_API(void) add_history(char *line); + } + #endif + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_xulrunner-config.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_xulrunner-config.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_xulrunner-config.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Give more appropriate cflags and libs + +@DPATCH@ + +--- xulrunner/build/unix/mozilla-config.in ++++ xulrunner/build/unix/mozilla-config.in +@@ -22,7 +22,6 @@ + xpcom + nspr + js +- jsj + gfx + EOF + exit $1 +@@ -60,9 +59,6 @@ + exit 0 + ;; + --cflags) +- if test "%includedir%" != /usr/include ; then +- includes="-I%includedir%" +- fi + echo_cflags=yes + ;; + --defines) +@@ -74,7 +70,7 @@ + --idlflags) + echo_idlflags=yes + ;; +- xpcom|js|nspr|gfx|jsj) ++ xpcom|js|nspr|gfx) + echo_components="$echo_components $1" + echo_libraries="$echo_libraries $1" + ;; +@@ -105,7 +101,17 @@ + if test "$echo_cflags" = "yes"; then + nspr_cflags="%FULL_NSPR_CFLAGS%" + for n in $echo_components; do +- component_includes="$component_includes -I%includedir%/$n" ++ case "$n" in ++ js) ++ component_includes="$component_includes -I/usr/include/mozjs" ++ ;; ++ nspr) ++ ;; ++ *) ++ component_includes="$component_includes -I%includedir% \ ++ -I%includedir%/$n" ++ ;; ++ esac + done + echo $component_includes $includes $nspr_cflags + fi +@@ -133,10 +139,7 @@ + js) + libs="$libs $_js_libs" + ;; +- jsj) +- libs="$libs -ljsj $_js_libs $_xpcom_libs" +- ;; + esac + done +- echo -L%libdir% $libs ++ echo $libs + fi --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_javaxpcom.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_javaxpcom.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_javaxpcom.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force creation of Makefiles in extensions/java, even when javaxpcom is +## DP: disabled. Don't build the jars if DEB_NO_JAR is defined. + +@DPATCH@ + +=== allmakefiles.sh +================================================================== +--- xulrunner/allmakefiles.sh (revision 134) ++++ xulrunner/allmakefiles.sh (local) +@@ -1353,7 +1353,7 @@ + " + fi + +-if [ "$MOZ_JAVAXPCOM" ]; then ++if [ "1" ]; then + MAKEFILES_javaxpcom=" + extensions/java/Makefile + extensions/java/xpcom/Makefile +=== extensions/java/xpcom/interfaces/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/interfaces/Makefile.in (revision 209) ++++ xulrunner/extensions/java/xpcom/interfaces/Makefile.in (local) +@@ -59,7 +59,9 @@ + $(NULL) + + # install jars into SDK ++ifndef DEB_NO_JAR + SDK_LIBRARY = $(JARFILE) $(JARFILE_SRC) ++endif + + GARBAGE += $(JARFILE) $(JARFILE_SRC) java.files + GARBAGE_DIRS += org +=== extensions/java/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/java/xpcom/Makefile.in (revision 220) ++++ xulrunner/extensions/java/xpcom/Makefile.in (local) +@@ -45,9 +45,11 @@ + + include $(topsrcdir)/config/rules.mk + ++ifndef DEB_NO_JAR + # Build the implementation Java classes + libs:: + make -C src jar-libs + + install:: + make -C src jar-install ++endif --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_arm_xpcom_optim.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_arm_xpcom_optim.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_arm_xpcom_optim.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from Antti P Miettinen to fix small optimization problem with +## DP: newer gcc's on arm. bz#322806 + +@DPATCH@ + +=== xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +================================================================== +--- xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp (revision 22) ++++ xulrunner/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp (local) +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/80_no_examples.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/80_no_examples.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_no_examples.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't build examples + +@DPATCH@ + +=== xulrunner/Makefile.in +================================================================== +--- xulrunner/xulrunner/Makefile.in (revision 62) ++++ xulrunner/xulrunner/Makefile.in (local) +@@ -48,7 +48,6 @@ + stub \ + util \ + app \ +- examples \ + $(NULL) + + ifeq ($(OS_ARCH),WINNT) +=== extensions/python/xpcom/Makefile.in +================================================================== +--- xulrunner/extensions/python/xpcom/Makefile.in (revision 85) ++++ xulrunner/extensions/python/xpcom/Makefile.in (local) +@@ -40,7 +40,6 @@ + + DIRS = \ + src \ +- test/test_component \ + $(NULL) + + topsrcdir = @top_srcdir@ --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/35_python_2.5.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/35_python_2.5.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 35_python_2.5.dpatch by Mike Hommey +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS with python 2.5. bz#386610 +## DP: Adapted from Alexander Sack's patch. + +@DPATCH@ + +diff --git a/extensions/python/xpcom/src/PyGInputStream.cpp b/extensions/python/xpcom/src/PyGInputStream.cpp +index 822dc58..078e2f6 100644 +--- a/extensions/python/xpcom/src/PyGInputStream.cpp ++++ b/extensions/python/xpcom/src/PyGInputStream.cpp +@@ -103,18 +103,23 @@ PyG_nsIInputStream::Read(char * buf, PRUint32 count, PRUint32 *_retval) + const char *methodName = "read"; + nsresult nr = InvokeNativeViaPolicy(methodName, &ret, "i", count); + if (NS_SUCCEEDED(nr)) { +- PRUint32 py_size; ++ Py_ssize_t py_size; + const void *py_buf; +- if (PyObject_AsReadBuffer(ret, &py_buf, (int *)&py_size)!=0) { ++ if (PyObject_AsReadBuffer(ret, &py_buf, &py_size)!=0) { + PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", ret->ob_type->tp_name); + nr = HandleNativeGatewayError(methodName); + } else { +- if (py_size > count) { +- PyXPCOM_LogWarning("nsIInputStream::read() was asked for %d bytes, but the string returned is %d bytes - truncating!\n", count, py_size); +- py_size = count; ++ if ( (py_size & 0xFFFFFFFF) != py_size) { ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ nr = HandleNativeGatewayError(methodName); ++ } else { ++ if (py_size > count) { ++ PyXPCOM_LogWarning("nsIInputStream::read() was asked for %d bytes, but the string returned is %d bytes - truncating!\n", count, py_size); ++ py_size = count; ++ } ++ memcpy(buf, py_buf, py_size); ++ *_retval = py_size; + } +- memcpy(buf, py_buf, py_size); +- *_retval = py_size; + } + } + return nr; +diff --git a/extensions/python/xpcom/src/PyIInputStream.cpp b/extensions/python/xpcom/src/PyIInputStream.cpp +index 1b36afa..eb32ffd 100644 +--- a/extensions/python/xpcom/src/PyIInputStream.cpp ++++ b/extensions/python/xpcom/src/PyIInputStream.cpp +@@ -65,12 +65,17 @@ static PyObject *DoPyRead_Buffer(nsIInputStream *pI, PyObject *obBuffer, PRUint3 + { + PRUint32 nread; + void *buf; +- PRUint32 buf_len; +- if (PyObject_AsWriteBuffer(obBuffer, &buf, (int *)&buf_len) != 0) { ++ Py_ssize_t buf_len; ++ if (PyObject_AsWriteBuffer(obBuffer, &buf, &buf_len) != 0) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "The buffer object does not have a write buffer!"); + return NULL; + } ++ if ( (buf_len & 0xFFFFFFFF) != buf_len) { ++ PyErr_Clear(); ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ return NULL; ++ } + if (n==(PRUint32)-1) { + n = buf_len; + } else { +@@ -116,11 +121,15 @@ static PyObject *DoPyRead_Size(nsIInputStream *pI, PRUint32 n) + rc = PyBuffer_New(nread); + if (rc != NULL) { + void *ob_buf; +- PRUint32 buf_len; +- if (PyObject_AsWriteBuffer(rc, &ob_buf, (int *)&buf_len) != 0) { ++ Py_ssize_t buf_len; ++ if (PyObject_AsWriteBuffer(rc, &ob_buf, &buf_len) != 0) { + // should never fail - we just created it! + return NULL; + } ++ if ( (buf_len & 0xFFFFFFFF) != buf_len) { ++ PyErr_SetString(PyExc_RuntimeError, "Python Buffer length overflows 32-bit in PyObject_AsWriteBuffer"); ++ return NULL; ++ } + if (buf_len != nread) { + PyErr_SetString(PyExc_RuntimeError, "New buffer isnt the size we create it!"); + return NULL; +diff --git a/extensions/python/xpcom/src/PyXPCOM_std.h b/extensions/python/xpcom/src/PyXPCOM_std.h +index a244ab9..ef73855 100644 +--- a/extensions/python/xpcom/src/PyXPCOM_std.h ++++ b/extensions/python/xpcom/src/PyXPCOM_std.h +@@ -51,6 +51,12 @@ + + #include + ++// python 2.4 doesn't have Py_ssize_t ++// => fallback to int ++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) ++typedef int Py_ssize_t; ++#endif ++ + #ifdef HAVE_LONG_LONG + // Mozilla also defines this - we undefine it to + // prevent a compiler warning. --- xulrunner-1.8.1.14+nobinonly.orig/debian/patches/38_armel.dpatch +++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_armel.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 38_armel.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Force to not use -fshort-wchar where it fails + +@DPATCH@ + +diff --git a/configure.in b/configure.in +index ef57009..3ee27ca 100644 +--- a/configure.in ++++ b/configure.in +@@ -2572,7 +2572,7 @@ dnl Note that we assume that mac & win32 have short wchar (see nscore.h) + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.install +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.install @@ -0,0 +1,26 @@ +etc/gre.d/xulrunner.conf + +usr/bin/xulrunner usr/lib/xulrunner/ +usr/lib/xulrunner/xpt_dump +usr/lib/xulrunner/run-mozilla.sh +usr/lib/xulrunner/xpt_link +usr/lib/xulrunner/xpidl +usr/lib/xulrunner/regxpcom +usr/lib/xulrunner/xpcshell +usr/lib/xulrunner/mozilla-xremote-client +usr/lib/xulrunner/updater +usr/lib/xulrunner/xpicleanup +usr/lib/xulrunner/xulrunner-bin +usr/lib/xulrunner/xulrunner-stub + +usr/lib/xulrunner/plugins + +usr/lib/xulrunner/icons usr/share/xulrunner +usr/lib/xulrunner/chrome/icons usr/share/xulrunner/chrome + +usr/lib/xulrunner/components/jsconsole-clhandler.js +usr/lib/xulrunner/components/nsCloseAllWindows.js +usr/lib/xulrunner/components/nsExtensionManager.js +usr/lib/xulrunner/components/nsKillAll.js +usr/lib/xulrunner/components/nsUpdateService.js +usr/lib/xulrunner/components/nsXULAppInstall.js --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.conf +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.conf @@ -0,0 +1,6 @@ +# Registration file installed by the xulrunner package. Please do not edit. + +[1.8.0.1] +GRE_PATH=/usr/lib/xulrunner +xulrunner=true +javaxpcom=1 --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozjs0d.install +++ xulrunner-1.8.1.14+nobinonly/debian/libmozjs0d.install @@ -0,0 +1 @@ +usr/lib/libmozjs.so.* usr/lib --- xulrunner-1.8.1.14+nobinonly.orig/debian/spidermonkey-bin.postinst +++ xulrunner-1.8.1.14+nobinonly/debian/spidermonkey-bin.postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +# Rationale: we install the alternative at upgrade time only if we upgrade +# from a version between 1.8 and 1.8.0.1-6 (versions where the alternative +# was not installed, and only if the alternative is not present (it can be +# there because we first upgraded from an older version) +if [ "$1" = "configure" ] || + ( [ "$1" = "upgrade" ] && + dpkg --compare-versions "$2" ge "1.8" && + dpkg --compare-versions "$2" lt "1.8.0.1-6" && + update-alternatives --list js | grep ^/usr/bin/smjs$ > /dev/null + ); then + update-alternatives --install /usr/bin/js js /usr/bin/smjs 200 \ + --slave /usr/share/man/man1/js.1.gz js.1.gz /usr/share/man/man1/smjs.1.gz +fi + +#DEBHELPER# + --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.links +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.links @@ -0,0 +1 @@ +usr/share/xulrunner/icons usr/lib/xulrunner/icons --- xulrunner-1.8.1.14+nobinonly.orig/debian/smjs.1 +++ xulrunner-1.8.1.14+nobinonly/debian/smjs.1 @@ -0,0 +1,16 @@ +.TH SMJS 1 "7 March 2003" +.SH NAME +smjs - javascript shell +.SH SYNOPSIS +\fBsmjs\fP +.SH DESCRIPTION +The "JS shell", a simple interpreter program that uses the JS API and more +than a few internal interfaces (some of these internal interfaces could +be replaced by jsapi.h calls). The js program built from this +source provides a test vehicle for evaluating scripts and calling functions, +trying out new debugger primitives, etc. +.SH AUTHOR +This manpage was originally written by Bastian Kleineidam + for the Debian distribution of Spidermonkey. + +The main author of Spidermonkey is the Mozilla Project. --- xulrunner-1.8.1.14+nobinonly.orig/debian/spidermonkey-bin.prerm +++ xulrunner-1.8.1.14+nobinonly/debian/spidermonkey-bin.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove js /usr/bin/smjs +fi + +#DEBHELPER# --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.prerm +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat \ + /usr/lib/xulrunner/.autoreg +fi + +#DEBHELPER# --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozillainterfaces-java.links +++ xulrunner-1.8.1.14+nobinonly/debian/libmozillainterfaces-java.links @@ -0,0 +1 @@ +usr/share/java/MozillaInterfaces.jar usr/lib/xulrunner/sdk/lib/MozillaInterfaces.jar --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.README.Debian +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.README.Debian @@ -0,0 +1,18 @@ +Xulrunner for Debian +==================== + +Weak SSL +-------- + +From version 1.8.0.1-11 onwards, SSLv2 and SSLv3 40-bit ciphers are disabled +due to their weakness. If your xulrunner or embedding application provides a +way to alert the user about the weakness of the cipher in use, while still +allowing the user to use it, you may re-enable them in your application +preferences. + +The preferences to reenable them are the following: +pref("security.enable_ssl2", true); +pref("security.ssl3.rsa_rc4_40_md5", true); +pref("security.ssl3.rsa_rc2_40_md5", true); + + -- Mike Hommey Sat, 20 May 2006 11:03:22 +0200 --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozjs0d.README.Debian +++ xulrunner-1.8.1.14+nobinonly/debian/libmozjs0d.README.Debian @@ -0,0 +1,16 @@ +libmozjs for Debian +=================== + +While 1.8.1.x ABI is not entirely compatible with version 1.8.0.x, the +SONAME has not been bumped because while appearing in the header files, +ABI incompatible structures are supposed to be opaque and not directly +used. As far as I know, no program linked against libmozjs makes use of +these structure in a way that would break things. + +On the other hand, symbols exported from the 1.8.1.x ABI are verified to +be compatible with the 1.8.0.x ABI. + +I will try to get proper public headers so that only what can be used +appears there. + + -- Mike Hommey Sat, 26 May 2007 19:18:42 +0200 --- xulrunner-1.8.1.14+nobinonly.orig/debian/python-xpcom.prerm +++ xulrunner-1.8.1.14+nobinonly/debian/python-xpcom.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# --- xulrunner-1.8.1.14+nobinonly.orig/debian/watch +++ xulrunner-1.8.1.14+nobinonly/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/(\d\.[\d\.]+)/source/xulrunner-([\d\.]+)-source\.tar\.bz2 --- xulrunner-1.8.1.14+nobinonly.orig/debian/changelog +++ xulrunner-1.8.1.14+nobinonly/debian/changelog @@ -0,0 +1,1456 @@ +xulrunner (1.8.1.14+nobinonly-1ubuntu1) hardy; urgency=low + + * New security upstream release: 1.8.1.14 (LP: #218534) + Fixes USN-602-1 / mfsa-2008-20 / CVE-2008-1380 + * Merge from debian unstable (1.8.1.14-1). Remaining ubuntu changes: + - debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch + - xulrunner alternative in /usr/bin + * Update configure for the visibility patch: + - update debian/patches/99_configure.dpatch + + -- Fabien Tassin Tue, 22 Apr 2008 22:06:28 +0200 + +xulrunner (1.8.1.14-1) unstable; urgency=low + + * New security/stability upstream release (taken from upstream CVS) + * Fixes mfsa-2008-20, also known as CVE-2008-1380. + * debian/patches/38_armel.dpatch: Force to not use -fshort-wchar where it + fails. Closes: #476303. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Thu, 17 Apr 2008 21:08:57 +0200 + +xulrunner (1.8.1.13+nobinonly-0ubuntu1) hardy; urgency=low + + * New security upstream release: 1.8.1.13 (LP: #207171) + * Security fixes: + - MFSA 2008-19 XUL popup spoofing variant (cross-tab popups) + - MFSA 2008-18 Java socket connection to any local port via LiveConnect + - MFSA 2008-17 Privacy issue with SSL Client Authentication + - MFSA 2008-16 HTTP Referrer spoofing with malformed URLs + - MFSA 2008-15 Crashes with evidence of memory corruption + - MFSA 2008-14 JavaScript privilege escalation and arbitrary code execution + * Merge from debian unstable (1.8.1.12-5). Remaining ubuntu changes: + - debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch + - xulrunner alternative in /usr/bin + * Drop patches applied upstream: + - drop debian/patches/10_SECAlgorithmIDTemplate.dpatch + - update debian/patches/00list + * Update diverged patches: + - update debian/patches/99_configure.dpatch + + -- Fabien Tassin Wed, 26 Mar 2008 00:07:56 +0000 + +xulrunner (1.8.1.12-5) unstable; urgency=low + + * debian/patches/65_native_uconv.dpatch: Fixed BOM removal added in release + 1.8.1.12-3. Closes: #465321. + * debian/patches/80_crmf.dpatch: Put the crmf library before the NSS + libraries. Closes: #470442. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Tue, 11 Mar 2008 22:11:36 +0100 + +xulrunner (1.8.1.12-4) unstable; urgency=low + + * debian/patches/10_SECAlgorithmIDTemplate.dpatch: Move + SECAlgorithmIDTemplate around so that the lack of its definition in + secdert.h doesn't break the build. bz#399589. Closes: #470094. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sun, 09 Mar 2008 11:14:17 +0100 + +xulrunner (1.8.1.12-3) unstable; urgency=low + + * debian/patches/99_configure.dpatch: Forgot to update in previous release. + Closes: #408745. + * debian/patches/65_native_uconv.dpatch: Remove BOM from UTF-16 output. + Closes: #456338, #465321, #461450. + * debian/rules: Don't ignore $(MAKE) distclean errors. + * debian/control: + + Bumped Standards-Version to 3.7.3.0. No changes. + + Turned Homepage indications in descriptions into a control field. + + Fixed GNOME and GnomeVFS capitalization/spelling. + + Build depend on binutils >= 2.17 instead of 2.17-1 for mips and mipsel. + * debian/spidermonkey-bin.menu: Moved into the Applications/Programming + section. + + -- Mike Hommey Sat, 08 Mar 2008 20:47:27 +0100 + +xulrunner (1.8.1.12-2) unstable; urgency=low + + * debian/patches/01_gtkmozembed_change_toplevel.dpatch: Removed, as it is + useless (epiphany doesn't support to move tabs between windows), and + can lead to crashes. Closes: #461351. + * debian/patches/38_kbsd.dpatch, debian/patches/38_gnu.dpatch, + debian/patches/80_uname.dpatch: Support GNU/Hurd, and fix FTBFS on + GNU/kFreeBSD. Thanks Samuel Thibault. Closes: #408745, #433126. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sat, 23 Feb 2008 17:05:32 +0100 + +xulrunner (1.8.1.12-1) unstable; urgency=low + + * New security/stability upstream release (taken from upstream CVS) + * Fixes mfsa-2008-01 to mfsa-2008-06 and mfsa-2008-08 to mfsa-2008-11, + also known as CVE-2008-0412, CVE-2008-0413, CVE-2008-0414, CVE-2008-0415, + CVE-2008-0417, CVE-2008-0418, CVE-2008-0419, CVE-2008-0591, + CVE-2008-0592, CVE-2008-0593, CVE-2008-0594. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Sat, 09 Feb 2008 01:21:17 +0100 + +xulrunner (1.8.1.11-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #174219), remaining changes: + - 88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch + - 88_bz399589_fix_missing_symbol_with_new_nss.dpatch + - 88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch + - xulrunner alternative in /usr/bin + - debian/xulrunner.install + - debian/xulrunner.{postinst,prerm} + * Update debian/patches/99_configure.dpatch + + -- Fabien Tassin Wed, 05 Dec 2007 21:35:09 +0100 + +xulrunner (1.8.1.11-1) unstable; urgency=low + + * New security/stability upstream release (taken from upstream CVS) + * Fixes mfsa-2007-37 to mfsa-2007-39, also known as CVE-2007-5947, + CVE-2007-5959, CVE-2007-5960. + * debian/patches/99_configure.dpatch: Updated, and removed nsprpub/configure + changes: we've not been changing nsprpub/configure.in since we use system + nspr. + + -- Mike Hommey Sat, 01 Dec 2007 15:08:29 +0100 + +xulrunner (1.8.1.9-2) unstable; urgency=low + + * debian/patches/30_cairo_xlib.dpatch: Properly get cairo lib dependencies + and don't rely on GTK bringing them, which just don't happen anymore (see + #343711). Patch from bz#344818. Closes: #451464. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Sat, 17 Nov 2007 15:02:22 +0100 + +xulrunner (1.8.1.9-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #163271), remaining changes: + - remaining Ubuntu patches in debian/patches: + - 88_force-no-pragma-visibility-for-gcc-4.2_4.3 + - 88_bz384304_lp117575_linkrecursion_fix_in_startscript + - xulrunner diversion (xulrunner.{postinst,prerm,install}) + - Maintainer set to Ubuntu MOTU Developers + * Drop debian/patches/{68_python25_api_breakage.dpatch, + 88_ubuntu_pyginputstream.dpatch,88_ubuntu_pyiinputstream.dpatch} + merge by Debian into debian/patches/35_python_2.5.dpatch + - update debian/patches/00list + * Drop debian/patches/61_python_py_ssize_t_detect now useless + - update debian/patches/00list + * Fix FTBFS with cairo lib needing Xrender: + - add patch 88_bz344818_missing_library_check + - update debian/patches/00list + * Fix FTBFS with newer nss allowing to build with either old nss 3.11 + or upcoming 3.12. + - add patch 88_bz399589_fix_missing_symbol_with_new_nss + - update debian/patches/00list + * Update debian/patches/99_configure.dpatch + + -- Fabien Tassin Sat, 17 Nov 2007 17:36:34 +0100 + +xulrunner (1.8.1.9-1) unstable; urgency=low + + * New security/stability upstream release (taken from upstream CVS) + + xpidl produces proper java file names. Closes: #435689. + * Fixes mfsa-2007-29 to mfsa-2007-36, also known as CVE-2007-1095, + CVE-2007-2292, CVE-2006-2894, CVE-2007-3511, CVE-2007-4841, + CVE-2007-5334, CVE-2007-5337, CVE-2007-5338, CVE-2007-5339, + CVE-2007-5340. Closes: #447734. + * debian/remove.nonfree: Remove some more object files. + * debian/control: Remove build dependency on ecj-bootstrap, as it doesn't + exist anymore, and is not useful nowadays. Closes: #441511. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/35_python_2.5.dpatch: Fix FTBFS with python 2.5. Thanks + Alexander Sack. Closes: #431483. + * debian/patches/10_gdkpango_system_wrapper.dpatch: Create a system wrapper + for gdkpango.h to avoid FTBFS because of default visibility. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Thu, 01 Nov 2007 12:52:17 +0100 + +xulrunner (1.8.1.6-1) unstable; urgency=low + + * New security/stability upstream release (taken from upstream CVS) + * Fixes mfsa-2007-{26,27}, also known as CVE-2007-3844, CVE-2007-3845. + + -- Mike Hommey Wed, 01 Aug 2007 23:11:08 +0200 + +xulrunner (1.8.1.5-1) unstable; urgency=high + + * New security/stability upstream release (taken from upstream CVS) + * Fixes mfsa-2007-{18-22}, mfsa-2007-{24-25}, also known as + CVE-2007-3089, CVE-2007-3285, CVE-2007-3656, CVE-2007-3734, + CVE-2007-3735, CVE-2007-3736, CVE-2007-3737, CVE-2007-3738. + * debian/remove.nonfree: add more binary files from tarball that don't + have sources (Thanks Alexander Sack). + * debian/patches/35_psm_wakeups.dpatch: Removed, as applied upstream. + * debian/patches/80_system_libs.dpatch: Make sure we won't be bitten by + upstream changing libjpeg, libpng or zlib internal version, which + makes system library not used even though --with-system-* argument + is given to configure. This time, it happened with libpng. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + * debian/rules: Bumped shlibs for libmozjs as this version introduced 2 + new symbols. + * debian/control: Even laxer dependencies. + + -- Mike Hommey Sat, 21 Jul 2007 23:39:50 +0200 + +xulrunner (1.8.1.4-3) unstable; urgency=low + + * debian/patches/60_js_binary.dpatch: Avoid visibility hidden issues with + readline symbols. + * debian/patches/85_xpcomglue.dpatch: Fix so that visibility issues don't + raise with gcc 4.2. + * debian/patches/31_system_bz2.dpatch: Added system wrapper for bzlib.h. + * debian/patches/80_hunspell.dpatch: Added system wrapper for hunspell.hxx. + All these fix FTBFS with gcc 4.2. Closes: #429744. + * debian/control: Fixup some dependencies so that architectures that take + time to build can still install libxul-dev. + + -- Mike Hommey Sun, 01 Jul 2007 14:23:56 +0200 + +xulrunner (1.8.1.4-2ubuntu5) gutsy; urgency=low + + * debian/control: build depend on ecj instead of ecj-bootstrap, that doesn't + exist anymore. + + -- Alexander Sack Fri, 28 Sep 2007 12:38:52 +0200 + +xulrunner (1.8.1.4-2ubuntu4) gutsy; urgency=low + + Prepare xul 1.8 to play nicely with forthcoming xulrunner 1.9 upload: + + * debian/xulrunner.install: install startup script as + /usr/lib/xulrunner/xulrunner instead of /usr/bin/xulrunner + * debian/xulrunner.{postinst,prerm}: introduce xulrunner alternative + to allow multiple xulrunner versions to be installed on the same + system. + * debian/patches/88_bz384304_lp117575_linkrecursion_fix_in_startscript.dpatch: + adapt patch from bugzilla 384304 to allow deep link recursions of xulrunner + start script. + + -- Alexander Sack Thu, 27 Sep 2007 01:30:55 +0200 + +xulrunner (1.8.1.4-2ubuntu3) gutsy; urgency=low + + * debian/patches/88_ubuntu_pyginputstream.dpatch, + debian/patches/88_ubuntu_pyiinputstream.dpatch: drop patches because they + are not applied anyway. + * debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch, + debian/patches/00list: add anti ftbfs-on-gcc-4.2_4.3 patch to force use of + -fvisibility=hidden instead of pragma push (hidden) even if gcc bugs are not + detected. + * debian/patches/99_configure.dpatch: refresh configure accordingly. + + -- Alexander Sack Tue, 21 Aug 2007 18:30:06 +0200 + +xulrunner (1.8.1.4-2ubuntu2) gutsy; urgency=low + + * replacing bogus patches that can cause access to unintialized + memory and that should have never ended up in here: + - Dropped 88_ubuntu_pyginputstream.dpatch + - Dropped 88_ubuntu_pyiinputstream.dpatch + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - Update 99_configure.dpatch because 61_python_py_ssize_t_detect.dpatch + touches configure.in. + New patches that do boundary checks are submitted to bugzilla + bug 386610 and debian bug 431483. + - update 00list accordingly + + Remaining Ubuntu Changes: + - Adding 61_python_py_ssize_t_detect.dpatch + - Adding 68_python25_api_breakage.dpatch + - update 00list accordingly + - Update 99_configure.dpatch like: + 1. dpatch-edit-patch 99_configure.dpatch + 2. autoconf2.13 + 3. exit 0 + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Alexander Sack Wed, 04 Jul 2007 14:13:40 +0200 + +xulrunner (1.8.1.4-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ and __ia64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + - update debian/patches/00list + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michele Angrisano Mon, 11 Jun 2007 18:04:53 +0200 + +xulrunner (1.8.1.4-2) unstable; urgency=low + + * debian/patches/85_URI_fixup.dpatch: Enable keyword lookup by default in + URI fixup. Temporary until Galeon and Kazehakase are fixed. (bugs #428244 + and #428245) + * debian/patches/00list: Updated accordingly. + * debian/patches/80_xulrunner-config.dpatch: Substitutions being done only + once a line, split component_includes fixup. Thanks Alexander Sack. + Closes: #427079. + * debian/libxul0d.postinst, debian/python-xpcom.postinst, + debian/python-xpcom.prerm, debian/xulrunner-gnome-support.postinst, + debian/xulrunner-gnome-support.prerm: Remove compreg.dat and xpti.dat + when installing/removing packages. This avoids problems with compreg.dat + files generated ages ago. Closes: #426569, #427569. + * debian/patches/82_prefs.dpatch: Set layout.css.dpi to 0 instead of -1. + libxul will use system DPI and avoid using huge fonts on systems where + DPI < 96. Closes: #426229 + * debian/control: Improved spidermonkey-bin short description. Thanks CJ + Fearnley. Closes: #426614. + + -- Mike Hommey Sun, 10 Jun 2007 09:46:32 +0200 + +xulrunner (1.8.1.4-1ubuntu2) gutsy; urgency=low + + * Apply the fix for AMD64 also to IA64 + (this should hopefully fix the FTBFS on IA64). + + -- Michael Bienia Wed, 6 Jun 2007 10:07:27 -0500 + +xulrunner (1.8.1.4-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Fixing __x86_64__ FTBFS + - Added 88_ubuntu_pyginputstream.dpatch + - Added 88_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Arthur Loiret Mon, 4 Jun 2007 00:19:28 +0200 + +xulrunner (1.8.1.4-1) unstable; urgency=high + + * New upstream release (taken from upstream CVS) + * Fixes several security issues, including CVE-2007-1116. Closes: #415945. + * Acknowledge Steve Langasek's NMU. + * debian/patches/65_native_uconv.dpatch: Properly handle when UTF16 + character can't be converted to the destination charset, avoiding + an infinite loop. Closes: #424042. + * debian/patches/10_dash_workaround.dpatch, + debian/patches/10_pangoxft.dpatch, + debian/patches/10_system_nss.dpatch, + debian/patches/15_atk_crash.dpatch, + debian/patches/15_gtk_dropdown.dpatch, + debian/patches/15_passwdmgr.dpatch, + debian/patches/20_visibility.dpatch, + debian/patches/82_ssl.dpatch: Removed, as being applied upstream. + * debian/patches/20_about:plugins.dpatch, + debian/patches/25_gnome_helpers_with_params.dpatch, + debian/patches/30_distclean.dpatch, + debian/patches/65_native_uconv.dpatch, + debian/patches/80_javaxpcom.dpatch, + debian/patches/81_sonames.dpatch, + debian/patches/85_sidebar.dpatch: Adapted to upstream changes. + * debian/patches/10_toolkit_library.dpatch: Add Freetype library to the + list of linked libraries. Stolen from bz#340795. + * debian/patches/61_javaxpcom.dpatch: + + Correctly build java files. This part is fixed on upstream trunk. + + Install jar file with appropriate permissions. bz#350886 comment #17. + * debian/libxul-common.install: Add new components, and remove + xmlextras.xpt, which disappeared. + * debian/patches/80_xulrunner-config.dpatch: Patch mozilla-config.in so that + the changes end up in xulrunner-config. + * debian/patches/00list: Updated accordingly. + * debian/xulrunner-config: Removed. + * debian/copyright: Fixed typo. Thanks to Sam Hocevar. + * debian/rules: + + Bumped shlibs for libmozjs0d and libxul0d. + + Removed shlibdeps tweaks. + + Removed dh_makeshlibs call for packages others than libmozjs0d and + libxul0d: there are no such packages anymore. + + Adapted rules to create javaxpcom jar files. + + Revert change from version 1.8.0.11-2 and 1.8.0.10-3 as gcj-4.1 and + pcmanx-gtk2 should be fixed now. + * debian/patches/80_hunspell.dpatch: Replace myspell support with hunspell, + and allow to build with system shared library. Stolen from iceape. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/mozconfig: + + Don't disable xpcom obsolete, it is needed for xpinstall. + + Enable spellchecker and use of the system hunspell library. + Closes: #404726. + * debian/control: + + Build depend on appropriate version of libhunspell. + + Remove libsmjs-dev and libsmjs1 transition packages. + * debian/libxul0d.install, debian/libxul-common.install: Install the + spellchecker components. + * debian/libxul0d.links: Create the /usr/lib/xulrunner/dictionaries link. + * debian/libsmjs-dev.links, debian/libsmjs1.links: Removed. + * debian/patches/65_mozjs_abi.dpatch: Make 1.8.1 ABI compatible with + version 1.8.0. + * debian/libmozjs0d.README.Debian: Added a note about ABI compatibility. + * debian/patches/35_psm_wakeups.dpatch: Avoid some cpu wake ups in PSM. + bz#380558. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sat, 26 May 2007 20:28:00 +0200 + +xulrunner (1.8.0.11-4.1) unstable; urgency=low + + * Non-maintainer upload + * Build with -Wl,--no-relax on alpha, to work around a binutils bug + causing a build failure. + + -- Steve Langasek Sun, 20 May 2007 18:14:00 -0700 + +xulrunner (1.8.0.11-4ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - resolve conflict in debian/control + debian/rules + - looks like candidate for sync + + -- Alexander Sack Fri, 18 May 2007 10:00:00 +0200 + +xulrunner (1.8.0.11-4) unstable; urgency=low + + * debian/rules: Don't make shlibs for components (which happened to make one + for libsystem-pref.so, because of the -). + * debian/mozconfig: Disabled spell checker, it requires too much cherry + picking from 1.8.1 to be any useful for epiphany. + * debian/patches/35_system_myspell.dpatch: Removed. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/control: Removed build dependency on libmyspell-dev. + * debian/libxul0d.install, debian/libxul-common.install: Don't install + spellchecker files. + * debian/libxul0d.links: Don't create the /usr/lib/xulrunner/dictionaries + link. + * debian/rules: + + Fixed the .pc files so that xpcom and js depend on xulrunner-nspr, so + that it can be taken from any existing version of libnspr, even the + one from older xulrunner releases, not only the one from the new + separate package. + + Removed shlib versioning for libxul0d, which was due to spellchecker + being added. + + -- Mike Hommey Mon, 09 Apr 2007 23:55:49 +0200 + +xulrunner (1.8.0.11-3) experimental; urgency=low + + * debian/control: + + Removed libnspr* and libnss* packages. + + Adapted dependencies accordingly. + + Build-Depend on libnspr4-dev. + + Build-Depend on libnss3-dev (>= 3.11.5-2) for nss-config and libcrmf. + + Build-Depend on libmyspell-dev. + + Bumped Standards-Version to 3.7.2.2. No changes. + * debian/libnspr*, debian/libnss*: Removed. + * debian/rules: + + Replaced some = with :=. + + Removed unused AUTOCONF_DIRS variable. + + Removed rules for libnspr and libnss. + + Added links to nspr include and lib files to sdk. + * debian/patches/18_kbsd_nspr.dpatch, debian/patches/60_nspr_m4.dpatch, + debian/patches/25_entropy.dpatch, debian/patches/28_ppc64_build.dpatch: + debian/patches/38_mips64_build.dpatch, + debian/patches/80_security_build.dpatch, + debian/patches/80_security_tools.dpatch, + debian/patches/38_unsupported_arch_build.dpatch: Removed. + * debian/patches/10_system_nss.dpatch: Build with system nss. bz#255408. + * debian/patches/35_system_myspell.dpatch: Build with system myspell. + Stolen from iceape. + * debian/patches/00list: Updated accordingly. + * debian/mozconfig: + + Use --with-system-nspr and the newly added --with-system-nss. + + Enable spellchecker. + * debian/patches/80_config.dpatch: Don't put the config.{guess|sub} + workaround in the nsprpub directory. + * debian/patches/38_kbsd.dpatch: Removed parts that apply to the nss + directories. + * debian/patches/81_sonames.dpatch: Removed parts that apply to both + nspr and nss directories. + * debian/patches/99_configure.dpatch: Removed part for the nspr configure + script and updated with autoconf. + * debian/rules: Set shlibs for libxul0d to versions higher than + 1.8.0.11-3. + * debian/libxul0d.install: Install the spellchecker component. + * debian/libxul0d.links: Create the /usr/lib/xulrunner/dictionaries link. + + -- Mike Hommey Wed, 28 Mar 2007 21:24:21 +0200 + +xulrunner (1.8.0.11-2) unstable; urgency=low + + * debian/rules: Use real upstream version instead for xulrunner-plugin.pc + dependency on xulrunner-xpcom.pc. Closes: #416425. + + -- Mike Hommey Wed, 28 Mar 2007 08:05:04 +0200 + +xulrunner (1.8.0.11-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2007-11. + * debian/python-xpcom.postinst, debian/python-xpcom.prerm: Added missing + component registration/unregistration. + * debian/patches/25_gnome_helpers_with_params.dpatch: Make MIME registry + use system mime.types when it doesn't get extensions from the Gnome + registry. Closes: #414008. + * debian/rules: Add the debugging symbols from python-xpcom to the + libxul0d-dbg package. + * debian/control: + + Make python-xpcom conflict with epiphany-browser until epiphany + fixes its problems with python thread state. Closes: #416031. + + Add the fact that python-xpcom debugging symbols are in the + libxul0d-dbg package. + + -- Mike Hommey Sat, 24 Mar 2007 18:04:03 +0100 + +xulrunner (1.8.0.10-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + + debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michael Bienia Sat, 10 Mar 2007 18:44:59 +0100 + +xulrunner (1.8.0.10-3) unstable; urgency=low + + * debian/rules: Re-add xulrunner-xpcom requirement in xulrunner-plugin.pc, + until classpath, gcj-4.1 and pcmanx-gtk2 get fixed. Closes: #413964. + + -- Mike Hommey Fri, 9 Mar 2007 08:14:35 +0100 + +xulrunner (1.8.0.10-2) unstable; urgency=low + + * debian/copyright: Added licensing terms for the content in the debian + directory. + * debian/patches/15_passwdmgr.dpatch: Restore parts that were actually + NOT applied upstream, and adapt them. Thanks Sam Hocevar for spotting + this. Closes: #413991. + + -- Mike Hommey Thu, 8 Mar 2007 19:08:10 +0100 + +xulrunner (1.8.0.10-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + + Fixing __x86_64__ FTBFS + - Added 100_ubuntu_pyginputstream.dpatch + - Added 100_ubuntu_pyiinputstream.dpatch + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * UVF exception: LP: #89561 + + -- Michael Bienia Mon, 5 Mar 2007 12:34:50 +0100 + +xulrunner (1.8.0.10-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2007-{01-07}, also known as + CVE-2006-6077, CVE-2007-0008, CVE-2007-0009, CVE-2007-0045, + CVE-2007-0775, CVE-2007-0776, CVE-2007-0777, CVE-2007-0778, + CVE-2007-0779, CVE-2007-0780, CVE-2007-0800, CVE-2007-0981, + CVE-2007-0995. + * debian/patches/35_pango_null_char.dpatch: Avoid freeze/crash when null + characters are present in justified text by discarding NULL characters + before displaying. bz#366902. Closes: #406713. + * debian/patches/20_pangoxft.dpatch: Renamed to 10_pangoxft.dpatch and + updated with patch from bz#338446 (Stolen from iceape, actually) + Also added MOZ_PANGO_LIBS to build command line for the toolkit library. + * debian/patches/15_atk_crash.dpatch: Fix random crashed in GetMaiAtkType. + bz#302250. (Stolen from iceape, too) + * debian/control: Tighten dependency of libxul0d on libxul-common. + * debian/patches/15_pango_textarea_position.dpatch: Fix for cursor position + when moving in a textarea. bz#366796. Closes: #408914. + * debian/patches/35_zip_cache.dpatch: Invalidate cache for a zip file that + got modified. It will prevent corruption of the XUL FastLoad cache when + upgrade is performed while an instance of the application is running. + bz#368428. + * debian/patches/80_config.dpatch: Use config.guess and config.sub from + autotools-dev. + * debian/rules: Don't install config.{guess,sub}, since that was done as a + dpatch. + * debian/patches/15_nspr_setuid.dpatch, + debian/patches/25_passwdmgr_crash.dpatch, + debian/patches/20_broken_perl.dpatch: Removed, as being applied upstream. + * debian/patches/15_passwdmgr.dpatch, + debian/patches/30_distclean.dpatch: Removed parts that were applied + upstream. + * debian/patches/18_kbsd_nspr.dpatch, debian/patches/25_entropy.dpatch: + debian/patches/38_kbsd.dpatch, debian/patches/80_security_tools.dpatch: + debian/patches/80_security_build.dpatch, + debian/patches/60_xpcomstub.dpatch, debian/patches/61_javaxpcom.dpatch, + debian/patches/81_sonames.dpatch, debian/patches/85_installer.dpatch + debian/patches/15_passwdmgr.dpatch : Adapted to upstream changes. + * debian/patches/80_zip.dpatch: Removed part that is not needed anymore due + to changes upstream. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/control: Make libxul-dev and libmozjs-dev conflict with old + versions of mozilla-browser, not the current transition packages for + iceape-browser that don't contain conflicting files anymore. + Closes: #407966. + * debian/libnss3-0d.install: Install libfreebl files. + * debian/rules: + - Run shlibsign on libfreebl files. + - Bump shlibs for libnss3-0d and libnspr4-0d, as they introduced new + symbols. + * debian/patches/15_gtk_dropdown.dpatch: Fix for focus problem with drop + down lists. bz#281551. Closes: #409889. + * debian/patches/00list: Updated accordingly. + * debian/patches/80_security_build.dpatch: Also added a dirty hack to load + libfreebl from /usr/lib/xulrunner. + * debian/patches/80_security_tools.dpatch: Also disable rpath. + + -- Mike Hommey Thu, 1 Mar 2007 19:01:34 +0100 + +xulrunner (1.8.0.9-1ubuntu1) feisty; urgency=low + + * Fixing __x86_64__ FTBFS + + Added 100_ubuntu_pyginputstream.dpatch + + Added 100_ubuntu_pyiinputstream.dpatch + + -- Stephan Hermann Fri, 19 Jan 2007 17:50:12 +0100 + +xulrunner (1.8.0.9-1) unstable; urgency=low + + * New upstream release (taken from upstream CVS) + * Fixes mfsa-2006-{68-73} also known as + CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, CVE-2006-6500, + CVE-2006-6501, CVE-2006-6502, CVE-2006-6503, CVE-2006-6504. + * Removed non-free and sourceless binaries from source package + with the script from the gnuzilla project, with 2 additional removals of + IETF files. Closes: #393422. + You can find this modified script for reference in debian/remove.nonfree. + Note this script also removes useless CVS files. + * debian/patches/80_uname.dpatch: Fix OS_TARGET so that it is correctly set + to Linux for things that expect this value instead of linux-gnu (such as + the extensions manager) + * debian/libxul0d.links: Added a link for libgtkembedmoz in + /usr/lib/xulrunner. Closes: #393440. + * debian/patches/15_passwdmgr.dpatch: Adapted to changes in upstream. Thanks + to Andreas Metzler. + * debian/patches/35_crash_focus.dpatch: Removed: applied upstream. + * debian/patches/15_nspr_setuid.dpatch: Patches from bz#351470 and bz#365703 + to fix privilege escalation issues with setuid/setgid program linked + against libnspr and some other boundaries issue. Closes: #405062. + * debian/patches/18_m68k_xpcom.dpatch: Apply changes provided by Roman + Zippel to fix FTBFS of third party software on m68k. Closes: #402011. + Renamed as 68_m68k_xpcom.dpatch, since it needs to be sent upstream. + * debian/libnss3-dev.links: Add nss.pc symlink to xulrunner-nss.pc. + Closes: #402846. + * debian/patches/38_kbsd.dpatch, debian/patches/38_mips64_build.dpatch, + debian/patches/80_uname.dpatch, debian/patches/18_kbsd_nspr.dpatch: + Applied patch from Petr Salinger to build on GNU/kFreeBSD. + Closes: #388475. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/patches/81_soname.dpatch: Updated to fit changes to Linux2.6.mk in + 38_kbsd.dpatch. + * debian/patches/65_native_uconv.dpatch: + - Reworked so that UTF-16 is used internally instead of UCS-2, and + improved to better handle corner cases. + - Allow claimed iso-8859-1 actually encoded as windows-1252 to be + converted flawlessly. Closes: #368779, #401784, #405681 + + -- Mike Hommey Sat, 6 Jan 2007 17:51:16 +0100 + +xulrunner (1.8.0.8-1) unstable; urgency=high + + * New upstream release (taken from upstream CVS) + * Fixes several security issues, CVE-2006-5464, CVE-2006-5748, + CVE-2006-5462, CVE-2006-5463, CVE-2006-4310 being some of these. + * debian/patches/15_print_fontconfig.dpatch, + debian/patches/15_embed_initial_visibility.dpatch: Removed: + Applied upstream. + * debian/patches/00list: Updated accordingly. + * debian/rules: Changed the way we use uptodate config.guess and config.sub. + If will make the .diff.gz file lighter. + + -- Mike Hommey Sat, 18 Nov 2006 23:04:54 +0100 + +xulrunner (1.8.0.7-2) unstable; urgency=low + + * debian/patches/65_nativeuconv.dpatch: Reimplement most of the native + uconv service so that it works as proper nsUnicode(En|De)coder + implementations and don't break things when a multibyte character is + split between two buffers. Also add a workaround so that backslash is not + turned into Yen in shift-jis, which breaks javascript code using escaping. + The layout code turns it back to Yen anyways. + * debian/control: Changed dependency versions of arch-indep packages on + arch-dependent packages. Closes: #385793. + * debian/patches/15_print_fontconfig.dpatch: Patch from bz#294879 to avoid + crash with fontconfig when printing. Thanks Alexander Sack. + Closes: #390140, #390472, #391119. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Fri, 6 Oct 2006 19:13:56 +0200 + +xulrunner (1.8.0.7-1) unstable; urgency=low + + * New upstream release (taken from the MOZILLA_1_8_0_7_RELEASE tag in + upstream CVS) + + * Fixes the following security vulnerabilities: + CVE-2006-4340, CVE-2006-4253, CVE-2006-4565, CVE-2006-4566, + CVE-2006-4568, CVE-2006-4569, CVE-2006-4571. + + * Removed patches from NMUs by Matthias Klose, because work done on java + build in this release makes them unnecessary. + * debian/patches/15_nodataprotocolcontentpolicy_fix.dpatch, + debian/patches/15_overthespot.dpatch: Removed, since they've been applied + upstream. + * debian/patches/35_embed_initial_visibility.dpatch: Renamed as + debian/patches/15_embed_initial_visibility.dpatch, since it got applied in + an upstream branch. + * debian/patches/80_security_tools.dpatch: Added missing backslash. + Closes: #385847. + * debian/patches/15_jni.dpatch: Patch from bz#333738 to update java stubs. + * debian/patches/80_javaxpcom.dpatch: Force creation of Makefiles in + extensions/java, even when javaxpcom is disabled. Don't build the jars if + DEB_NO_JAR is defined. + * debian/patches/00list: Updated accordingly. + * debian/mozconfig: Disable javaxpcom. + * debian/rules: + + Added rules to build the java class files only for binary + independent build. This way, no more waiting on java on buildds + (especially on arm). + + Build the javaxpcomglue from the bundled jni headers instead of the gcj + headers. + * debian/control: Adapted build dependencies so that the minimum is taken to + build the architecture dependant part, and added adequate + Build-Depends-Indep field. + * debian/patches/80_uname.dpatch: Don't use the ppc_linux stuff for ppc64. + + -- Mike Hommey Thu, 28 Sep 2006 20:20:59 +0200 + +xulrunner (1.8.0.5-4.2) unstable; urgency=low + + * Relax the dependencies even more, so that the -dev packages can be + installed with the arm binaries currently in the archive (1.8.0.4). + + -- Matthias Klose Sun, 3 Sep 2006 13:39:45 +0200 + +xulrunner (1.8.0.5-4.1) unstable; urgency=medium + + * NMU + * Relax dependencies of the -dev packages on the libraries. Closes: #385793. + + -- Matthias Klose Sun, 3 Sep 2006 10:41:10 +0200 + +xulrunner (1.8.0.5-4) unstable; urgency=low + + * debian/patches/*: Moved around after some triage. + Some changed names, some changed only ordering number. + One got split. + One, that was disabled because it has been applied upstream, got removed. + Two, who were depending on each other, being reordered, have been updated. + * debian/patches/30_distclean.dpatch: Added a bit more clean-up, not + necessary for xulrunner, but still better to have around. One of the added + bits will actually be useful for the 1.8.1 branch, when we'll remove + debian/patches/20_visibility.dpatch. + * debian/patches/00list: Added a nomenclature for the patches naming. + + * debian/patches/80_security_tools.dpatch: Enable building of some NSS + tools. + * debian/patches/00list: Updated accordingly. + * debian/control: + + Added a libnss3-tools package to contain these NSS tools. + + Added proper conflicts to libnss3-tools. + * debian/libnss3-tools.install: Install the binary files in the newly + created package. + * debian/rules: Strip files from the libnss3-tools package and put the + debugging symbols into libnss3-dbg. + Closes: #377269. + * debian/control: Use the suggestion from lintian for binNMU safety instead + of our previous own. And really add binNMU safety to libnss3-dev. + + -- Mike Hommey Fri, 1 Sep 2006 07:38:05 +0200 + +xulrunner (1.8.0.5-3) unstable; urgency=low + + * The ${host_cpu} is not uname -m release. + + * debian/patches/90_xpcom_hppa.dpatch: Added support for 'hppa' instead of + 'parisc' and 'parisc64' since we changed from using `uname -m` to using + ${host_cpu}. I'm not putting hppa64 because I don't think the code works + on parisc64. + * debian/patches/01_uname.dpatch: Fixed + xpcom/reflect/xptcall/src/md/unix/Makefile.in so that it recognizes + powerpc instead of ppc, since we now use ${host_cpu}. Thanks a lot to + Michel Dänzer for the big hint. Closes: #383053, #383056, #383313. + + -- Mike Hommey Fri, 25 Aug 2006 20:37:55 +0200 + +xulrunner (1.8.0.5-2) unstable; urgency=low + + * The Fix-ups release. + + * debian/patches/01_libxpcom_hack.dpatch: Force libxpcom to be linked to + xulrunner-bin, xpcshell and libgtkmozembed so that it is loaded in most + of the cases. + * debian/patches/01_passwdmgr_crash.dpatch: Avoid crash of the password + manager when embedding applications don't set a profile directory. Patch + from bz#294075. Closes: #376323. + * debian/patches/01_gnome_helpers_with_params.dpatch: Make helper + applications with parameters work. Adapted patch from bz#273524. + Closes: #381291. + * debian/patches/01_nspr_m4.dpatch: Avoid aclocal warnings about + underquoted definition of AM_PATH_NSPR". Closes: #382539. + * debian/patches/01_gtkmozembed_change_toplevel.dpatch: Fix drop-down menus + when gtkmozembed is moved from different toplevel. Patch from bz#296002. + Closes: #367106. + * debian/patches/01_overthespot.dpatch: Apply patch from bz#271815 for GTK2 + IM Over-The-Spot support. + * debian/patches/00list: Updated accordingly. + * debian/control: + + Make the controls more BinNMU compliant. Closes: #384200, #384203. + + Bumped Standards-Version to 3.7.2.1. No changes. + + -- Mike Hommey Tue, 22 Aug 2006 23:15:16 +0200 + +xulrunner (1.8.0.5-1) unstable; urgency=high + + * The "upstream doesn't, so I do" release: Checked out the + XULRUNNER_1_8_0_5_RELEASE tagged code from upstream CVS. + + * Fixes the following security vulnerabilities: + CVE-2006-3113, CVE-2006-3677, CVE-2006-3801, CVE-2006-3802, + CVE-2006-3803, CVE-2006-3805, CVE-2006-3806, CVE-2006-3807, + CVE-2006-3808, CVE-2006-3809, CVE-2006-3810, CVE-2006-3811, + CVE-2006-3812. + + * debian/patches/01_pyxpcom_deadcode.dpatch: Remove pyxpcom dead code and + fix FTBFS on alpha this way. Closes: #381662. + * debian/patches/01_nodataprotocolcontentpolicy_fix.dpatch: Fix from + Firefox 1.5.0.6 to allow urls like mms:// in s + * debian/patches/01_uname.dpatch: Use ${host_*} variables instead of + uname in configure.in. Closes: #377418. + This is a minimalist patch to solve the particular bad assembler choice + issue. It would need a much greater work to actually do something totally + clean, but the current patch should be enough for Linux builds. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated with autoconf. + * debian/libxul-dev.install: Install files from SDK independently and don't + install the jar files from sdk/lib, since they are in the + libmozillainterfaces-java package. + * debian/control: Fixed typo in libxul-common description. + * debian/rules: Bumped shlibs for libmozjs as this version introduced 2 + new symbols. + + -- Mike Hommey Wed, 9 Aug 2006 21:01:47 +0200 + +xulrunner (1.8.0.4-2) unstable; urgency=low + + * The "finally enabling these stuff" release. + + * debian/watch: Stole the watch file from firefox. + * debian/rules, debian/control, debian/mozconfig, + debian/libmozillainterfaces-java.install, + debian/libmozillainterfaces-java.links, debian/*.conf: Enable pyxpcom + and javaxpcom again, with some changes on the python part, to fit the + new python policy. Closes: #173264, #277120, #373906. + * debian/python-xpcom.dirs, debian/python-xpcom.install: Replace the + previous .in files, and replace PYVERS by a wildcard. + * debian/control: + + Added build dependency on python-support and python-dev. + + Only create a python-xpcom package instead of pythonX.Y-xpcom. + + Added XB-Python-Version field to python-xpcom. + + Bumped debhelper dependency. + * debian/pyversions, debian/pycompat: Files necessary for dh_pysupport and + dh_python. + + * debian/libxul-common.*, debian/libxul0d.*, debian/control: Create a new + libxul-common package for most architecture independent files. + + * debian/control: Add a build dependency on binutils >= 2.17-1 for mips and + mipsel, where #274738 is fixed. + * debian/patches/90_mips_performance.dpatch: Remove the xgot hack. + Closes: #374389. Thanks Thiemo Seufer. + Also remove the specific setting of MOZ_DEBUG_FLAGS="-g" for mips, it's + built with -g anyways. + * debian/rules: + + Bump shlib for libmozjs0d because of a new symbol. Other libraries were + not subject to symbol additions, so we can keep them as they are. + Closes: #376374. + + Removed an extra parenthesis to really build with minimal toc on ppc64. + Dammit. Closes: #361188. + * debian/patches/01_crash_focus: Fix a crasher and several similar potential + crashers. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sat, 8 Jul 2006 14:22:43 +0200 + +xulrunner (1.8.0.4-1) unstable; urgency=high + + * The "finally a new upstream" release. + * Fixes the following security vulnerabilities: + CVE-2006-2775, CVE-2006-2776, CVE-2006-2778, CVE-2006-2780, + CVE-2006-2782, CVE-2006-2783, CVE-2006-2784, CVE-2006-2785, + CVE-2006-2786, CVE-2006-2787. + + * debian/patches/00_securityfix.dpatch: Removed, since this release includes + all the security changes we brought from CVS in this patch. + * debian/patches/90_js_mipsel_endianness.dpatch: Removed, since it was + applied upstream. + * debian/patches/01_installer.dpatch, + debian/patches/01_javaxpcom.dpatch: Removed parts that were applied + * debian/patches/00list: Updated accordingly. + * debian/patches/01_distclean.dpatch, + debian/patches/01_xpcomglue.dpatch: Adapted to upstream changes. + upstream. + * debian/patches/99_configure.dpatch: Updated. + + * debian/patches/01_pyxpcom.dpatch: Use a make variable for PYTHON_SO. + * debian/patches/90_unichar_alignment.dpatch. + * debian/patches/00list: Added 90_unichar_alignment. + * debian/rules: + + Set this PYTHON_SO variable when building python modules. + + Disabled strict aliasing from optimized builds. + + Build with minimal toc on ppc64. Closes: #361188. + + Fix for Gecko date extraction from client.mk. + * debian/mozconfig: Set default mozilla home. + * debian/control: Replaced some Conflicts with Replaces, which should be fine. + + * debian/rules, debian/control, debian/mozconfig, debian/python-xpcom.dirs.in, + debian/python-xpcom.install.in, debian/libmozillainterfaces-java.install, + debian/libmozillainterfaces-java.links, debian/*.conf: Remove pyxpcom and + javaxpcom (again) packages and build. We want this release not to go through + NEW (again). + + -- Mike Hommey Thu, 15 Jun 2006 01:05:34 +0200 + +xulrunner (1.8.0.1-12) unstable; urgency=low + + * The release of the Beast. + * debian/control: + + Added dependency upon libnss3-dev to libxul-dev. + + Fixed dependencies and conflicts so that the package should be binNMU + safe. + + Depends upon dpkg-dev >= 1.13.19 accordingly. + * debian/control, debian/rules: xulrunner must depend on libxul0d + versions >= 1.8.0.1-9. Closes: #370152. + + * Add support for PyXPCOM: + + debian/mozconfig: Added the python/xpcom extension. + + debian/control: Added build dependency on python-dev. Added + python2.3-xpcom and python2.4-xpcom packages. + + debian/python-xpcom.install.in: Install template for python XPCOM files. + + debian/python-xpcom.dirs.in: Directories to create in python XPCOM + packages. + + debian/rules: + - Add rules to build the python xpcom packages. + - Add a shlibs.local hack to have python xpcom packages correctly depend + on libxul0d >= 1.8.0.1-12. + + debian/patches/01_no_examples.dpatch: Don't install the pyxpcom sample + component. + Closes: #173264, #277120. + + * Add support for JavaXPCOM again: + + debian/mozconfig: --enable-javaxpcom. + + debian/*.conf: Set javaxpcom=1. + + debian/control: Added a build dependency on java-gcj-compat-dev + >= 1.0.56 to avoid #365934, and force build dependency on ecj-bootstrap + >= 3.1.2-6 to avoid #361608. + + debian/rules: Uncommented the javaxpcom related rules. Removed the + workarounds for #365934 and #361608. Install all MozillaInterfaces jar + files in the sdk directory. + + debian/libxul0d.install: Uncommented the javaxpcom files. Removed + installation of MozillaInterfaces.jar. + + debian/control: Added a libmozillainterfaces-java package for the public + java interfaces. + + debian/libmozillainterfaces-java.(install|links): Install + MozillaInterfaces.jar in /usr/share/java, and install the -src.jar file + in the sdk directory. + + debian/patches/01_pyxpcom.dpatch: Fix installation directory. + + debian/patches/00list: Updated to include this new patch. + + -- Mike Hommey Tue, 6 Jun 2006 23:26:09 +0200 + +xulrunner (1.8.0.1-11) unstable; urgency=low + + * The "Let's get migrated" release. + * debian/control: Don't build-depend on java-gcj-compat-dev. + * debian/libxul0d.install: Comment out the javaxpcom files installation. + * debian/rules: Comment out javaxpcom related rules, but put the fix for + jni.h detection nevertheless. Closes: #367863. + * debian/*.conf: Set javaxpcom=0. + * debian/mozconfig: --disable-javaxpcom. + + * debian/rules: + + Remove extra parenthesis in the productComment. + + Generate the .chk file from the stripped libsoftokn3.so.0d. + * debian/patches/01_security.dpatch: Build the shlibsign utility again, so + that we can generate the .chk that can be useful for FIPS mode, but don't + build the .chk file automatically since we are going to strip the library, + making the .chk file obsolete. + * debian/patches/01_ssl.dpatch: Disable SSLv2 and SSLv3 40-bit ciphers. + Closes: #308334. + * debian/patches/01_soname.dpatch: Change the way libnss tries to find the + .chk file for FIPS mode so that the .chk file name needn't contain ".so" + when using a full SONAME. + * debian/patches/00list: Apply 01_security after 01_soname ; Added 01_ssl. + * debian/libxul0d.README.Debian: Add a note about SSLv2 and SSLv3 40-bit + ciphers. + + -- Mike Hommey Sat, 20 May 2006 21:23:00 +0200 + +xulrunner (1.8.0.1-10) unstable; urgency=critical + + * The "how dumb can I be ?" release. + * debian/rules: Don't use x86 specific directory to find jni.h. + + -- Mike Hommey Sun, 14 May 2006 01:25:10 +0200 + +xulrunner (1.8.0.1-9) unstable; urgency=critical + + * The "I wish they had a distribution-friendly security policy" release. + * Fixes the following security vulnerabilities: + CVE-2006-0297, CVE-2006-0748, CVE-2006-1530, CVE-2006-1531, + CVE-2006-1723, CVE-2006-1724, CVE-2006-1725, CVE-2006-1726, + CVE-2006-1727, CVE-2006-1728, CVE-2006-1729, CVE-2006-1730, + CVE-2006-1732, CVE-2006-1742. + * Should fix the following security vulnerabilities: + CVE-2006-0884, CVE-2006-1045, CVE-2006-1529, CVE-2005-2353. + * debian/patches/00_securityfix.dpatch: All security patches for the issues + above. I hope none has been forgotten, it has been a real PITA to go + through all the patches in upstream CVS to find those commits that *might* + be related to fixing the flaws. + + * debian/patches/01_native_uconv.dpatch: + + Add the scriptableunicodeconverter component. Will make chatzilla work. + + Fix GBK and EUC-TW charset names so that iconv recognizes them. + Closes: #365886. + * debian/patches/01_killAll.dpatch, debian/xulrunner.install: Correctly + install the killAll component. + * debian/patches/01_js_binary.dpatch: Add readline support to xpcshell. + * debian/patches/01_no_register.dpatch: Remove (un|)registering system. We + don't need it since we register ourselves. + * debian/patches/01_broken_perl.dpatch: Apply patch from bz#325148 instead + of removing the broken perl code. + * debian/patches/01_no_chromelist.dpatch: Also correctly call make-jars.pl + to avoid creation of unexpected chrome in dist/bin instead of + dist/bin/chrome. + * debian/mozconfig: + + Disable elf-dynstr-gc, which is pretty useless nowadays. + + Enable javaxpcom support. + * debian/rules: + + Added a check between dist/bin and $DESTDIR/usr/lib/xulrunner to see if + upstream correctly installs everything... + + Set JAVA_HOME for configure to find the java compiler. + + Work around bug #361806 by setting JAVAC at build time. + + Work around bug #365934 by using --with-java-include-path configure + option, and work around a feature of cpp by creating a symlink to the + real location of jni.h in the debian directory. + + Don't install dependentlibs.list (see debian/patches/01_xpcomstub.dpatch + below). + + Changed the way we move libraries to /usr/lib. + + Changed the User-Agent string again, it seems too many dumb scripts use + the useless date from the product string. + * debian/control: Added java-gcj-compat-dev to build dependencies. + * debian/patches/01_javaxpcom.dpatch: + + Apply patch from bz#327654 to be able to actually build the javaxpcom + stuff. + + Allow to build with gcj headers. + + Don't install GenerateJavaInterfaces. + + Correctly install javaxpcom.jar. + + Don't use visibility flags so that symbols are exported. + * debian/*.conf: Set jaxaxpcom to 1. + * debian/patches/01_icons.dpatch: Apply patch from bz#314927 to install + default.xpm in the right place + * debian/xulrunner.install: Install chrome/icons, where default.xpm is + sitting. + * debian/patches/01_installer.dpatch: Apply patch from bz#328505 to allow + to install without a vendor name. + * debian/patches/01_mouse_buttons.dpatch: Extended mouse buttons support + taken from #244305. Thanks Peter Colberg. + * debian/patches/01_xpcomstub.dpatch: Correctly install dependentlibs.list + and apply patch from bz#332262 for it to contain NSS libraries. + * debian/patches/01_distclean.dpatch: Make distclean cleaner. + * debian/patches/01_target_xpcom_abi.dpatch: Apply patch from bz#322450 plus + the OS_TEST fix that got landed at the same time so that TARGET_XPCOM_ABI + is correctly set on sparc. + * debian/patches/01_embed_initial_visibility.dpatch: Apply patch from + bz#312998 to fix gtkmozembed's EmbedWindow::GetVisibility. Closes: #365868. + * debian/patches/01_config_install.dpatch: Correct installation of all the + headers files from the config/ directory. + * debian/patches/00list: Updated to include all the new patches. + * debian/patches/99_configure.dpatch: Updated. + * debian/control: + + Bumped Standards-Version to 3.7.2.0. No changes. + + Add small text about the SDK to libxul-dev's description. + + Make libxul-dev depend on xulrunner for the development tools (xpt_link, + xpt_dump, xpidl, regxpchrome) + * debian/rules, debian/libxul-dev.install: Install the SDK files. + * debian/libxul0d.install: Install MozillaInterfaces.jar in + /usr/lib/xulrunner instead of inside the SDK (but put a symlink there), + since it is useful to embed javaxpcom. + * debian/libxul0d.install, debian/xulrunner.install: Move the PSM files + from xulrunner to libxul0d. Closes: #359220, #359226. + * debian/control: Make libxul0d conflict with those older versions of + xulrunner that included the PSM files. + + -- Mike Hommey Sat, 13 May 2006 23:22:35 +0200 + +xulrunner (1.8.0.1-8) unstable; urgency=low + + * debian/libxul0d.install: + + Install xpt files one by one instead of glob, so that we: + - put mozgnome.xpt in xulrunner-gnome-support + (debian/xulrunner-gnome-support.install) + - don't install the sample simple.xpt + + Don't install the sample component libsimpletest.so. + * debian/rules: + + Don't remove the .chk file, since we don't install it anymore. + + Use -Wl,--as-needed as LDFLAGS. That will work around upstream linking + strategy to limit useless linkage. + + Use a specific LD_LIBRARY_PATH at link time so that we don't need to + link against indirect dependencies. This is a temporary workaround until + this is workaround some better other way. + + Added some install checks after binary packages build, so that we can + know if we forgot anything. + + Fixed the way we get the DEBIAN_VERSION. + * debian/patches/01_native_uconv.dpatch: + + Don't build intl/uconv/ucvja and friends, since this is supported by + the native uconv implementation and not even linked into something we + ship. + + Properly load invalid UTF-8 files and more generally malformed files + as to their (supposed) encoding. Closes: #358815, #359049, #358599. + * debian/patches/01_prefs.dpatch: set javascript.options.showInConsole. + * debian/patches/01_security_build.dpatch: + + Don't build the stuff we don't need, and dynamically link libnssckbi to + both libplc4 and libplds4 instead of linking statically. + + Build with debugging symbols. + * debian/patches/01_no_chromelist.dpatch: Don't build chromelist.txt files. + * debian/patches/01_no_sys_profile.dpatch: Don't install system profile. + * debian/patches/01_no_examples.dpatch: Don't build the examples. + * debian/patches/01_xpcomglue.dpatch: + + Build the xpcom glue as a shared library. + + Load DSOs from . when directory is not given. That makes regxpcom work + as "expected". + * debian/patches/80_xpidl.dpatch: Added an error message when no file is + given, to sync with the patch against trunk I sent upstream. + * debian/patches/01_about:plugins.dpatch: Install the files for + about:plugins. Closes: #354037, #356082. + * debian/patches/01_installer.dpatch: Install applications in /usr/local/lib + instead of /usr/lib. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + * debian/rules, debian/spidermonkey-bin.install: Move out some files from + the install target instead of the binary target. Install them with + dh_install. + * debian/control: Bumped to Standards-Version: 3.6.2.2. No changes required. + * debian/libxul0d.postinst, debian/libxul0d.preinst: Instead of removing + compreg.dat and xpti.dat to solve #357589, create a .autoreg file. That + will trigger components registration in all cases, even in cases where the + component registry was stored in a profile directory. + Do it on postinst at configure time instead of preinst. + * debian/xulrunner-gnome-support.{postinst|prerm}: Also do it when + configuring or removing xulrunner-gnome-support. + * debian/libxul0d.prerm: Remove all files that could be generated by running + xulrunner or programs using libxul as root, plus the .autoreg file we + create in case it's still there. + * debian/libxul0d.install, debian/libxul-dev.install: Install the + libxpcomglue files. + * debian/control, debian/rules: Added debugging symbols in separated + packages. + * debian/control, debian/compat: Bumped debhelper compatibility to 5. + * debian/libxul0d.links: Add links to the libraries in /usr/lib/xulrunner. + That will allow some (but not all, because of C++ ABI differences) + components from mozilla and/or upstream to work with xulrunner. It also + allows the XPCOM Glue to kinda work without deep modifications. + * debian/libxul0d.conf, debian/xulrunner.conf, debian/libxul0d.install, + debian/xulrunner.install, debian/rules: Install GRE "configurations" into + /etc/gre.d. That is used by the XPCOM Glue (thus, by the xulrunner stub). + * debian/rules, debian/libxul0d.install: Install the dependentlibs.list file. + + -- Mike Hommey Sat, 1 Apr 2006 16:09:27 +0200 + +xulrunner (1.8.0.1-7) unstable; urgency=low + + * debian/rules: Add -g to the build flags when building with + DEB_BUILD_OPTIONS=nostrip. If we ask for nostrip, we want the debugging + symbols, right? ;) + * debian/libxul0d.preinst, debian/libxul0d.prerm: Remove + /usr/lib/xulrunner/components/{compreg|xpti}.dat files on upgrade and + removal. Closes: #357589. That will also avoid gnome-support components to + be ignored if they were created when the components were not yet + installed. + + -- Mike Hommey Thu, 23 Mar 2006 23:02:29 +0100 + +xulrunner (1.8.0.1-6) unstable; urgency=low + + * debian/copyright: Fixed typo. + * debian/patches/90_mips64_build.dpatch: Patch from Martin Michlmayr for + mips64 builds. + * debian/patches/90_unsupported_arch_build.dpatch: Don't use x86 as CPU_ARCH + when building on an unsupported architectures. Closes: #357035. + * Put back some stuff that used to be in spidermonkey-bin: + + debian/rules, debian/smjs.1: Add the manual page. + + debian/rules, debian/spidermonkey-bin.menu: Add the menu item. + + debian/spidermonkey-bin.postinst, debian/spidermonkey-bin.prerm: + Add the /usr/bin/js alternative. Closes: #355729. + * debian/mozconfig: Enable iconv support. + * debian/patches/01_native_uconv.dpatch: Fix for the build to succeed when + iconv support is enabled. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Fri, 17 Mar 2006 07:16:10 +0100 + +xulrunner (1.8.0.1-5) unstable; urgency=low + + * debian/mozconfig: DON'T build the typeaheadfind module. It will cause + problems with firefox as stated before AND with the newer Galeons. I guess + it will also be problematic with newer Epiphanies. + * debian/rules: Changed the Gecko/Debian/x.y.z.t-r string to + Gecko/Debian-x.y.z.t-r for RFC2616 compliance. Thanks Josh Triplett and + Matthew Wilcox. + * debian/rules, debian/xulrunner-config: Provide a version of + xulrunner-config that gives more appropriate cflags and libs. + + -- Mike Hommey Mon, 27 Feb 2006 19:44:59 +0100 + +xulrunner (1.8.0.1-4) unstable; urgency=low + + * debian/mozconfig: + + Build the typeaheadfind module. It will enable it in Galeon and + Epiphany, but might cause problems with future firefoxes built on top on + xulrunner. That will need to be investigated further. + + Build with a flat chrome instead of jar files. + * debian/libxul0d.install, debian/xulrunner.install: Changed chrome + wildcards accordingly. + * debian/patches/01_zip.dpatch: Don't need zip if not needed (not building + jar files) + * debian/patches/01_broken_perl.dpatch: Remove useless broken perl code. + * debian/patches/01_useragent.dpatch: Remove useless useragent setter at + startup so that general.useragent.product and general.useragent.productSub + set in our vendor.js preference file work at startup time. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + * debian/control: Removed build dependency upon zip. + + -- Mike Hommey Tue, 21 Feb 2006 18:36:26 +0100 + +xulrunner (1.8.0.1-3) unstable; urgency=low + + * debian/control: + + Added a conflict against mozilla-browser on libxul-dev. Closes: #353600. + + Renamed libsmjs1-dev to libsmjs-dev, since that what is the name of the + dev package provided by the old spidermonkey package. + + Sync sections with override for spidermonkey-bin, libsmjs1 and + libsmjs-dev. + * debian/libsmjs1-dev.links: Renamed to libsmjs-dev.links. + * debian/patches/90_xpcom_hppa.dpatch: Somehow, the assembler files got + their content twice. Fixing that should make it build properly on HPPA. + * debian/xulrunner.*, debian/libxul0d.*: + + Moved /usr/share/xulrunner/defaults from xulrunner to libxul0d ; leave + out profile and preferences. They will be reintroduced if they appear to + be really useful. As for now, they just seem to be vestiges of Mozilla, + Firefox or Thunderbird. + + Moved /usr/share/xulrunner/res from xulrunner to libxul0d. + + Moved /usr/share/xulrunner/chrome/classic.*, en-US.* and toolkit.* from + xulrunner to libxul0d. If the other chrome files appear to be required + for something else, we might consider moving them as well. + * debian/control: Add a conflict on older xulrunner to libxul0d according to + the moving around of files. + * debian/rules: Changed the way we identificate ourselves in + /usr/share/xulrunner/defaults/pref/vendor.js, and move it in libxul0d. + We will using be Gecko/Debian/ instead of Gecko/yyyymmdd, + which was pointless anyway, because it was giving the date of the build, + not the date of the API... + * debian/patches/01_prefs.dpatch: Fix some printer and font configuration. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Mon, 20 Feb 2006 23:11:39 +0100 + +xulrunner (1.8.0.1-2) unstable; urgency=low + + * debian/rules: + + copy LICENSE instead of creating a link. + + add -A to dh_installdocs. + + don't install README.txt. + + don't change xulrunner-gtkmozembed.pc, xulrunner-plugin.pc + and xulrunner-xpcom.pc. Some applications that build against gecko + seem to make bad assumptions, at least with gtkmozembed. It is safest + this way, until things change upstream. + * debian/patches/01_sonames.dpatch: Fix the dirname complain. + * debian/xulrunner.install, debian/xulrunner.links, debian/libxul0d.install, + debian/libxul0d.links: Moved greprefs from xulrunner to libxul0d. + The usually necessary changes to dependencies and conflicts have not been + made because 1.8.0.1-1 never reached the archive. + * debian/patches/90_js_mipsel_endianness.dpatch: Patch to fix little + endianness of mipsel. Thanks Ian Jackson and Thiemo Seufer. + * debian/patches/80_passwdmgr.dpatch: Take patch from bz#235336 as suggested + by Ian Jackson to allow password manager to work with sites that only have + a password field, no username. + * debian/patches/01_gfx_cairo.dpatch, debian/patches/01_gfx_thebes.dpatch, + debian/patches/01_canvas_cairo.dpatch: Removed. They were for the 1.9 + branch. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Wed, 8 Feb 2006 18:53:28 +0100 + +xulrunner (1.8.0.1-1) unstable; urgency=low + + * Initial release. Closes: #284189. + * First upstream release: 1.8.0.1, synched with Firefox 1.5.0.1. + * debian/patches/99_configure.dpatch: Updated. + * debian/rules: + + Removed package names from the dh_makeshlibs call. It just works fine + with the -a option. + + Removed useless dh_shlibdeps call when building arch-independent + packages. + + Removed the -l option to the dh_shlibdeps call, it works fine without. + + Move libnssckbi.so back in /usr/lib/xulrunner. + + Add a MPL file to the docs installed, taken from the upstream LICENSE + file. + * debian/control: + + Added a xulrunner-gnome-support package for a separate gnome support. + + Made the xulrunner package suggest this new package. + + Typos corrections. + + Add sections to packages. + * debian/xulrunner-gnome-support.install: Install the gnome related + components. + * debian/libxul0d.install, debian/xulrunner.install: Moved some components + from libxul0d to xulrunner. + * debian/patches/01_ckbi_location: Removed. + * debian/patches/00list: Updated accordingly. + * debian/copyright: Updated. + + -- Mike Hommey Tue, 7 Feb 2006 19:52:24 +0100 + +xulrunner (1.7.99+cvs20060113-1) experimental; urgency=low + + * New CVS checkout. + * debian/mozconfig: Disable Java-XPCOM bridge. + * debian/control: Added | libreadline-dev to build dependencies. + * debian/patches/01_pangoxft.dpatch: force linking against pangoxft with + newer versions of pango. + * debian/patches/80_dash_workaround.dpatch, + debian/patches/80_entropy.dpatch, + debian/patches/80_xpidl.dpatch, + debian/patches/80_xrender_bug.dpatch, + debian/patches/90_ia64_align.dpatch, + debian/patches/90_mips_performance.dpatch, + debian/patches/90_ppc64_build.dpatch, + debian/patches/90_xpcom_arm_optim.dpatch, + debian/patches/90_xpcom_arm_unused_attribute.dpatch, + debian/patches/90_xpcom_hppa.dpatch, + debian/patches/90_xpcom_m68k.dpatch, + debian/patches/90_xpcom_mips.dpatch: Patches stolen from Firefox. + * debian/patches/00list: Updated accordingly. + * debian/patches/99_configure.dpatch: Updated. + + -- Mike Hommey Thu, 19 Jan 2006 17:08:58 +0100 + +xulrunner (1.7.99+cvs20051212-1) experimental; urgency=low + + * New CVS checkout. + * debian/control: Moved -dev packages from arch: any to arch: all. + * debian/rules: + + Properly copy nss includes. + + Properly call dh_shlibdeps with the changed package names. + + Add a vendor.js file adding debian version in user-agent string. + + Modify *.pc files to fit modified include and library directories + and install them. + * debian/lib*-dev.install: Removed pkgconfig files. + * debian/*-dev.dirs: Create usr/lib/pkgconfig in the dev packages. + * debian/xulrunner.dirs: Create the prefs dir for the vendor.js file. + * debian/patches/01_locale.dpatch: Correctly set locale. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sun, 18 Dec 2005 13:44:17 +0100 + +xulrunner (1.7.99+cvs20051130-1) experimental; urgency=low + + * New CVS checkout. + * debian/mozconfig: + + Added cookie and permissions extensions. + + Disabled building of the installer. + * debian/patches/01_sidebar.dpatch: Added the sidebar extension. + * debian/rules: + + Copy config.guess and config.sub files to the right places. + + Remove the .chk files. + + Add a debug DEB_BUILD_OPTIONS to add --enable-debug to configure. + * debian/patches/01_sonames.dpatch: Added soname support. + * debian/patches/01_js_binary.dpatch: Add dependency for js on libmozjs.so. + * debian/patches/99_configure.dpatch: Updated and added nsprpub/configure.in + in the scope. + * debian/patches/00list: Updated accordingly. + * debian/libmozjs-dev.install, debian/libmozjs.install, + debian/libnspr4.6-dev.install, debian/libnspr4.6.install, + debian/libnss3.10-dev.install, debian/libnss3.10.install, + debian/libxul-dev.install, debian/libxul.install: + + Moved .so files in -dev packages and put .so.* files in non -dev + packages. + + put usr/lib/xulrunner/components in libxul instead of xulrunner. + * debian/*.preinst, debian/*.postrm: Removed, since we remove the + diversions. + * debian/control: + + Add proper conflicts with mozilla's packages. + + Renamed packages to reflect the sonames. + + Removed xulrunner-dev package. + * debian/lib*.install: Renamed accordingly. + * debian/patches/01_system_bz2.dpatch: Changes to better fit upstream build + system. + * debian/xulrunner-dev.install: Removed, as we removed the package. + * debian/libxul-dev.install: Added the xulrunner-config file that used to be + in xulrunner-dev. + * debian/xulrunner.install: Added xulrunner-stub. + * debian/libxul0d.dirs: Create /usr/lib/xulrunner/extensions, that the + extensions manager insists on having existing, even if empty. + * debian/libsmjs1.links: Changed link for the versioned library. + + -- Mike Hommey Mon, 12 Dec 2005 11:12:47 +0100 + +xulrunner (1.7.99+cvs20051002-1) experimental; urgency=low + + * New CVS checkout. + * debian/patches/01_visibility.dpatch: Use -fvisibility=hidden instead of + the system wrappers, since because of bug #331460, with the system + wrappers, the resulting binary is not PIC. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Sun, 2 Oct 2005 12:48:41 +0200 + +xulrunner (1.7.99+cvs20050915-1) experimental; urgency=low + + * New CVS checkout of the less experimental 1.8 branch. + * debian/mozconfig: Use gtk2 gfx instead of cairo-gtk2 since it is not + developped in 1.8 branch. + * debian/patches/01_canvas_cairo.dpatch: Removed: been applied upstream. + * debian/patches/01_ckbi_location.dpatch: Allow libnssckbi to be loaded from + /usr/lib. (quite dirty, but, well...) + * debian/patches/01_gfx_cairo.dpatch, 01_gfx_thebes.dpatch: Removed. + * debian/patches/01_system_bz2.dpatch: Updated following upstream advices. + * debian/patches/99_configure.dpatch: Updated. + * debian/patches/00list: Updated accordingly. + + -- Mike Hommey Thu, 15 Sep 2005 15:42:40 +0200 + +xulrunner (1.8.99+cvs20050816-0) experimental; urgency=low + + * Initial package. + * debian/mozconfig: Enabled build with system cairo and cairo-gtk2 gfx. + * debian/patches/01_canvas_cairo.dpatch: Correctly build with system cairo. + * debian/patches/01_embedding_tests.dpatch: Don't build embedding tests when + using --disable-tests. + * debian/patches/01_install_path.dpatch: Install in the xulrunner directory + instead of xulrunner-1.8. + * debian/patches/01_gfx_cairo.dpatch, 01_gfx_thebes.dpatch: Patches for + correct building of gfx with system cairo. + * debian/patches/01_js_binary.dpatch: Allow to build the js binary to + provide a more up-to-date spidermonkey. + * debian/patches/01_system_bz2.dpatch: Allow to build with the system bzip2 + library. + * debian/patches/99_configure.dpatch: Changes to configure resulted from + changes to configure.in. + * debian/patches/00list: Built list accordingly. + + -- Mike Hommey Tue, 16 Aug 2005 13:45:47 +0200 + --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.dirs @@ -0,0 +1 @@ +usr/lib/xulrunner/extensions --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozillainterfaces-java.install +++ xulrunner-1.8.1.14+nobinonly/debian/libmozillainterfaces-java.install @@ -0,0 +1,2 @@ +usr/lib/xulrunner/sdk/lib/MozillaInterfaces.jar usr/share/java +usr/lib/xulrunner/sdk/lib/MozillaInterfaces-src.jar --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/xulrunner --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozjs-dev.install +++ xulrunner-1.8.1.14+nobinonly/debian/libmozjs-dev.install @@ -0,0 +1,2 @@ +usr/include/mozjs +usr/lib/libmozjs.so --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.install +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.install @@ -0,0 +1,23 @@ +usr/lib/libxul.so.* +usr/lib/libxpcom.so.* +usr/lib/libxpcomglue.so.* +usr/lib/libgtkembedmoz.so.* + +usr/lib/xulrunner/libjavaxpcomglue.so + +usr/lib/xulrunner/components/libauth.so +usr/lib/xulrunner/components/libautoconfig.so +usr/lib/xulrunner/components/libcookie.so +usr/lib/xulrunner/components/libfileview.so +usr/lib/xulrunner/components/libmyspell.so +usr/lib/xulrunner/components/libpermissions.so +usr/lib/xulrunner/components/libpipboot.so +usr/lib/xulrunner/components/libpipnss.so +usr/lib/xulrunner/components/libpippki.so +usr/lib/xulrunner/components/libspellchecker.so +usr/lib/xulrunner/components/libsystem-pref.so +usr/lib/xulrunner/components/libtransformiix.so +usr/lib/xulrunner/components/libuniversalchardet.so +usr/lib/xulrunner/components/libwebsrvcs.so +usr/lib/xulrunner/components/libxmlextras.so +usr/lib/xulrunner/components/libxulutil.so --- xulrunner-1.8.1.14+nobinonly.orig/debian/spidermonkey-bin.install +++ xulrunner-1.8.1.14+nobinonly/debian/spidermonkey-bin.install @@ -0,0 +1 @@ +usr/bin/smjs --- xulrunner-1.8.1.14+nobinonly.orig/debian/control +++ xulrunner-1.8.1.14+nobinonly/debian/control @@ -0,0 +1,215 @@ +Source: xulrunner +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Mike Hommey +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, dpatch, libx11-dev, libxt-dev, libidl-dev, libgtk2.0-dev, libgnomevfs2-dev, libgnome2-dev, libgnomeui-dev, libcairo2-dev, libpng12-dev, libjpeg62-dev, zlib1g-dev, libbz2-dev, libreadline5-dev | libreadline-dev, libkrb5-dev, python-dev, python-support (>= 0.3), dpkg-dev (>= 1.13.19), binutils (>= 2.17) [mips mipsel], libnspr4-dev, libnss3-dev (>= 3.11.5-2), libhunspell-dev (>= 1.1.5-2) +Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.56) +Standards-Version: 3.7.3.0 + +Package: xulrunner +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: xulrunner-gnome-support +Description: XUL + XPCOM application runner + XULRunner is a single "gecko runtime" that can be used to bootstrap + multiple XUL + XPCOM applications that are as rich as Firefox and + Thunderbird. + . + XUL is Mozilla's XML based User Interface language that lets you build + feature-rich cross platform applications. These applications are easily + customized with alternative text, graphics and layout so that they can be + readily branded or localized for various markets. Web developers already + familiar with Dynamic HTML (DHTML) will learn XUL quickly and can start + building applications right away. + . + XPCOM is a cross platform component model. It has multiple language + bindings and IDL descriptions so programmers can plug their custom + functionality into the framework and connect it with other components. +Homepage: http://developer.mozilla.org/en/docs/XULRunner + +Package: xulrunner-gnome-support +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Support for GNOME in xulrunner applications + This is an extension to xulrunner that allows XUL applications to use + protocol handlers from GnomeVFS, such as smb or sftp, and other GNOME + integration features. + +Package: libmozjs0d +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: The Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). +Homepage: http://www.mozilla.org/js/ + +Package: libmozjs-dev +Section: libdevel +Architecture: all +Depends: ${misc:Depends}, libmozjs0d (>= ${source:Upstream-Version}), libnspr4-dev +Conflicts: mozilla-browser (<< 2:1.8) +Description: Development files for the Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). + . + Install this package if you wish to develop your own programs using the + Mozilla SpiderMonkey JavaScript library. +Homepage: http://www.mozilla.org/js/ + +Package: libmozjs0d-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libmozjs0d (= ${binary:Version}) +Suggests: spidermonkey-bin +Conflicts: spidermonkey-bin (<< ${source:Version}), spidermonkey-bin (>= ${source:Version}.1~) +Description: Development files for the Mozilla SpiderMonkey JavaScript library + This library provides the embeddable JavaScript/ECMAScript engine from + the Mozilla project (used among others by the Mozilla, Epiphany, Firefox + browsers as well as by the iPlanet WebServer). + . + This package provides the debugging symbols for the library and for + the spidermonkey-bin package. +Homepage: http://www.mozilla.org/js/ + +Package: spidermonkey-bin +Section: interpreters +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: standalone JavaScript/ECMAScript (ECMA-262) interpreter + SpiderMonkey is a standalone JavaScript/ECMAScript interpreter. It can either + take input from files or from a command line driven interface. + . + ECMAScript (ECMA-262) is a dynamic scripting language supporting prototype + based object construction. The basic syntax is intentionally similar to + both Java and C++ to reduce the number of new concepts required to learn + the language. Language constructs, such as if statements, for and while + loops, and switch and try ... catch blocks function the same as these + languages (or nearly so). + . + JavaScript is a superset of the ECMA-262 Edition 3 (ECMAScript) standard + first introduced by Netscape and now led by the Mozilla project. +Homepage: http://www.mozilla.org/js/ + +Package: libxul0d +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libxul-common (>= ${source:Upstream-Version}) +Replaces: xulrunner (<< 1.8.0.1-9) +Description: Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, + JavaXPCOM, etc. +Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul-common +Section: libs +Architecture: all +Depends: ${misc:Depends} +Replaces: xulrunner (<< 1.8.0.1-9) +Conflicts: libxul0d (<< 1.8.0.4-2) +Description: Gecko engine library - common files + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, + JavaXPCOM, etc. + . + This package provides all architecture independent files for libxul0d. +Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul-dev +Section: libdevel +Architecture: all +Depends: ${misc:Depends}, libxul0d (>= ${source:Upstream-Version}), libnss3-dev, libnspr4-dev, libmozjs-dev (>= ${source:Version}), xulrunner +Conflicts: mozilla-browser (<< 2:1.8) +Description: Development files for the Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. + . + Install this package if you wish to embed the Gecko engine in your + program or want to develop XPCOM components. + . + This package also provides the Xulrunner Software Development Kit in the + same form as the one you may find on mozilla.org in /usr/lib/xulrunner/sdk. + . + It also contains the JavaXPCOM interfaces and their sources. +Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libxul0d-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libxul0d (= ${binary:Version}) +Suggests: xulrunner, xulrunner-gnome-support +Conflicts: xulrunner (<< ${source:Version}), xulrunner (>= ${source:Version}.1~), xulrunner-gnome-support (<< ${source:Version}), xulrunner-gnome-support (>= ${source:Version}.1~) +Description: Development files for the Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. + . + This package provides the debugging symbols for the library, and for the + xulrunner, xulrunner-gnome-support and python-xpcom packages. +Homepage: http://wiki.mozilla.org/XUL:Lib_XUL + +Package: libmozillainterfaces-java +Section: libdevel +Priority: extra +Architecture: all +Depends: libxul0d (>= 1.8.0.1-12), gij | java2-runtime +Description: XPCOM bindings for Java + JavaXPCOM allows for communication between Java and XPCOM, such that a + Java application can access XPCOM objects, and XPCOM can access any Java + class that implements an XPCOM interface. + With JavaXPCOM, a developer can talk to XPCOM or embed Gecko from a Java + application. JavaXPCOM is very similar to XPConnect (JavaScript-XPCOM + bridge), and uses XPIDL + . + Install this package if you wish to access XPCOM objects from Java. + The counterpart is built in libxul0d. + . + This package also provides the Java interfaces sources. +Homepage: http://developer.mozilla.org/en/docs/JavaXPCOM + +Package: python-xpcom +Section: python +Priority: extra +Architecture: any +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Conflicts: epiphany-browser +XB-Python-Version: ${python:Versions} +Description: XPCOM bindings for Python + PyXPCOM allows for communication between Python and XPCOM, such that a + Python application can access XPCOM objects, and XPCOM can access any + Python class that implements an XPCOM interface. + With PyXPCOM, a developer can talk to XPCOM or embed Gecko from a + Python application. PyXPCOM is similar to JavaXPCOM (Java-XPCOM bridge) + or XPConnect (JavaScript-XPCOM bridge). + . + Install this package if you wish to access XPCOM objects from Python, or + want to use Python components from XPCOM. +Homepage: http://developer.mozilla.org/en/docs/pyxpcom --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul-dev.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/libxul-dev.dirs @@ -0,0 +1 @@ +usr/lib/pkgconfig --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.prerm +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove xulrunner /usr/lib/xulrunner/xulrunner + if [ "$(update-alternatives --list xulrunner | wc -l)" = "0" ]; then + update-alternatives --remove-all xulrunner + fi +fi + +#DEBHELPER# --- xulrunner-1.8.1.14+nobinonly.orig/debian/python-xpcom.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/python-xpcom.dirs @@ -0,0 +1 @@ +usr/lib/xulrunner/components --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul-dev.install +++ xulrunner-1.8.1.14+nobinonly/debian/libxul-dev.install @@ -0,0 +1,11 @@ +usr/include/xulrunner +usr/share/idl +usr/lib/libxpcom.so +usr/lib/libxpcomglue.so +usr/lib/libxul.so +usr/lib/libgtkembedmoz.so +usr/bin/xulrunner-config +usr/lib/xulrunner/sdk/bin +usr/lib/xulrunner/sdk/idl +usr/lib/xulrunner/sdk/include +usr/lib/xulrunner/sdk/lib/*.so --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.docs +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.docs @@ -0,0 +1 @@ +README.txt --- xulrunner-1.8.1.14+nobinonly.orig/debian/copyright +++ xulrunner-1.8.1.14+nobinonly/debian/copyright @@ -0,0 +1,833 @@ +This package was debianized by Mike Hommey on +Tue, 16 Aug 2005 13:45:47 +0200. + +It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/xulrunner/ + +The source tarball is an aggregate of several different works in which the +main one, developed by the Mozilla Project, is xulrunner. + +The contents of the debian directory are licensed like the bulk of +xulrunner, tri-licensed under the GPL/LGPL/MPL. + +Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others. +Please see the sections following the copyright statements for xulrunner for +these. + +If this file is incomplete, which I'm pretty sure is the case, because it's +difficult not to forget anything in this huge amount of data, please file +a bug or contact me. + +=== xulrunner + +Overall, the xulrunner project is licensed under the terms of the Mozilla +Public License version 1.1 or, at your option, under the terms of the GNU +General Public License version 2 or subsequent, or the terms of the GNU +Lesser General Public License version 2.1 or subsequent. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' ; +the complete text of the GNU Lesser General Public License can be +found in the file `/usr/share/common-licenses/LGPL'. + +The complete text of the Mozilla Public License can be found in the MPL file +in the same directory as this file. + +Some of the files are also licensed (single, dual or tri) under the terms of +the Netscape Public License (NPL) which can be found as amendments to the +MPL at the end of the file. + +While the Mozilla Project is undergoing a global relicensing so that the +aim is to have a full tree with these tri-license terms, there are at the +moment quite some exceptions as following: + +(Note that I sometimes assumed files not explicitely licensed to be licensed +under the same terms as the files around them and that a lot of the +information has been extracted automatically, thus maybe leaving some doubt. +Again, if you find "bugs", please contact me by email or via the BTS.) + +The following files are dual licensed under the terms of the MPL and of +the GPL: + + all files in directory/c-sdk/config, except the autoconf sub-directory and + the prmkdir.bat file. + all files in security/nss/lib/ckfw/dbm + + directory/c-sdk/configure.in + directory/c-sdk/gmakefile.win + nsprpub/configure.in + nsprpub/pr/include/md/_beos.cfg + nsprpub/pr/include/md/_netbsd.h + nsprpub/pr/src/linking/prlink.c + nsprpub/pr/src/md/beos/bfile.c + nsprpub/pr/src/md/beos/brng.c + nsprpub/pr/src/md/os2/os2emx.s + nsprpub/pr/src/md/os2/os2vaclegacy.s + nsprpub/pr/src/md/unix/os_AIX.s + nsprpub/pr/src/md/unix/os_BSD_386_2.s + nsprpub/pr/src/md/unix/os_Darwin_ppc.s + nsprpub/pr/src/md/unix/os_Darwin_x86.s + nsprpub/pr/src/md/unix/os_HPUX.s + nsprpub/pr/src/md/unix/os_Irix.s + nsprpub/pr/src/md/unix/os_Linux_ia64.s + nsprpub/pr/src/md/unix/os_Linux_x86.s + nsprpub/pr/src/md/unix/os_Linux_x86_64.s + nsprpub/pr/src/md/unix/os_ReliantUNIX.s + nsprpub/pr/src/md/unix/os_SunOS.s + nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s + nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s + nsprpub/pr/src/md/unix/os_SunOS_x86.s + nsprpub/pr/src/md/unix/os_SunOS_x86_64.s + nsprpub/pr/src/md/unix/unix.c + nsprpub/pr/tests/testfile.c + nsprpub/pr/tests/tmocon.c + security/nss/cmd/crlutil/crlgen.c + security/nss/lib/freebl/mpi/hpma512.s + security/nss/lib/freebl/mpi/hppa20.s + security/nss/lib/freebl/mpi/montmulf.s + security/nss/lib/freebl/mpi/montmulfv8.s + security/nss/lib/freebl/mpi/montmulfv9.s + security/nss/lib/freebl/mpi/mpi_i86pc.s + security/nss/lib/freebl/mpi/mpi_mips.s + security/nss/lib/freebl/mpi/mpi_x86.s + security/nss/lib/freebl/mpi/mpv_sparcv8.s + security/nss/lib/freebl/mpi/mpv_sparcv9.s + security/nss/lib/util/ret_cr16.s + security/nss/tests/pkcs11/netscape/trivial/configure.in + +The following files are licensed under the terms of the MPL only: + + configure.in + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + extensions/xmlterm/scripts/xmlterm.spec + modules/libpr0n/decoders/jpeg/Makefile.in + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp + modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h + netwerk/streamconv/converters/mozTXTToHTMLConv.cpp + netwerk/streamconv/converters/mozTXTToHTMLConv.h + netwerk/streamconv/public/mozITXTToHTMLConv.idl + security/nss/lib/freebl/mpi/doc/basecvt.pod + security/nss/lib/freebl/mpi/doc/gcd.pod + security/nss/lib/freebl/mpi/doc/invmod.pod + security/nss/lib/freebl/mpi/doc/isprime.pod + security/nss/lib/freebl/mpi/doc/lap.pod + security/nss/lib/freebl/mpi/doc/mpi-test.pod + security/nss/lib/freebl/mpi/doc/prime.txt + security/nss/lib/freebl/mpi/doc/prng.pod + security/nss/lib/freebl/mpi/tests/pi1k.txt + security/nss/lib/freebl/mpi/tests/pi2k.txt + security/nss/lib/freebl/mpi/tests/pi5k.txt + security/nss/lib/freebl/mpi/utils/PRIMES + toolkit/mozapps/preferences/fontscaling.xul + widget/src/windows/nsFilePicker.cpp + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4 + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparcv9_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp + xpcom/typelib/xpidl/xpidl_java.c + +The following files are tri licensed under the terms of the NPL, of the +GPL, and the LGPL: + + all files in accessible/src/atk, except the following: + accessible/src/atk/Makefile.in + accessible/src/atk/nsAccessNodeWrap.cpp + accessible/src/atk/nsAccessNodeWrap.h + accessible/src/atk/nsXULMenuAccessibleWrap.h + all files in extensions/pref, except autoconfig/resources/Makefile.in + all files in modules/libpref, except the following: + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + all files in sun-java, except the following: + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + all files in xpcom/typelib/xpidl, except Makefile.in + + accessible/src/mac/nsTextAccessibleWrap.h + accessible/src/msaa/nsTextAccessibleWrap.cpp + accessible/src/msaa/nsTextAccessibleWrap.h + accessible/src/msaa/nsXULTreeAccessibleWrap.cpp + accessible/src/msaa/nsXULTreeAccessibleWrap.h + accessible/src/other/nsTextAccessibleWrap.h + dbm/include/cdefs.h + dbm/include/mcom_db.h + dbm/tests/lots.c + editor/ui/composer/content/editorInlineSpellCheck.js + mailnews/mime/cthandlers/calendar/mimecal.cpp + mailnews/mime/cthandlers/calendar/mimecal.h + mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp + toolkit/themes/qute/global/preferences.css + toolkit/themes/winstripe/global/preferences.css + widget/src/os2/nsAppShell.h + +The following files are dual licensed under the terms of the NPL and of +the GPL: + + gc/boehm/xSYM/SymFiles.cpp + gc/boehm/leaksoup/Addr2Line.java + gc/boehm/leaksoup/BlameTable.java + gc/boehm/leaksoup/CallTree.java + gc/boehm/leaksoup/FileLocator.java + gc/boehm/leaksoup/FileTable.java + gc/boehm/leaksoup/Histogram.java + gc/boehm/leaksoup/Reference.java + gc/boehm/leaksoup/RevisionTable.java + gc/boehm/leaksoup/StringTable.java + gc/boehm/leaksoup/Type.java + gc/boehm/leaksoup/bloatsoup.java + gc/boehm/leaksoup/leaksoup.java + gc/boehm/leaksoup/tracesoup.java + gc/boehm/xSYM/SymFiles.h + gc/boehm/xSYM/sym_file.h + js/src/lock_SunOS.s + +The following files are licensed under the terms of the NPL only: + + all files in directory/c-sdk/ldap, except the following: + directory/c-sdk/ldap/build/autoconf.mk.in + directory/c-sdk/ldap/build/my_overrides.mk + directory/c-sdk/ldap/examples/win32.mak + directory/c-sdk/ldap/libraries/libssldap/errormap.c + + dbm/Makefile.in + dbm/include/Makefile.in + dbm/include/Makefile.win + dbm/src/Makefile.in + dbm/src/Makefile.win + dbm/tests/Makefile.in + directory/c-sdk/aclocal.m4 + directory/c-sdk/build.mk + directory/c-sdk/component_versions.mk + directory/c-sdk/config/prmkdir.bat + directory/c-sdk/package.mk + extensions/pref/autoconfig/resources/Makefile.in + gc/boehm/Makefile.in + gc/boehm/makefile.win + intl/uconv/ucvibm/864i.uf + intl/uconv/ucvibm/cp850.uf + intl/uconv/ucvibm/cp852.uf + intl/uconv/ucvibm/cp855.uf + intl/uconv/ucvibm/cp857.uf + intl/uconv/ucvibm/cp862.uf + intl/uconv/ucvibm/cp864.uf + intl/uconv/ucvmath/mathematica1.uf + intl/uconv/ucvmath/mathematica2.uf + intl/uconv/ucvmath/mathematica3.uf + intl/uconv/ucvmath/mathematica4.uf + intl/uconv/ucvmath/mathematica5.uf + intl/uconv/ucvmath/mtextra.uf + intl/uconv/ucvmath/texcmex-t1.uf + intl/uconv/ucvmath/texcmex-ttf.uf + intl/uconv/ucvmath/texcmmi-t1.uf + intl/uconv/ucvmath/texcmmi-ttf.uf + intl/uconv/ucvmath/texcmr-ttf.uf + intl/uconv/ucvmath/texcmsy-t1.uf + jpeg/Makefile.in + jpeg/jerror.c + jpeg/jmorecfg.h + jpeg/netscape_mods.doc + mailnews/mime/cthandlers/calendar/Makefile.in + mailnews/mime/cthandlers/calendar/calendar.def + mailnews/mime/cthandlers/calendar/mimect-cal.def + modules/libimg/png/Makefile.in + modules/libpref/Makefile.in + modules/libpref/public/Makefile.in + modules/libpref/src/Makefile.in + modules/libpref/src/nsPref.cpp + modules/zlib/Makefile.in + modules/zlib/src/Makefile.in + modules/zlib/src/objs.mk + modules/zlib/standalone/Makefile.in + sun-java/Makefile.in + sun-java/stubs/Makefile.in + sun-java/stubs/include/Makefile.in + sun-java/stubs/include/jni_md.h + sun-java/stubs/jri/Makefile.in + toolkit/components/cookie/Makefile.in + xpcom/reflect/xptcall/src/md/mac/xptcinvoke_mac.s + xpcom/reflect/xptcall/src/md/mac/xptcstubs_mac.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_rhapsody.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_bsdos.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_openvms_alpha.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_linux.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_netbsd.s + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_solaris.s + xpcom/typelib/xpidl/Makefile.in + +The following files are licensed under the terms of the GPL only: + + build/autoconf/codeset.m4 + build/autoconf/config.guess + build/autoconf/config.sub + directory/c-sdk/config/autoconf/config.guess + directory/c-sdk/config/autoconf/config.sub + nsprpub/build/autoconf/config.guess + nsprpub/build/autoconf/config.sub + +The following files are in the Public Domain: + + aclocal.m4 + build/autoconf/freetype2.m4 + build/autoconf/gtk.m4 + build/autoconf/nspr.m4 + db/mork/src/morkDeque.cpp + db/mork/src/morkDeque.h + +The file db/mork/src/morkQuickSort.cpp is licensed under the following terms: + + Copyright (c) 1992, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +The following files come from X11R5, without any clear licensing terms: + + build/autoconf/install-sh + directory/c-sdk/config/autoconf/install-sh + nsprpub/build/autoconf/install-sh + +The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files +under the embedding/tests directory are licensed under the following terms: + + Copyright (c) 2002 Netscape Communications Corporation and + other contributors + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this Mozilla sample software and associated documentation files + (the "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +=== sqlite + +The db/sqlite3 directory contains a copy of sqlite with the following +licensing terms: + + The author disclaims copyright to this source code. In place of + a legal notice, here is a blessing: + + May you do good and not evil. + May you find forgiveness for yourself and forgive others. + May you share freely, never taking more than you give. + +=== dbm + +The dbm directory, except the files listed under the xulrunner section, is +licensed under the following terms: + + Copyright (c) 1991, 1993, 1994 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== myspell + +The extensions/spellcheck/myspell directory is licensed under the following +terms: + + Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada + And Contributors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All modifications to the source code must be clearly marked as + such. Binary redistributions based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== boehm + +The gc/boehm directory, except the files listed under the xulrunner section, +is licensed under the following terms: + + Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers + Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. + Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved. + + THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + + Permission is hereby granted to use or copy this program + for any purpose, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + +=== cairo + +The gfx/cairo/cairo directory is licensed under the following terms: + + Copyright (c) 2003 University of Southern California + Copyright (c) 1999 Tom Tromey + Copyright (c) 2002, 2003 University of Southern California + Copyright (c) 2004 Calum Robinson + Copyright (c) 2004 David Reveman + Copyright (c) 2000, 2002, 2004 Keith Packard + Copyright (c) 2004, 2005 Red Hat, Inc + + Cairo is free software and is available to be redistributed and/or + modified under the terms of either the GNU Lesser General Public + License (LGPL) version 2.1 or the Mozilla Public License (MPL) version + 1.1. + +=== libpixman + +The gfx/cairo/libpixman directory is licensed under the following terms: +(from gfx/cairo/libpixman/COPYING) + + libpixregion + + Copyright 1987, 1998 The Open Group + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Digital not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + + ---------------------------------------------------------------------- + libic + + Copyright © 2001 Keith Packard + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Keith Packard not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Keith Packard makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + ---------------------------------------------------------------------- + slim + + slim is Copyright © 2003 Richard Henderson + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Richard Henderson not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Richard Henderson + makes no representations about the suitability of this software for + any purpose. It is provided "as is" without express or implied + warranty. + + RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +=== libjpeg + +The jpeg directory, except the files under the xulrunner section, are licensed +under the following terms: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + +=== bzip2 + +The modules/libbz2/src directory is licensed under the following terms: +(from modules/libbz2/src/LICENSE) + + This program, "bzip2", the associated library "libbzip2", and all + documentation, are copyright (C) 1996-2005 Julian R Seward. All + rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Julian Seward, Cambridge, UK. + jseward@acm.org + bzip2/libbzip2 version 1.0.3 of 15 February 2005 + +=== libpng + +The directory modules/libimg/png is licensed under the following terms: +(from modules/libimg/png/LICENSE) + + This copy of the libpng notices is provided for your convenience. In case of + any discrepancy between this copy and the notices in the file png.h that is + included in the libpng distribution, the latter shall prevail. + + COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + + If you modify libpng you may insert additional notices immediately following + this sentence. + + libpng version 1.2.6, September 12, 2004, is + Copyright (c) 2004 Glenn Randers-Pehrson, and is + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors + + Cosmin Truta + + libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are + Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.0.6 + with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + + and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are + Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-0.96, + with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + + libpng versions 0.89, June 1996, through 0.96, May 1997, are + Copyright (c) 1996, 1997 Andreas Dilger + Distributed according to the same disclaimer and license as libpng-0.88, + with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + + libpng versions 0.5, May 1995, through 0.88, January 1996, are + Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + + For the purposes of this copyright and license, "Contributing Authors" + is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + + The PNG Reference Library is supplied "AS IS". The Contributing Authors + and Group 42, Inc. disclaim all warranties, expressed or implied, + including, without limitation, the warranties of merchantability and of + fitness for any purpose. The Contributing Authors and Group 42, Inc. + assume no liability for direct, indirect, incidental, special, exemplary, + or consequential damages, which may result from the use of the PNG + Reference Library, even if advised of the possibility of such damage. + + Permission is hereby granted to use, copy, modify, and distribute this + source code, or portions hereof, for any purpose, without fee, subject + to the following restrictions: + + 1. The origin of this source code must not be misrepresented. + + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + + The Contributing Authors and Group 42, Inc. specifically permit, without + fee, and encourage the use of this source code as a component to + supporting the PNG file format in commercial products. If you use this + source code in a product, acknowledgment is not required but would be + appreciated. + + + A "png_get_copyright" function is available, for convenient use in "about" + boxes and the like: + + printf("%s",png_get_copyright(NULL)); + + Also, the PNG logo (in PNG format, of course) is supplied in the + files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + + Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a + certification mark of the Open Source Initiative. + + Glenn Randers-Pehrson + glennrp@users.sourceforge.net + September 12, 2004 + +=== zlib + +The directories modules/zlib/src and security/nss/cmd/zlib are licensed under +the following terms: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* + receiving lengthy legal documents to sign. The sources are provided + for free but without warranty of any kind. The library has been + entirely written by Jean-loup Gailly and Mark Adler; it does not + include third-party code. + + If you redistribute modified sources, we would appreciate that you include + in the file ChangeLog history information documenting your changes. Please + read the FAQ for more information on the distribution of modified source + versions. + +=== expat + +The directory parser/expat is licensed under the following terms: +(from parser/expat/COPYING) + + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002 Expat maintainers. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.links +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.links @@ -0,0 +1,8 @@ +usr/lib/libnspr4.so.0d usr/lib/xulrunner/libnspr4.so +usr/lib/libplds4.so.0d usr/lib/xulrunner/libplds4.so +usr/lib/libplc4.so.0d usr/lib/xulrunner/libplc4.so +usr/lib/libmozjs.so.0d usr/lib/xulrunner/libmozjs.so +usr/lib/libxul.so.0d usr/lib/xulrunner/libxul.so +usr/lib/libxpcom.so.0d usr/lib/xulrunner/libxpcom.so +usr/lib/libgtkembedmoz.so.0d usr/lib/xulrunner/libgtkembedmoz.so +usr/share/myspell/dicts usr/lib/xulrunner/dictionaries --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul-common.links +++ xulrunner-1.8.1.14+nobinonly/debian/libxul-common.links @@ -0,0 +1,4 @@ +usr/share/xulrunner/greprefs usr/lib/xulrunner/greprefs +usr/share/xulrunner/res usr/lib/xulrunner/res +usr/share/xulrunner/defaults usr/lib/xulrunner/defaults +usr/share/xulrunner/chrome usr/lib/xulrunner/chrome --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.conf +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.conf @@ -0,0 +1,6 @@ +# Registration file installed by the libxul0d package. Please do not edit. + +[1.8.0.1] +GRE_PATH=/usr/lib/xulrunner +xulrunner=false +javaxpcom=1 --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner.postinst +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + update-alternatives --install /usr/bin/xulrunner \ + xulrunner /usr/lib/xulrunner/xulrunner 50 +fi + +#DEBHELPER# + --- xulrunner-1.8.1.14+nobinonly.orig/debian/rules +++ xulrunner-1.8.1.14+nobinonly/debian/rules @@ -0,0 +1,217 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)-.*$$/\1/ p') + +PYVER := $(shell pyversions -d) + +CFLAGS := -Wall -pipe + +JAVA_VARS := MOZ_JAVAXPCOM=1 JAVA_INCLUDE_PATH=$(CURDIR)/sun-java/stubs/include JAVAC=javac JAR=jar + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPTCFLAGS := -O0 +else + OPTCFLAGS := -O2 -fno-strict-aliasing +endif + +OPTCFLAGS += -g + +ifeq ($(DEB_BUILD_ARCH),alpha) + OPTCFLAGS += -Wl,--no-relax +endif + +ifeq ($(DEB_BUILD_ARCH),ppc64) + OPTCFLAGS += -mminimal-toc +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + DEBUGFLAGS := --enable-debug +endif + +config.status: patch-stamp ./configure debian/mozconfig + dh_testdir + # Add here commands to configure the package. + JAVA_HOME=/usr/lib/jvm/java-gcj \ + MOZCONFIG=debian/mozconfig \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,--as-needed" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-optimize="$(OPTCFLAGS)" \ + $(DEBUGFLAGS) + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + LD_LIBRARY_PATH=$(CURDIR)/dist/lib $(MAKE) PYTHON_SO=$(shell objdump -x /usr/lib/lib$(shell pyversions -d).so | grep SONAME | awk '{print $$2}') $(JAVA_VARS) DEB_NO_JAR=1 + #docbook-to-man debian/xulrunner.sgml > xulrunner.1 + + touch build-stamp + +build-jars: build-jars-stamp + +build-jars-stamp: build-stamp + $(MAKE) -C extensions/java/xpcom/interfaces $(JAVA_VARS) + $(MAKE) -C extensions/java/xpcom/src jar-libs $(JAVA_VARS) + + touch build-jars-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build*-stamp install*-stamp mozilla MPL debian/*.shlibs.local + rm -rf debian/include + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean $(JAVA_VARS) + + dh_clean + +install: install-stamp + +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C extensions/java/xpcom/glue install DESTDIR=$(CURDIR)/debian/tmp + find dist/bin -printf %P\\n | sort -u > debian/dist.list + find debian/tmp/usr/lib/xulrunner -printf %P\\n | sort -u > debian/tmp.list + diff debian/tmp.list debian/dist.list | grep "^[<>]" | grep -v "^> DEBIAN" | sort + rm -f debian/tmp.list debian/dist.list + + # Move out libraries in /usr + mv $(CURDIR)/debian/tmp/usr/include/xulrunner/js $(CURDIR)/debian/tmp/usr/include/mozjs + for lib in mozjs gtkembedmoz xpcom xpcomglue xul; do \ + mv $(CURDIR)/debian/tmp/usr/lib/xulrunner/lib$$lib* $(CURDIR)/debian/tmp/usr/lib; \ + done + mv $(CURDIR)/debian/tmp/usr/lib/xulrunner/js $(CURDIR)/debian/tmp/usr/bin/smjs + + sed 's,/xulrunner,, ; s,/js,/mozjs, ; s,nspr.*,xulrunner-nspr >= 4.6.5,' \ + $(CURDIR)/debian/tmp/usr/lib/pkgconfig/xulrunner-js.pc \ + > $(CURDIR)/debian/libmozjs-dev/usr/lib/pkgconfig/xulrunner-js.pc + sed 's,nspr.*,xulrunner-nspr >= 4.6.5,' \ + $(CURDIR)/debian/tmp/usr/lib/pkgconfig/xulrunner-xpcom.pc \ + > $(CURDIR)/debian/libxul-dev/usr/lib/pkgconfig/xulrunner-xpcom.pc + for file in usr/lib/pkgconfig/xulrunner-gtkmozembed.pc \ + usr/lib/pkgconfig/xulrunner-plugin.pc; do \ + install -m 644 $(CURDIR)/debian/tmp/$$file $(CURDIR)/debian/libxul-dev/$$file ; \ + done + #sed s,/lib/xulrunner,/lib, $(CURDIR)/debian/tmp/$$file \ + # > $(CURDIR)/debian/libxul-dev/$$file ; + install -d -m 755 $(CURDIR)/debian/tmp/etc/gre.d + install -m 644 $(CURDIR)/debian/*.conf $(CURDIR)/debian/tmp/etc/gre.d + + # Add Debian package version to preferences + echo // Debian package version \ + > debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.product\",\"Gecko\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.productSub\",\"`perl -e '($$s,$$m,$$h,$$d,$$M,$$y) = gmtime((stat("client.mk"))[9]); printf "%04d%02d%02d\n",$$y + 1900,$$M + 1,$$d;'`\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + echo "pref(\"general.useragent.productComment\",\"Debian-$(DEBIAN_VERSION)\");" \ + >> debian/tmp/usr/lib/xulrunner/defaults/pref/vendor.js + + # Install the SDK + for dir in bin idl include lib; do install -d -m 755 debian/tmp/usr/lib/xulrunner/sdk/$$dir; done + for file in dist/sdk/lib/*.so; do ln -s ../../../`basename $$file` debian/tmp/usr/lib/xulrunner/sdk/lib/; done + for file in dist/sdk/bin/*; do ln -s ../../`basename $$file` debian/tmp/usr/lib/xulrunner/sdk/bin/; done + for file in dist/sdk/include/*; do f=`basename $$file`; ff=`find debian/tmp -name $$f -printf "%P\n" | head -1`; if [ -n "$$ff" ]; then ln -s ../../../../../$$ff debian/tmp/usr/lib/xulrunner/sdk/include/; else echo "Can't find $$f"; exit 1; fi; done + for file in dist/sdk/idl/*; do f=`basename $$file`; if [ -e "debian/tmp/usr/share/idl/xulrunner/$$f" ]; then ln -s ../../../../share/idl/xulrunner/$$f debian/tmp/usr/lib/xulrunner/sdk/idl/; else echo "Can't find $$f"; exit 1; fi; done + for file in /usr/include/nspr/*; do ln -s $$file debian/tmp/usr/lib/xulrunner/sdk/include/; done + for file in /usr/lib/libnspr4.so /usr/lib/libplc4.so /usr/lib/libplds4.so; do ln -s $$file debian/tmp/usr/lib/xulrunner/sdk/lib/; done + + cp -f LICENSE MPL + touch install-stamp + +install-jars: install-jars-stamp + +install-jars-stamp: build-jars-stamp + dh_testdir + dh_testroot + + $(MAKE) -C extensions/java/xpcom/interfaces install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C extensions/java/xpcom/src jar-install DESTDIR=$(CURDIR)/debian/tmp + + # Install the jar files + install -d -m 755 debian/tmp/usr/lib/xulrunner/sdk/lib/ + install -m 644 dist/sdk/lib/MozillaInterfaces*.jar debian/tmp/usr/lib/xulrunner/sdk/lib/ + + touch install-jars-stamp + +# Build architecture-independent files here. +binary-indep: build build-jars install install-jars + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -A -i MPL + dh_installexamples -i + dh_install -i --sourcedir=debian/tmp + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -A -a -XREADME.txt MPL + dh_installexamples -a + dh_installmenu -pspidermonkey-bin + dh_install -a --sourcedir=debian/tmp + dh_pysupport -a + dh_python -a + dh_installman -pspidermonkey-bin $(CURDIR)/debian/smjs.1 + dh_link -a + dh_strip -plibxul0d -pxulrunner -pxulrunner-gnome-support -ppython-xpcom --dbg-package=libxul0d-dbg + dh_strip -plibmozjs0d -pspidermonkey-bin --dbg-package=libmozjs0d-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -plibxul0d -Xusr/lib/xulrunner/components -V 'libxul0d (>= 1.8.1.4)' + dh_makeshlibs -plibmozjs0d -V 'libmozjs0d (>= 1.8.1.5)' + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +source: clean + find . -name CVS -o -name .cvsignore | xargs rm -rf + tar -C .. -zcf ../`dpkg-parsechangelog | sed -n '/Source:/ N; s/Source: \(.*\)\nVersion: \(.*\)-[0-9][0-9]*$$/\1_\2/ p'`.orig.tar.gz --exclude=`basename $(CURDIR)`/debian `basename $(CURDIR)` + +binary: binary-indep binary-arch + find debian/tmp -printf %P\\n | sort -u > debian/tmp.list + find `grep Package: debian/control | awk '{print "debian/"$$2}'` -printf %P\\n | sed 's,usr/share/xulrunner,usr/lib/xulrunner,' | sort -u > debian/pkg.list + diff debian/tmp.list debian/pkg.list | grep "^[<>]" | grep -v "^> DEBIAN" | sort + rm -f debian/tmp.list debian/pkg.list + +.PHONY: build clean clean-patched binary-indep binary-arch binary install source build-jars install-jars --- xulrunner-1.8.1.14+nobinonly.orig/debian/python-xpcom.postinst +++ xulrunner-1.8.1.14+nobinonly/debian/python-xpcom.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.14+nobinonly.orig/debian/python-xpcom.install +++ xulrunner-1.8.1.14+nobinonly/debian/python-xpcom.install @@ -0,0 +1,2 @@ +usr/lib/python* +usr/lib/xulrunner/components/libpyloader.so --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner-gnome-support.install +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner-gnome-support.install @@ -0,0 +1,4 @@ +usr/lib/xulrunner/components/mozgnome.xpt +usr/lib/xulrunner/components/libimgicon.so +usr/lib/xulrunner/components/libmozgnome.so +usr/lib/xulrunner/components/libnkgnomevfs.so --- xulrunner-1.8.1.14+nobinonly.orig/debian/compat +++ xulrunner-1.8.1.14+nobinonly/debian/compat @@ -0,0 +1 @@ +5 --- xulrunner-1.8.1.14+nobinonly.orig/debian/pyversions +++ xulrunner-1.8.1.14+nobinonly/debian/pyversions @@ -0,0 +1 @@ +current --- xulrunner-1.8.1.14+nobinonly.orig/debian/remove.nonfree +++ xulrunner-1.8.1.14+nobinonly/debian/remove.nonfree @@ -0,0 +1,161 @@ +#! /bin/sh + +rm -fv ./build/wince/shunt/build/shunt.vcb +rm -fv ./build/wince/shunt/build/shunt.vco +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u +# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it: +rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u +rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp +rm -fv ./modules/oji/tests/script/killer.exe +rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc +rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo +rm -fv ./extensions/manticore/resources/manticore.psd +rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc +rm -fv ./config/bin2rc.exe +rm -fv ./config/makedep.exe +rm -fv ./config/mangle.exe +rm -fv ./config/mantomak.exe +rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL +rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx +rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx +rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib +rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc +rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc +rm -fv ./embedding/minimo/mozconfig +rm -fv ./embedding/qa/testembed/testembed.aps +rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo +rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib +rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk +rm -fv ./intl/unicharutil/tools/data/case.dat +rm -fv ./intl/unicharutil/tools/data/cmbcl.dat +rm -fv ./intl/unicharutil/tools/data/ctype.dat +rm -fv ./intl/unicharutil/tools/data/decomp.dat +rm -fv ./intl/unicharutil/tools/data/num.dat +rm -fv ./js/src/fdlibm/fdlibm.mdp +rm -fv ./js/src/js.mdp +rm -fv ./js/src/liveconnect/jsj_nodl.c +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc +rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection +rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp +rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib +rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc +rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp +rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp +rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp +rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script +rm -fv ./xpinstall/test/pre_checkin.xpi +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib +rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc +rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc +rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp +rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib +rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings +rm -fv ./gfx/src/mac/nsMacGFX.rsrc +rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda +rm -fv ./layout/doc/object_diagram_template.sda +rm -fv ./layout/html/tests/block/bugs/RealSnow.jar +rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc +rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc +rm -fv ./webshell/tests/viewer/mac/viewer.ppob +rm -fv ./webshell/tests/viewer/mac/viewer.rsrc +rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc +rm -fv ./webshell/tests/viewer/viewer-beos.rsrc +rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc +rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt +rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll +rm -fv ./mailnews/addrbook/src/nsAbOSXCard.o +rm -fv ./mailnews/addrbook/src/nsAbOSXDirFactory.o +rm -fv ./mailnews/addrbook/src/nsAbOSXDirectory.o +rm -fv ./mailnews/addrbook/src/nsAbOSXUtils.o + +echo also we need to remove any copyrighted image files from the mozilla src suite, not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc + +rm -fv ./xpfe/bootstrap/splash.bmp +rm -fv ./xpfe/bootstrap/mozilla.ico +rm -fv ./xpfe/bootstrap/mozos2.ico +rm -fv ./browser/app/mozicon128.png +rm -fv ./browser/app/mozicon16.xpm +rm -fv ./browser/app/mozicon50.xpm + +# I'm not sure about the os2 as I can't see them +rm -fv ./xpfe/bootstrap/icons/os2/mozilla.ico + +rm -fv ./xpinstall/wizard/windows/setuprsc/bitmap1.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/windows/setuprsc/turbo-systray.bmp + +rm -fv ./xpinstall/wizard/os2/nsinstall/stubinstall.ico +rm -fv ./xpinstall/wizard/os2/setuprsc/downloadLogo.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/bitmap1.bmp + +rm -fv ./suite/branding/icons/gtk/seamonkey.png # 128x128 +rm -fv ./suite/branding/icons/gtk/default.xpm # 32x32 +rm -fv ./suite/branding/icons/gtk/default16.xpm #16x16 +rm -fv ./suite/branding/content/logo.gif # 200x200 + +# remove the throbbers as they are branded + +rm -fv ./themes/classic/communicator/brand/throbber-single.gif +rm -fv ./themes/classic/communicator/brand/throbber16-single.gif +rm -fv ./themes/classic/communicator/brand/throbber-anim.gif +rm -fv ./themes/classic/communicator/brand/throbber16-anim.gif + +rm -fv ./themes/modern/communicator/brand/throbber-single.gif +rm -fv ./themes/modern/communicator/brand/throbber16-single.gif +rm -fv ./themes/modern/communicator/brand/throbber-anim.gif +rm -fv ./themes/modern/communicator/brand/throbber16-anim.gif + +rm -fv ./xpfe/bootstrap/splash.xpm +rm -fv ./themes/classic/communicator/icons/turbo-systray.gif +rm -fv ./themes/modern/communicator/icons/turbo-systray.gif + + +rm -fvr other-licenses/ +rm -fv README/mozilla/README.os2 + +rm -fv netwerk/protocol/ftp/doc/rfc959.txt +rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt + +# CVS stuff +find . -type d -name CVS | xargs rm -rf +find . -type f -name .cvsignore | xargs rm -f --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul0d.postinst +++ xulrunner-1.8.1.14+nobinonly/debian/libxul0d.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.14+nobinonly.orig/debian/libmozjs-dev.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/libmozjs-dev.dirs @@ -0,0 +1 @@ +usr/lib/pkgconfig --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul-common.install +++ xulrunner-1.8.1.14+nobinonly/debian/libxul-common.install @@ -0,0 +1,163 @@ +etc/gre.d/libxul0d.conf + +usr/lib/xulrunner/dependentlibs.list + +usr/lib/xulrunner/javaxpcom.jar + +usr/lib/xulrunner/greprefs usr/share/xulrunner +usr/lib/xulrunner/defaults/pref usr/share/xulrunner/defaults +usr/lib/xulrunner/defaults/autoconfig usr/share/xulrunner/defaults + +usr/lib/xulrunner/res usr/share/xulrunner + +usr/lib/xulrunner/chrome/classic* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/en-US* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/toolkit* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/pippki* usr/share/xulrunner/chrome +usr/lib/xulrunner/chrome/comm* usr/share/xulrunner/chrome + +usr/lib/xulrunner/components/FeedProcessor.js +usr/lib/xulrunner/components/nsDefaultCLH.js +usr/lib/xulrunner/components/nsDictionary.js +usr/lib/xulrunner/components/nsFilePicker.js +usr/lib/xulrunner/components/nsHelperAppDlg.js +usr/lib/xulrunner/components/nsInterfaceInfoToIDL.js +usr/lib/xulrunner/components/nsProgressDialog.js +usr/lib/xulrunner/components/nsProxyAutoConfig.js +usr/lib/xulrunner/components/nsResetPref.js +usr/lib/xulrunner/components/nsSidebar.js +usr/lib/xulrunner/components/nsURLFormatter.js +usr/lib/xulrunner/components/nsXmlRpcClient.js + +usr/lib/xulrunner/components/accessibility-atk.xpt +usr/lib/xulrunner/components/accessibility.xpt +usr/lib/xulrunner/components/alerts.xpt +usr/lib/xulrunner/components/appshell.xpt +usr/lib/xulrunner/components/appstartup.xpt +usr/lib/xulrunner/components/autocomplete.xpt +usr/lib/xulrunner/components/autoconfig.xpt +usr/lib/xulrunner/components/caps.xpt +usr/lib/xulrunner/components/chardet.xpt +usr/lib/xulrunner/components/chrome.xpt +usr/lib/xulrunner/components/commandhandler.xpt +usr/lib/xulrunner/components/commandlines.xpt +usr/lib/xulrunner/components/composer.xpt +usr/lib/xulrunner/components/content_base.xpt +usr/lib/xulrunner/components/content_html.xpt +usr/lib/xulrunner/components/content_htmldoc.xpt +usr/lib/xulrunner/components/content_xmldoc.xpt +usr/lib/xulrunner/components/content_xslt.xpt +usr/lib/xulrunner/components/content_xtf.xpt +usr/lib/xulrunner/components/cookie.xpt +usr/lib/xulrunner/components/directory.xpt +usr/lib/xulrunner/components/docshell.xpt +usr/lib/xulrunner/components/dom.xpt +usr/lib/xulrunner/components/dom_base.xpt +usr/lib/xulrunner/components/dom_canvas.xpt +usr/lib/xulrunner/components/dom_core.xpt +usr/lib/xulrunner/components/dom_css.xpt +usr/lib/xulrunner/components/dom_events.xpt +usr/lib/xulrunner/components/dom_html.xpt +usr/lib/xulrunner/components/dom_loadsave.xpt +usr/lib/xulrunner/components/dom_range.xpt +usr/lib/xulrunner/components/dom_sidebar.xpt +usr/lib/xulrunner/components/dom_storage.xpt +usr/lib/xulrunner/components/dom_stylesheets.xpt +usr/lib/xulrunner/components/dom_svg.xpt +usr/lib/xulrunner/components/dom_traversal.xpt +usr/lib/xulrunner/components/dom_views.xpt +usr/lib/xulrunner/components/dom_xbl.xpt +usr/lib/xulrunner/components/dom_xpath.xpt +usr/lib/xulrunner/components/dom_xul.xpt +usr/lib/xulrunner/components/downloads.xpt +usr/lib/xulrunner/components/editor.xpt +usr/lib/xulrunner/components/embed_base.xpt +usr/lib/xulrunner/components/extensions.xpt +usr/lib/xulrunner/components/exthandler.xpt +usr/lib/xulrunner/components/fastfind.xpt +usr/lib/xulrunner/components/feeds.xpt +usr/lib/xulrunner/components/filepicker.xpt +usr/lib/xulrunner/components/find.xpt +usr/lib/xulrunner/components/gfx.xpt +usr/lib/xulrunner/components/gksvgrenderer.xpt +usr/lib/xulrunner/components/history.xpt +usr/lib/xulrunner/components/htmlparser.xpt +usr/lib/xulrunner/components/imgicon.xpt +usr/lib/xulrunner/components/imglib2.xpt +usr/lib/xulrunner/components/inspector.xpt +usr/lib/xulrunner/components/intl.xpt +usr/lib/xulrunner/components/jar.xpt +usr/lib/xulrunner/components/jsconsole.xpt +usr/lib/xulrunner/components/jsdservice.xpt +usr/lib/xulrunner/components/layout_base.xpt +usr/lib/xulrunner/components/layout_printing.xpt +usr/lib/xulrunner/components/layout_xul.xpt +usr/lib/xulrunner/components/layout_xul_tree.xpt +usr/lib/xulrunner/components/locale.xpt +usr/lib/xulrunner/components/lwbrk.xpt +usr/lib/xulrunner/components/mimetype.xpt +usr/lib/xulrunner/components/mozbrwsr.xpt +usr/lib/xulrunner/components/mozfind.xpt +usr/lib/xulrunner/components/necko.xpt +usr/lib/xulrunner/components/necko_about.xpt +usr/lib/xulrunner/components/necko_cache.xpt +usr/lib/xulrunner/components/necko_cookie.xpt +usr/lib/xulrunner/components/necko_data.xpt +usr/lib/xulrunner/components/necko_dns.xpt +usr/lib/xulrunner/components/necko_file.xpt +usr/lib/xulrunner/components/necko_ftp.xpt +usr/lib/xulrunner/components/necko_http.xpt +usr/lib/xulrunner/components/necko_res.xpt +usr/lib/xulrunner/components/necko_socket.xpt +usr/lib/xulrunner/components/necko_strconv.xpt +usr/lib/xulrunner/components/necko_viewsource.xpt +usr/lib/xulrunner/components/oji.xpt +usr/lib/xulrunner/components/passwordmgr.xpt +usr/lib/xulrunner/components/pipboot.xpt +usr/lib/xulrunner/components/pipnss.xpt +usr/lib/xulrunner/components/pippki.xpt +usr/lib/xulrunner/components/plugin.xpt +usr/lib/xulrunner/components/pref.xpt +usr/lib/xulrunner/components/prefetch.xpt +usr/lib/xulrunner/components/profile.xpt +usr/lib/xulrunner/components/progressDlg.xpt +usr/lib/xulrunner/components/proxyObjInst.xpt +usr/lib/xulrunner/components/rdf.xpt +usr/lib/xulrunner/components/satchel.xpt +usr/lib/xulrunner/components/saxparser.xpt +usr/lib/xulrunner/components/spellchecker.xpt +usr/lib/xulrunner/components/storage.xpt +usr/lib/xulrunner/components/shistory.xpt +usr/lib/xulrunner/components/sidebar.xpt +usr/lib/xulrunner/components/toolkitprofile.xpt +usr/lib/xulrunner/components/toolkitremote.xpt +usr/lib/xulrunner/components/txmgr.xpt +usr/lib/xulrunner/components/txtsvc.xpt +usr/lib/xulrunner/components/ucnative.xpt +usr/lib/xulrunner/components/uconv.xpt +usr/lib/xulrunner/components/unicharutil.xpt +usr/lib/xulrunner/components/update.xpt +usr/lib/xulrunner/components/uriloader.xpt +usr/lib/xulrunner/components/urlformatter.xpt +usr/lib/xulrunner/components/webBrowser_core.xpt +usr/lib/xulrunner/components/webbrowserpersist.xpt +usr/lib/xulrunner/components/webshell_idls.xpt +usr/lib/xulrunner/components/websrvcs.xpt +usr/lib/xulrunner/components/widget.xpt +usr/lib/xulrunner/components/windowds.xpt +usr/lib/xulrunner/components/windowwatcher.xpt +usr/lib/xulrunner/components/xml-rpc.xpt +usr/lib/xulrunner/components/xpcom_base.xpt +usr/lib/xulrunner/components/xpcom_components.xpt +usr/lib/xulrunner/components/xpcom_ds.xpt +usr/lib/xulrunner/components/xpcom_io.xpt +usr/lib/xulrunner/components/xpcom_obsolete.xpt +usr/lib/xulrunner/components/xpcom_threads.xpt +usr/lib/xulrunner/components/xpcom_xpti.xpt +usr/lib/xulrunner/components/xpconnect.xpt +usr/lib/xulrunner/components/xpinstall.xpt +usr/lib/xulrunner/components/xulapp.xpt +usr/lib/xulrunner/components/xulapp_setup.xpt +usr/lib/xulrunner/components/xuldoc.xpt +usr/lib/xulrunner/components/xulrunner.xpt +usr/lib/xulrunner/components/xultmpl.xpt --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner-gnome-support.prerm +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner-gnome-support.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# --- xulrunner-1.8.1.14+nobinonly.orig/debian/xulrunner-gnome-support.postinst +++ xulrunner-1.8.1.14+nobinonly/debian/xulrunner-gnome-support.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/xulrunner/.autoreg + rm -f /usr/lib/xulrunner/components/compreg.dat \ + /usr/lib/xulrunner/components/xpti.dat +fi + +#DEBHELPER# + --- xulrunner-1.8.1.14+nobinonly.orig/debian/spidermonkey-bin.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/spidermonkey-bin.dirs @@ -0,0 +1 @@ +usr/bin --- xulrunner-1.8.1.14+nobinonly.orig/debian/spidermonkey-bin.menu +++ xulrunner-1.8.1.14+nobinonly/debian/spidermonkey-bin.menu @@ -0,0 +1,2 @@ +?package(spidermonkey-bin):needs="text" section="Applications/Programming" \ + title="SpiderMonkey JavaScript Interpreter" command="/usr/bin/smjs" --- xulrunner-1.8.1.14+nobinonly.orig/debian/pycompat +++ xulrunner-1.8.1.14+nobinonly/debian/pycompat @@ -0,0 +1 @@ +2 --- xulrunner-1.8.1.14+nobinonly.orig/debian/libxul-common.dirs +++ xulrunner-1.8.1.14+nobinonly/debian/libxul-common.dirs @@ -0,0 +1 @@ +usr/share/xulrunner/defaults/pref --- xulrunner-1.8.1.14+nobinonly.orig/debian/mozconfig +++ xulrunner-1.8.1.14+nobinonly/debian/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/xulrunner/config/mozconfig +ac_add_options --prefix=/usr +ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-pango +ac_add_options --enable-xft +ac_add_options --disable-freetype2 +ac_add_options --enable-system-cairo +ac_add_options --with-system-png +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-gssapi=/usr +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --enable-xinerama +ac_add_options --enable-single-profile +ac_add_options --disable-profilesharing +ac_add_options --enable-svg +ac_add_options --enable-svg-renderer=cairo +ac_add_options --enable-mathml +ac_add_options --disable-pedantic +ac_add_options --disable-long-long-warning +ac_add_options --enable-gnomevfs +ac_add_options --enable-gnomeui +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --enable-canvas +#ac_add_options --disable-xpcom-obsolete +ac_add_options --enable-js-binary +ac_add_options --with-readline +ac_add_options --enable-extensions="default cookie permissions python/xpcom spellcheck" +ac_add_options --disable-installer +ac_add_options --disable-javaxpcom +ac_add_options --enable-chrome-format=flat +ac_add_options --enable-native-uconv +ac_add_options --disable-elf-dynstr-gc +ac_add_options --enable-system-hunspell --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConsoleListener.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConsoleListener.java @@ -0,0 +1,15 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConsoleListener.idl + */ + +package org.mozilla.interfaces; + +public interface nsIConsoleListener extends nsISupports { + + String NS_ICONSOLELISTENER_IID = + "{eaaf61d6-1dd1-11b2-bc6e-8fc96480f20d}"; + + void observe(nsIConsoleMessage aMessage); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConsoleMessage.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConsoleMessage.java @@ -0,0 +1,20 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConsoleMessage.idl + */ + +package org.mozilla.interfaces; + +/** + * This is intended as a base interface; implementations may want to + * provide an object that can be qi'ed to provide more specific + * message information. + */ +public interface nsIConsoleMessage extends nsISupports { + + String NS_ICONSOLEMESSAGE_IID = + "{41bd8784-1dd2-11b2-9553-8606958fffe1}"; + + String getMessage(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConsoleService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConsoleService.java @@ -0,0 +1,41 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConsoleService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIConsoleService extends nsISupports { + + String NS_ICONSOLESERVICE_IID = + "{a647f184-1dd1-11b2-a9d1-8537b201161b}"; + + void logMessage(nsIConsoleMessage message); + + /** + * Convenience method for logging simple messages. + */ + void logStringMessage(String message); + + /** + * Get an array of all the messages logged so far. If no messages + * are logged, this function will return a count of 0, but still + * will allocate one word for messages, so as to show up as a + * 0-length array when called from script. + */ + void getMessageArray(nsIConsoleMessage[][] messages, long[] count); + + /** + * To guard against stack overflows from listeners that could log + * messages (it's easy to do this inadvertently from listeners + * implemented in JavaScript), we don't call any listeners when + * another error is already being logged. + */ + void registerListener(nsIConsoleListener listener); + + /** + * Each registered listener should also be unregistered. + */ + void unregisterListener(nsIConsoleListener listener); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConsoleService_MOZILLA_1_8_BRANCH.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConsoleService_MOZILLA_1_8_BRANCH.java @@ -0,0 +1,23 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConsoleService.idl + */ + +package org.mozilla.interfaces; + +/** + * Temporary interface for Gecko 1.8.1. + * + * @status TEMPORARY + */ +public interface nsIConsoleService_MOZILLA_1_8_BRANCH extends nsIConsoleService { + + String NS_ICONSOLESERVICE_MOZILLA_1_8_BRANCH_IID = + "{3c3f3e30-ebd5-11da-8ad9-0800200c9a66}"; + + /** + * Clear the message buffer (e.g. for privacy reasons). + */ + void reset(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIErrorService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIErrorService.java @@ -0,0 +1,56 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIErrorService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIErrorService: This is an interim service that allows nsresult codes to be mapped to + * string bundles that can be used to look up error messages. String bundle keys can also + * be mapped. + * + * This service will eventually get replaced by extending xpidl to allow errors to be defined. + * (http://bugzilla.mozilla.org/show_bug.cgi?id=13423). + */ +public interface nsIErrorService extends nsISupports { + + String NS_IERRORSERVICE_IID = + "{e72f94b2-5f85-11d4-9877-00c04fa0cf4a}"; + + /** + * Registers a string bundle URL for an error module. Error modules are obtained from + * nsresult code with NS_ERROR_GET_MODULE. + */ + void registerErrorStringBundle(short errorModule, String stringBundleURL); + + /** + * Registers a string bundle URL for an error module. + */ + void unregisterErrorStringBundle(short errorModule); + + /** + * Retrieves a string bundle URL for an error module. + */ + String getErrorStringBundle(short errorModule); + + /** + * Registers a key in a string bundle for an nsresult error code. Only the code portion + * of the nsresult is used (obtained with NS_ERROR_GET_CODE) in this registration. The + * string bundle key is used to look up internationalized messages in the string bundle. + */ + void registerErrorStringBundleKey(long error, String stringBundleKey); + + /** + * Unregisters a key in a string bundle for an nsresult error code. + */ + void unregisterErrorStringBundleKey(long error); + + /** + * Retrieves a key in a string bundle for an nsresult error code. If no key is registered + * for the specified nsresult's code (obtained with NS_ERROR_GET_CODE), then the stringified + * version of the nsresult code is returned. + */ + String getErrorStringBundleKey(long error); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIStackFrame.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIStackFrame.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIException.idl + */ + +package org.mozilla.interfaces; + +public interface nsIStackFrame extends nsISupports { + + String NS_ISTACKFRAME_IID = + "{91d82105-7c62-4f8b-9779-154277c0ee90}"; + + long getLanguage(); + + String getLanguageName(); + + String getFilename(); + + String getName(); + + int getLineNumber(); + + String getSourceLine(); + + nsIStackFrame getCaller(); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIException.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIException.java @@ -0,0 +1,33 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIException.idl + */ + +package org.mozilla.interfaces; + +public interface nsIException extends nsISupports { + + String NS_IEXCEPTION_IID = + "{f3a8d3b4-c424-4edc-8bf6-8974c983ba78}"; + + String getMessage(); + + long getResult(); + + String getName(); + + String getFilename(); + + long getLineNumber(); + + long getColumnNumber(); + + nsIStackFrame getLocation(); + + nsIException getInner(); + + nsISupports getData(); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIExceptionProvider.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIExceptionProvider.java @@ -0,0 +1,16 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIExceptionService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIExceptionProvider extends nsISupports { + + String NS_IEXCEPTIONPROVIDER_IID = + "{0577744c-c1d2-47f2-8bcc-ce7a9e5a88fc}"; + + /** Gets an nsIException or returns NULL if not possible. **/ + nsIException getException(long result, nsIException defaultException); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIExceptionManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIExceptionManager.java @@ -0,0 +1,23 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIExceptionService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIExceptionManager extends nsISupports { + + String NS_IEXCEPTIONMANAGER_IID = + "{efc9d00b-231c-4feb-852c-ac017266a415}"; + + /** Sets (or clears with nsnull) the current error on the this thread. */ + void setCurrentException(nsIException error); + + /** Gets the current error for the current thread, or NULL if no error */ + nsIException getCurrentException(); + + /** Gets an exception from a registered exception provider.. + This has no effect on the "current exception" */ + nsIException getExceptionFromProvider(long rc, nsIException defaultException); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIExceptionService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIExceptionService.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIExceptionService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIExceptionService extends nsIExceptionManager { + + String NS_IEXCEPTIONSERVICE_IID = + "{35a88f54-f267-4414-92a7-191f6454ab52}"; + + /** Obtains an exception manager for the current thread. */ + nsIExceptionManager getCurrentExceptionManager(); + + /** Installs an "exception provider" which is capable of + translating an nsresult into an exception. This enables + error providers to return simple nsresults and only provide + rich errors when specifically requested. It also has the + advantage of allowing code like the DOM to handle all errors + in a single function rather than at each XPCOM entry point. + NOTE: This interface must be thread-safe - it will be called + on whatever thread needs the error translation performed.*/ + void registerExceptionProvider(nsIExceptionProvider provider, long moduleCode); + + void unregisterExceptionProvider(nsIExceptionProvider provider, long moduleCode); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIVersionComparator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIVersionComparator.java @@ -0,0 +1,51 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIVersionComparator.idl + */ + +package org.mozilla.interfaces; + +/** + * Version strings are dot-separated sequences of version-parts. + * + * A version-part consists of up to four parts, all of which are optional: + * + * + * + * A version-part may also consist of a single asterisk "*" which indicates + * "infinity". + * + * Numbers are base-10, and are zero if left out. + * Strings are compared bytewise. + * + * For additional backwards compatibility, if "string-b" is "+" then + * "number-a" is incremented by 1 and "string-b" becomes "pre". + * + * 1.0pre1 + * < 1.0pre2 + * < 1.0 == 1.0.0 == 1.0.0.0 + * < 1.1pre == 1.1pre0 == 1.0+ + * < 1.1pre1a + * < 1.1pre1 + * < 1.1pre10a + * < 1.1pre10 + * + * Although not required by this interface, it is recommended that + * numbers remain within the limits of a signed char, i.e. -127 to 128. + */ +public interface nsIVersionComparator extends nsISupports { + + String NS_IVERSIONCOMPARATOR_IID = + "{e6cd620a-edbb-41d2-9e42-9a2ffc8107f3}"; + + /** + * Compare two version strings + * @param A The first version + * @param B The second version + * @returns < 0 if A < B + * = 0 if A == B + * > 0 if A > B + */ + int compare(String A, String B); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIUUIDGenerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIUUIDGenerator.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIUUIDGenerator.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIUUIDGenerator is implemented by a service that can generate + * universally unique identifiers, ideally using any platform-native + * method for generating UUIDs. + */ +public interface nsIUUIDGenerator extends nsISupports { + + String NS_IUUIDGENERATOR_IID = + "{138ad1b2-c694-41cc-b201-333ce936d8b8}"; + + /** + * Obtains a new UUID using appropriate platform-specific methods to + * obtain a nsID that can be considered to be globally unique. + * + * @returns an nsID filled in with a new UUID. + * + * @throws NS_ERROR_FAILURE if a UUID cannot be generated (e.g. if + * an underlying source of randomness is not available) + */ + String generateUUID(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDebug.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDebug.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIDebug.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIDebug is an interface between XPCOM Glue and XPCOM. Users should access + * the nsIDebug interface through the static class nsDebug. + * @see nsDebug.h + * + * @status UNDER_REVIEW + * + */ +public interface nsIDebug extends nsISupports { + + String NS_IDEBUG_IID = + "{3bf0c3d7-3bd9-4cf2-a971-33572c503e1e}"; + + void assertion(String aStr, String aExpr, String aFile, int aLine); + + void warning(String aStr, String aFile, int aLine); + + void _break(String aFile, int aLine); + + void abort(String aFile, int aLine); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIInterfaceRequestor.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIInterfaceRequestor.java @@ -0,0 +1,38 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIInterfaceRequestor.idl + */ + +package org.mozilla.interfaces; + +/** + * The nsIInterfaceRequestor interface defines a generic interface for + * requesting interfaces that a given object might provide access to. + * This is very similar to QueryInterface found in nsISupports. + * The main difference is that interfaces returned from GetInterface() + * are not required to provide a way back to the object implementing this + * interface. The semantics of QI() dictate that given an interface A that + * you QI() on to get to interface B, you must be able to QI on B to get back + * to A. This interface however allows you to obtain an interface C from A + * that may or most likely will not have the ability to get back to A. + * + * @status FROZEN + */ +public interface nsIInterfaceRequestor extends nsISupports { + + String NS_IINTERFACEREQUESTOR_IID = + "{033a1470-8b2a-11d3-af88-00a024ffc08c}"; + + /** + * Retrieves the specified interface pointer. + * + * @param uuid The IID of the interface being requested. + * @param result [out] The interface pointer to be filled in if + * the interface is accessible. + * @return NS_OK - interface was successfully returned. + * NS_NOINTERFACE - interface not accessible. + * NS_ERROR* - method failure. + */ + nsISupports getInterface(String uuid); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIMemory.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIMemory.java @@ -0,0 +1,64 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIMemory.idl + */ + +package org.mozilla.interfaces; + +/** + * + * nsIMemory: interface to allocate and deallocate memory. Also provides + * for notifications in low-memory situations. + * + * The frozen exported symbols NS_Alloc, NS_Realloc, and NS_Free + * provide a more efficient way to access XPCOM memory allocation. Using + * those symbols is preferred to using the methods on this interface. + * + * A client that wishes to be notified of low memory situations (for + * example, because the client maintains a large memory cache that + * could be released when memory is tight) should register with the + * observer service (see nsIObserverService) using the topic + * "memory-pressure". There are three specific types of notications + * that can occur. These types will be passed as the |aData| + * parameter of the of the "memory-pressure" notification: + * + * "low-memory" + * This will be passed as the extra data when the pressure + * observer is being asked to flush for low-memory conditions. + * + * "heap-minimize" + * This will be passed as the extra data when the pressure + * observer is being asked to flush because of a heap minimize + * call. + * + * "alloc-failure" + * This will be passed as the extra data when the pressure + * observer has been asked to flush because a malloc() or + * realloc() has failed. + * + * @status FROZEN + */ +public interface nsIMemory extends nsISupports { + + String NS_IMEMORY_IID = + "{59e7e77a-38e4-11d4-8cf5-0060b0fc14a3}"; + + /** + * Attempts to shrink the heap. + * @param immediate - if true, heap minimization will occur + * immediately if the call was made on the main thread. If + * false, the flush will be scheduled to happen when the app is + * idle. + * @return NS_ERROR_FAILURE if 'immediate' is set an the call + * was not on the application's main thread. + */ + void heapMinimize(boolean immediate); + + /** + * This predicate can be used to determine if we're in a low-memory + * situation (what constitutes low-memory is platform dependent). This + * can be used to trigger the memory pressure observers. + */ + boolean isLowMemory(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProgrammingLanguage.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProgrammingLanguage.java @@ -0,0 +1,36 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProgrammingLanguage.idl + */ + +package org.mozilla.interfaces; + +/** + * Enumeration of Programming Languages + * @status FROZEN + */ +public interface nsIProgrammingLanguage extends nsISupports { + + String NS_IPROGRAMMINGLANGUAGE_IID = + "{ea604e90-40ba-11d5-90bb-0010a4e73d9a}"; + + /** + * Identifiers for programming languages. + */ + long UNKNOWN = 0L; + + long CPLUSPLUS = 1L; + + long JAVASCRIPT = 2L; + + long PYTHON = 3L; + + long PERL = 4L; + + long JAVA = 5L; + + long ZX81_BASIC = 6L; + + long JAVASCRIPT2 = 7L; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupports.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupports.java @@ -0,0 +1,15 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupports.idl + */ + +package org.mozilla.interfaces; + +public interface nsISupports { + + String NS_ISUPPORTS_IID = + "{00000000-0000-0000-c000-000000000046}"; + + nsISupports queryInterface(String uuid); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIWeakReference.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIWeakReference.java @@ -0,0 +1,36 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIWeakReference.idl + */ + +package org.mozilla.interfaces; + +/** + * An instance of |nsIWeakReference| is a proxy object that cooperates with + * its referent to give clients a non-owning, non-dangling reference. Clients + * own the proxy, and should generally manage it with an |nsCOMPtr| (see the + * type |nsWeakPtr| for a |typedef| name that stands out) as they would any + * other XPCOM object. The |QueryReferent| member function provides a + * (hopefully short-lived) owning reference on demand, through which clients + * can get useful access to the referent, while it still exists. + * + * @status FROZEN + * @version 1.0 + * @see nsISupportsWeakReference + * @see nsWeakReference + * @see nsWeakPtr + */ +public interface nsIWeakReference extends nsISupports { + + String NS_IWEAKREFERENCE_IID = + "{9188bc85-f92e-11d2-81ef-0060083a0bcf}"; + + /** + * |QueryReferent| queries the referent, if it exists, and like |QueryInterface|, produces + * an owning reference to the desired interface. It is designed to look and act exactly + * like (a proxied) |QueryInterface|. Don't hold on to the produced interface permanently; + * that would defeat the purpose of using a non-owning |nsIWeakReference| in the first place. + */ + nsISupports queryReferent(String uuid); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsWeakReference.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsWeakReference.java @@ -0,0 +1,34 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIWeakReference.idl + */ + +package org.mozilla.interfaces; + +/** + * |nsISupportsWeakReference| is a factory interface which produces appropriate + * instances of |nsIWeakReference|. Weak references in this scheme can only be + * produced for objects that implement this interface. + * + * @status FROZEN + * @version 1.0 + * @see nsIWeakReference + * @see nsSupportsWeakReference + */ +public interface nsISupportsWeakReference extends nsISupports { + + String NS_ISUPPORTSWEAKREFERENCE_IID = + "{9188bc86-f92e-11d2-81ef-0060083a0bcf}"; + + /** + * |GetWeakReference| produces an appropriate instance of |nsIWeakReference|. + * As with all good XPCOM `getters', you own the resulting interface and should + * manage it with an |nsCOMPtr|. + * + * @see nsIWeakReference + * @see nsWeakPtr + * @see nsCOMPtr + */ + nsISupports getWeakReference(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIAtom.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIAtom.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAtom.idl + */ + +package org.mozilla.interfaces; + +public interface nsIAtom extends nsISupports { + + String NS_IATOM_IID = + "{3d1b15b0-93b4-11d1-895b-006008911b81}"; + + /** + * Get the Unicode or UTF8 value for the string + */ + String toString(); + + String toUTF8String(); + + /** + * Compare the atom to a specific string value + * Note that this will NEVER return/throw an error condition. + */ + boolean _equals(String aString); + + boolean equalsUTF8(String aString); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIAtomService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIAtomService.java @@ -0,0 +1,25 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAtomService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIAtomService extends nsISupports { + + String NS_IATOMSERVICE_IID = + "{e5d0d92b-ea45-4622-ab48-302baf2094ee}"; + + /** + * Version of NS_NewAtom that doesn't require linking against the + * XPCOM library. See nsIAtom.idl. + */ + nsIAtom getAtom(String value); + + /** + * Version of NS_NewPermanentAtom that doesn't require linking against + * the XPCOM library. See nsIAtom.idl. + */ + nsIAtom getPermanentAtom(String value); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsICollection.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsICollection.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsICollection.idl + */ + +package org.mozilla.interfaces; + +public interface nsICollection extends nsISerializable { + + String NS_ICOLLECTION_IID = + "{83b6019c-cbc4-11d2-8cca-0060b0fc14a3}"; + + long count(); + + nsISupports getElementAt(long index); + + nsISupports queryElementAt(long index, String uuid); + + void setElementAt(long index, nsISupports item); + + void appendElement(nsISupports item); + + void removeElement(nsISupports item); + + nsIEnumerator enumerate(); + + void clear(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIEnumerator.java @@ -0,0 +1,31 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIEnumerator.idl + */ + +package org.mozilla.interfaces; + +public interface nsIEnumerator extends nsISupports { + + String NS_IENUMERATOR_IID = + "{ad385286-cbc4-11d2-8cca-0060b0fc14a3}"; + + /** First will reset the list. will return NS_FAILED if no items + */ + void first(); + + /** Next will advance the list. will return failed if already at end + */ + void next(); + + /** CurrentItem will return the CurrentItem item it will fail if the + * list is empty + */ + nsISupports currentItem(); + + /** return if the collection is at the end. that is the beginning following + * a call to Prev and it is the end of the list following a call to next + */ + void isDone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIPropertyElement.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIPropertyElement.java @@ -0,0 +1,21 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPersistentProperties2.idl + */ + +package org.mozilla.interfaces; + +public interface nsIPropertyElement extends nsISupports { + + String NS_IPROPERTYELEMENT_IID = + "{283ee646-1aef-11d4-98b3-00c04fa0ce9a}"; + + String getKey(); + + void setKey(String aKey); + + String getValue(); + + void setValue(String aValue); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIPersistentProperties.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIPersistentProperties.java @@ -0,0 +1,49 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPersistentProperties2.idl + */ + +package org.mozilla.interfaces; + +public interface nsIPersistentProperties extends nsIProperties { + + String NS_IPERSISTENTPROPERTIES_IID = + "{1a180f60-93b2-11d2-9b8b-00805f8a16d9}"; + + /** + * load a set of name/value pairs from the input stream + * names and values should be in UTF8 + */ + void load(nsIInputStream input); + + /** + * output the values to the stream - results will be in UTF8 + */ + void save(nsIOutputStream output, String header); + + /** + * call subclass() to make future calls to load() set the properties + * in this "superclass" instead + */ + void subclass(nsIPersistentProperties superclass); + + /** + * get an enumeration of nsIPropertyElement objects, + * which are read-only (i.e. setting properties on the element will + * not make changes back into the source nsIPersistentProperties + */ + nsISimpleEnumerator enumerate(); + + /** + * shortcut to nsIProperty's get() which retrieves a string value + * directly (and thus faster) + */ + String getStringProperty(String key); + + /** + * shortcut to nsIProperty's set() which sets a string value + * directly (and thus faster) + */ + String setStringProperty(String key, String value); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProperty.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProperty.java @@ -0,0 +1,23 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProperty.idl + */ + +package org.mozilla.interfaces; + +public interface nsIProperty extends nsISupports { + + String NS_IPROPERTY_IID = + "{6dcf9030-a49f-11d5-910d-0010a4e73d9a}"; + + /** + * Get the name of the property. + */ + String getName(); + + /** + * Get the value of the property. + */ + nsIVariant getValue(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIPropertyBag.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIPropertyBag.java @@ -0,0 +1,25 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPropertyBag.idl + */ + +package org.mozilla.interfaces; + +public interface nsIPropertyBag extends nsISupports { + + String NS_IPROPERTYBAG_IID = + "{bfcd37b0-a49f-11d5-910d-0010a4e73d9a}"; + + /** + * Get a nsISimpleEnumerator whose elements are nsIProperty objects. + */ + nsISimpleEnumerator getEnumerator(); + + /** + * Get a property value for the given name. + * @throws NS_ERROR_FAILURE if a property with that name doesn't + * exist. + */ + nsIVariant getProperty(String name); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIPropertyBag2.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIPropertyBag2.java @@ -0,0 +1,36 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPropertyBag2.idl + */ + +package org.mozilla.interfaces; + +public interface nsIPropertyBag2 extends nsIPropertyBag { + + String NS_IPROPERTYBAG2_IID = + "{9bb35f13-0096-4a31-833a-acd97001132d}"; + + int getPropertyAsInt32(String prop); + + long getPropertyAsUint32(String prop); + + long getPropertyAsInt64(String prop); + + double getPropertyAsUint64(String prop); + + double getPropertyAsDouble(String prop); + + String getPropertyAsAString(String prop); + + String getPropertyAsACString(String prop); + + String getPropertyAsAUTF8String(String prop); + + boolean getPropertyAsBool(String prop); + + /** + * This method returns null if the value exists, but is null. + */ + nsISupports getPropertyAsInterface(String prop, String iid); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIWritablePropertyBag.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIWritablePropertyBag.java @@ -0,0 +1,27 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIWritablePropertyBag.idl + */ + +package org.mozilla.interfaces; + +public interface nsIWritablePropertyBag extends nsIPropertyBag { + + String NS_IWRITABLEPROPERTYBAG_IID = + "{96fc4671-eeb4-4823-9421-e50fb70ad353}"; + + /** + * Set a property with the given name to the given value. If + * a property already exists with the given name, it is + * overwritten. + */ + void setProperty(String name, nsIVariant value); + + /** + * Delete a property with the given name. + * @throws NS_ERROR_FAILURE if a property with that name doesn't + * exist. + */ + void deleteProperty(String name); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIWritablePropertyBag2.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIWritablePropertyBag2.java @@ -0,0 +1,33 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIWritablePropertyBag2.idl + */ + +package org.mozilla.interfaces; + +public interface nsIWritablePropertyBag2 extends nsIPropertyBag2 { + + String NS_IWRITABLEPROPERTYBAG2_IID = + "{ee42c54a-19d3-472b-8bc3-76318d5ab5f4}"; + + void setPropertyAsInt32(String prop, int value); + + void setPropertyAsUint32(String prop, long value); + + void setPropertyAsInt64(String prop, long value); + + void setPropertyAsUint64(String prop, double value); + + void setPropertyAsDouble(String prop, double value); + + void setPropertyAsAString(String prop, String value); + + void setPropertyAsACString(String prop, String value); + + void setPropertyAsAUTF8String(String prop, String value); + + void setPropertyAsBool(String prop, boolean value); + + void setPropertyAsInterface(String prop, nsISupports value); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRecyclingAllocator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRecyclingAllocator.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRecyclingAllocator.idl + */ + +package org.mozilla.interfaces; + +/** + * + * nsIRecyclingAllocator: A wrapper for the nsRecyclingAllocator + * + * Holds allocations and reuses them for subsequent allocs. + * Thread safe and uses a timer to release freelist. + * + * @status UNDER-DEVELOPMENT + */ +public interface nsIRecyclingAllocator extends nsIMemory { + + String NS_IRECYCLINGALLOCATOR_IID = + "{d064a04c-9cee-4319-be31-64d565bccba9}"; + + void init(long nblocks, long recycleAfter, String id); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDataType.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDataType.java @@ -0,0 +1,69 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIVariant.idl + */ + +package org.mozilla.interfaces; + +public interface nsIDataType extends nsISupports { + + String NS_IDATATYPE_IID = + "{4d12e540-83d7-11d5-90ed-0010a4e73d9a}"; + + int VTYPE_INT8 = 0; + + int VTYPE_INT16 = 1; + + int VTYPE_INT32 = 2; + + int VTYPE_INT64 = 3; + + int VTYPE_UINT8 = 4; + + int VTYPE_UINT16 = 5; + + int VTYPE_UINT32 = 6; + + int VTYPE_UINT64 = 7; + + int VTYPE_FLOAT = 8; + + int VTYPE_DOUBLE = 9; + + int VTYPE_BOOL = 10; + + int VTYPE_CHAR = 11; + + int VTYPE_WCHAR = 12; + + int VTYPE_VOID = 13; + + int VTYPE_ID = 14; + + int VTYPE_DOMSTRING = 15; + + int VTYPE_CHAR_STR = 16; + + int VTYPE_WCHAR_STR = 17; + + int VTYPE_INTERFACE = 18; + + int VTYPE_INTERFACE_IS = 19; + + int VTYPE_ARRAY = 20; + + int VTYPE_STRING_SIZE_IS = 21; + + int VTYPE_WSTRING_SIZE_IS = 22; + + int VTYPE_UTF8STRING = 23; + + int VTYPE_CSTRING = 24; + + int VTYPE_ASTRING = 25; + + int VTYPE_EMPTY_ARRAY = 254; + + int VTYPE_EMPTY = 255; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIVariant.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIVariant.java @@ -0,0 +1,20 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIVariant.idl + */ + +package org.mozilla.interfaces; + +/** + * XPConnect has magic to transparently convert between nsIVariant and JS types. + * We mark the interface [scriptable] so that JS can use methods + * that refer to this interface. But we mark all the methods and attributes + * [noscript] since any nsIVariant object will be automatically converted to a + * JS type anyway. + */ +public interface nsIVariant extends nsISupports { + + String NS_IVARIANT_IID = + "{6c9eb060-8c6a-11d5-90f3-0010a4e73d9a}"; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIWritableVariant.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIWritableVariant.java @@ -0,0 +1,82 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIVariant.idl + */ + +package org.mozilla.interfaces; + +/** + * An object that implements nsIVariant may or may NOT also implement this + * nsIWritableVariant. + * + * If the 'writable' attribute is false then attempts to call any of the 'set' + * methods can be expected to fail. Setting the 'writable' attribute may or + * may not succeed. + * + */ +public interface nsIWritableVariant extends nsIVariant { + + String NS_IWRITABLEVARIANT_IID = + "{5586a590-8c82-11d5-90f3-0010a4e73d9a}"; + + boolean getWritable(); + + void setWritable(boolean aWritable); + + void setAsInt8(short aValue); + + void setAsInt16(short aValue); + + void setAsInt32(int aValue); + + void setAsInt64(long aValue); + + void setAsUint8(short aValue); + + void setAsUint16(int aValue); + + void setAsUint32(long aValue); + + void setAsUint64(double aValue); + + void setAsFloat(float aValue); + + void setAsDouble(double aValue); + + void setAsBool(boolean aValue); + + void setAsChar(char aValue); + + void setAsWChar(char aValue); + + void setAsID(String aValue); + + void setAsAString(String aValue); + + void setAsDOMString(String aValue); + + void setAsACString(String aValue); + + void setAsAUTF8String(String aValue); + + void setAsString(String aValue); + + void setAsWString(String aValue); + + void setAsISupports(nsISupports aValue); + + void setAsInterface(String iid, nsISupports iface); + + void setAsStringWithSize(long size, String str); + + void setAsWStringWithSize(long size, String str); + + void setAsVoid(); + + void setAsEmpty(); + + void setAsEmptyArray(); + + void setFromVariant(nsIVariant aValue); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISerializable.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISerializable.java @@ -0,0 +1,32 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISerializable.idl + */ + +package org.mozilla.interfaces; + +public interface nsISerializable extends nsISupports { + + String NS_ISERIALIZABLE_IID = + "{91cca981-c26d-44a8-bebe-d9ed4891503a}"; + + /** + * Initialize the object implementing nsISerializable, which must have + * been freshly constructed via CreateInstance. All data members that + * can't be set to default values must have been serialized by write, + * and should be read from aInputStream in the same order by this method. + */ + void read(nsIObjectInputStream aInputStream); + + /** + * Serialize the object implementing nsISerializable to aOutputStream, by + * writing each data member that must be recovered later to reconstitute + * a working replica of this object, in a canonical member and byte order, + * to aOutputStream. + * + * NB: a class that implements nsISerializable *must* also implement + * nsIClassInfo, in particular nsIClassInfo::GetClassID. + */ + void write(nsIObjectOutputStream aOutputStream); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIStringEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIStringEnumerator.java @@ -0,0 +1,20 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIStringEnumerator.idl + */ + +package org.mozilla.interfaces; + +/** + * Used to enumerate over an ordered list of strings. + */ +public interface nsIStringEnumerator extends nsISupports { + + String NS_ISTRINGENUMERATOR_IID = + "{50d3ef6c-9380-4f06-9fb2-95488f7d141c}"; + + boolean hasMore(); + + String getNext(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIUTF8StringEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIUTF8StringEnumerator.java @@ -0,0 +1,17 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIStringEnumerator.idl + */ + +package org.mozilla.interfaces; + +public interface nsIUTF8StringEnumerator extends nsISupports { + + String NS_IUTF8STRINGENUMERATOR_IID = + "{9bdf1010-3695-4907-95ed-83d0410ec307}"; + + boolean hasMore(); + + String getNext(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsArray.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsArray.java @@ -0,0 +1,27 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsArray.idl + */ + +package org.mozilla.interfaces; + +public interface nsISupportsArray extends nsICollection { + + String NS_ISUPPORTSARRAY_IID = + "{791eafa0-b9e6-11d1-8031-006008159b5a}"; + + int getIndexOf(nsISupports aPossibleElement); + + int getIndexOfStartingAt(nsISupports aPossibleElement, long aStartIndex); + + int getLastIndexOf(nsISupports aPossibleElement); + + void deleteLastElement(nsISupports aElement); + + void deleteElementAt(long aIndex); + + void compact(); + + nsISupportsArray _clone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIOutputIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIOutputIterator.java @@ -0,0 +1,33 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsIterators.idl + */ + +package org.mozilla.interfaces; + +/** + * ... + */ +public interface nsIOutputIterator extends nsISupports { + + String NS_IOUTPUTITERATOR_IID = + "{7330650e-1dd2-11b2-a0c2-9ff86ee97bed}"; + + /** + * Put |anElementToPut| into the underlying container or sequence at the position currently pointed to by this iterator. + * The iterator and the underlying container or sequence cooperate to |Release()| + * the replaced element, if any and if necessary, and to |AddRef()| the new element. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anElementToPut the element to place into the underlying container or sequence + */ + void putElement(nsISupports anElementToPut); + + /** + * Advance this iterator to the next position in the underlying container or sequence. + */ + void stepForward(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIInputIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIInputIterator.java @@ -0,0 +1,49 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsIterators.idl + */ + +package org.mozilla.interfaces; + +/** + * ... + */ +public interface nsIInputIterator extends nsISupports { + + String NS_IINPUTITERATOR_IID = + "{85585e12-1dd2-11b2-a930-f6929058269a}"; + + /** + * Retrieve (and |AddRef()|) the element this iterator currently points to. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @result a new reference to the element this iterator currently points to (if any) + */ + nsISupports getElement(); + + /** + * Advance this iterator to the next position in the underlying container or sequence. + */ + void stepForward(); + + /** + * Test if |anotherIterator| points to the same position in the underlying container or sequence. + * + * The result is undefined if |anotherIterator| was not created by or for the same underlying container or sequence. + * + * @param anotherIterator another iterator to compare against, created by or for the same underlying container or sequence + * @result true if |anotherIterator| points to the same position in the underlying container or sequence + */ + boolean isEqualTo(nsISupports anotherIterator); + + /** + * Create a new iterator pointing to the same position in the underlying container or sequence to which this iterator currently points. + * The returned iterator is suitable for use in a subsequent call to |isEqualTo()| against this iterator. + * + * @result a new iterator pointing at the same position in the same underlying container or sequence as this iterator + */ + nsISupports _clone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIForwardIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIForwardIterator.java @@ -0,0 +1,61 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsIterators.idl + */ + +package org.mozilla.interfaces; + +/** + * ... + */ +public interface nsIForwardIterator extends nsISupports { + + String NS_IFORWARDITERATOR_IID = + "{8da01646-1dd2-11b2-98a7-c7009045be7e}"; + + /** + * Retrieve (and |AddRef()|) the element this iterator currently points to. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @result a new reference to the element this iterator currently points to (if any) + */ + nsISupports getElement(); + + /** + * Put |anElementToPut| into the underlying container or sequence at the position currently pointed to by this iterator. + * The iterator and the underlying container or sequence cooperate to |Release()| + * the replaced element, if any and if necessary, and to |AddRef()| the new element. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anElementToPut the element to place into the underlying container or sequence + */ + void putElement(nsISupports anElementToPut); + + /** + * Advance this iterator to the next position in the underlying container or sequence. + */ + void stepForward(); + + /** + * Test if |anotherIterator| points to the same position in the underlying container or sequence. + * + * The result is undefined if |anotherIterator| was not created by or for the same underlying container or sequence. + * + * @param anotherIterator another iterator to compare against, created by or for the same underlying container or sequence + * @result true if |anotherIterator| points to the same position in the underlying container or sequence + */ + boolean isEqualTo(nsISupports anotherIterator); + + /** + * Create a new iterator pointing to the same position in the underlying container or sequence to which this iterator currently points. + * The returned iterator is suitable for use in a subsequent call to |isEqualTo()| against this iterator. + * + * @result a new iterator pointing at the same position in the same underlying container or sequence as this iterator + */ + nsISupports _clone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIBidirectionalIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIBidirectionalIterator.java @@ -0,0 +1,66 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsIterators.idl + */ + +package org.mozilla.interfaces; + +/** + * ... + */ +public interface nsIBidirectionalIterator extends nsISupports { + + String NS_IBIDIRECTIONALITERATOR_IID = + "{948defaa-1dd1-11b2-89f6-8ce81f5ebda9}"; + + /** + * Retrieve (and |AddRef()|) the element this iterator currently points to. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @result a new reference to the element this iterator currently points to (if any) + */ + nsISupports getElement(); + + /** + * Put |anElementToPut| into the underlying container or sequence at the position currently pointed to by this iterator. + * The iterator and the underlying container or sequence cooperate to |Release()| + * the replaced element, if any and if necessary, and to |AddRef()| the new element. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anElementToPut the element to place into the underlying container or sequence + */ + void putElement(nsISupports anElementToPut); + + /** + * Advance this iterator to the next position in the underlying container or sequence. + */ + void stepForward(); + + /** + * Move this iterator to the previous position in the underlying container or sequence. + */ + void stepBackward(); + + /** + * Test if |anotherIterator| points to the same position in the underlying container or sequence. + * + * The result is undefined if |anotherIterator| was not created by or for the same underlying container or sequence. + * + * @param anotherIterator another iterator to compare against, created by or for the same underlying container or sequence + * @result true if |anotherIterator| points to the same position in the underlying container or sequence + */ + boolean isEqualTo(nsISupports anotherIterator); + + /** + * Create a new iterator pointing to the same position in the underlying container or sequence to which this iterator currently points. + * The returned iterator is suitable for use in a subsequent call to |isEqualTo()| against this iterator. + * + * @result a new iterator pointing at the same position in the same underlying container or sequence as this iterator + */ + nsISupports _clone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRandomAccessIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRandomAccessIterator.java @@ -0,0 +1,110 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsIterators.idl + */ + +package org.mozilla.interfaces; + +/** + * ... + */ +public interface nsIRandomAccessIterator extends nsISupports { + + String NS_IRANDOMACCESSITERATOR_IID = + "{9bd6fdb0-1dd1-11b2-9101-d15375968230}"; + + /** + * Retrieve (and |AddRef()|) the element this iterator currently points to. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @result a new reference to the element this iterator currently points to (if any) + */ + nsISupports getElement(); + + /** + * Retrieve (and |AddRef()|) an element at some offset from where this iterator currently points. + * The offset may be negative. |getElementAt(0)| is equivalent to |getElement()|. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anOffset a |0|-based offset from the position to which this iterator currently points + * @result a new reference to the indicated element (if any) + */ + nsISupports getElementAt(int anOffset); + + /** + * Put |anElementToPut| into the underlying container or sequence at the position currently pointed to by this iterator. + * The iterator and the underlying container or sequence cooperate to |Release()| + * the replaced element, if any and if necessary, and to |AddRef()| the new element. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anElementToPut the element to place into the underlying container or sequence + */ + void putElement(nsISupports anElementToPut); + + /** + * Put |anElementToPut| into the underlying container or sequence at the position |anOffset| away from that currently pointed to by this iterator. + * The iterator and the underlying container or sequence cooperate to |Release()| + * the replaced element, if any and if necessary, and to |AddRef()| the new element. + * |putElementAt(0, obj)| is equivalent to |putElement(obj)|. + * + * The result is undefined if this iterator currently points outside the + * useful range of the underlying container or sequence. + * + * @param anOffset a |0|-based offset from the position to which this iterator currently points + * @param anElementToPut the element to place into the underlying container or sequence + */ + void putElementAt(int anOffset, nsISupports anElementToPut); + + /** + * Advance this iterator to the next position in the underlying container or sequence. + */ + void stepForward(); + + /** + * Move this iterator by |anOffset| positions in the underlying container or sequence. + * |anOffset| may be negative. |stepForwardBy(1)| is equivalent to |stepForward()|. + * |stepForwardBy(0)| is a no-op. + * + * @param anOffset a |0|-based offset from the position to which this iterator currently points + */ + void stepForwardBy(int anOffset); + + /** + * Move this iterator to the previous position in the underlying container or sequence. + */ + void stepBackward(); + + /** + * Move this iterator backwards by |anOffset| positions in the underlying container or sequence. + * |anOffset| may be negative. |stepBackwardBy(1)| is equivalent to |stepBackward()|. + * |stepBackwardBy(n)| is equivalent to |stepForwardBy(-n)|. |stepBackwardBy(0)| is a no-op. + * + * @param anOffset a |0|-based offset from the position to which this iterator currently points + */ + void stepBackwardBy(int anOffset); + + /** + * Test if |anotherIterator| points to the same position in the underlying container or sequence. + * + * The result is undefined if |anotherIterator| was not created by or for the same underlying container or sequence. + * + * @param anotherIterator another iterator to compare against, created by or for the same underlying container or sequence + * @result true if |anotherIterator| points to the same position in the underlying container or sequence + */ + boolean isEqualTo(nsISupports anotherIterator); + + /** + * Create a new iterator pointing to the same position in the underlying container or sequence to which this iterator currently points. + * The returned iterator is suitable for use in a subsequent call to |isEqualTo()| against this iterator. + * + * @result a new iterator pointing at the same position in the same underlying container or sequence as this iterator + */ + nsISupports _clone(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsITimelineService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsITimelineService.java @@ -0,0 +1,81 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsITimelineService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsITimelineService is used to constuct a timeline of program + * execution. The timeline is output to a file, either stderr or the + * value of the environment variable NS_TIMELINE_LOG_FILE. On the + * Mac, the timeline is output to the file named "timeline.txt". The + * reason it's different on the Mac is that the Mac environment + * initialization code happens after timeline initialization code. + * + * If NS_TIMELINE_INIT_TIME is set in the environment, that will be + * used as the time of startup; otherwise the current time when mark() + * is first called will be used. + * + * mark() is used to put marks on the timeline. + * + * indent() and outdent() are used to format the timeline a bit to + * show nesting. This doesn't produce perfect results in the face of + * asychrony and multiple threads. + * + * enter() and leave() are convenience functions that add marks to the + * timeline and do indentation. + * + * startTimer() and stopTimer() control named stop watches. If + * startTimer() is called more than once, an equal number of + * stopTimer() calls are needed to actually stop the timer. This + * makes these timers slightly useful in a threaded environment. + * + * markTimer() puts a mark on the timeline containing the total for + * the named timer. + * + * Don't use nsITimelineService in C++ code; use the NS_TIMELINE + * macros instead. nsITimelineService exists so that JavaScript code + * can mark the timeline. + */ +public interface nsITimelineService extends nsISupports { + + String NS_ITIMELINESERVICE_IID = + "{93276790-3daf-11d5-b67d-000064657374}"; + + /** + * mark() + * Print ": \n" in the timeline log file. + */ + void mark(String text); + + /** + * causes subsequent marks to be indented for a more readable + * report. + */ + void indent(); + + /** + * Causes subsequent marks to be outdented. + */ + void outdent(); + + /** + * enter/leave bracket code with "..." and "..." as + * well as indentation. + */ + void enter(String text); + + void leave(String text); + + void startTimer(String timerName); + + void stopTimer(String timerName); + + void markTimer(String timerName); + + void resetTimer(String timerName); + + void markTimerWithComment(String timerName, String comment); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIArray.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIArray.java @@ -0,0 +1,91 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIArray.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIArray + * + * An indexed collection of elements. Provides basic functionality for + * retrieving elements at a specific position, searching for + * elements. Indexes are zero-based, such that the last element in the + * array is stored at the index length-1. + * + * For an array which can be modified, see nsIMutableArray below. + * + * Neither interface makes any attempt to protect the individual + * elements from modification. The convention is that the elements of + * the array should not be modified. Documentation within a specific + * interface should describe variations from this convention. + * + * It is also convention that if an interface provides access to an + * nsIArray, that the array should not be QueryInterfaced to an + * nsIMutableArray for modification. If the interface in question had + * intended the array to be modified, it would have returned an + * nsIMutableArray! + * + * null is a valid entry in the array, and as such any nsISupports + * parameters may be null, except where noted. + * + * @status UNDER_REVIEW + */ +public interface nsIArray extends nsISupports { + + String NS_IARRAY_IID = + "{114744d9-c369-456e-b55a-52fe52880d2d}"; + + /** + * length + * + * number of elements in the array. + */ + long getLength(); + + /** + * queryElementAt() + * + * Retrieve a specific element of the array, and QueryInterface it + * to the specified interface. null is a valid result for + * this method, but exceptions are thrown in other circumstances + * + * @param index position of element + * @param uuid the IID of the requested interface + * @param result the object, QI'd to the requested interface + * + * @throws NS_ERROR_NO_INTERFACE when an entry exists at the + * specified index, but the requested interface is not + * available. + * @throws NS_ERROR_ILLEGAL_VALUE when index > length-1 + * + */ + nsISupports queryElementAt(long index, String uuid); + + /** + * indexOf() + * + * Get the position of a specific element. Note that since null is + * a valid input, exceptions are used to indicate that an element + * is not found. + * + * @param startIndex The initial element to search in the array + * To start at the beginning, use 0 as the + * startIndex + * @param element The element you are looking for + * @returns a number >= startIndex which is the position of the + * element in the array. + * @throws NS_ERROR_NOT_FOUND if the element was not in the array. + */ + long indexOf(long startIndex, nsISupports element); + + /** + * enumerate the array + * + * @returns a new enumerator positioned at the start of the array + * @throws NS_ERROR_FAILURE if the array is empty (to make it easy + * to detect errors) + */ + nsISimpleEnumerator enumerate(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIMutableArray.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIMutableArray.java @@ -0,0 +1,112 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIArray.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIMutableArray + * A separate set of methods that will act on the array. Consumers of + * nsIArray should not QueryInterface to nsIMutableArray unless they + * own the array. + * + * As above, it is legal to add null elements to the array. Note also + * that null elements can be created as a side effect of + * insertElementAt(). Conversely, if insertElementAt() is never used, + * and null elements are never explicitly added to the array, then it + * is guaranteed that queryElementAt() will never return a null value. + * + * Any of these methods may throw NS_ERROR_OUT_OF_MEMORY when the + * array must grow to complete the call, but the allocation fails. + * + * @status UNDER_REVIEW + */ +public interface nsIMutableArray extends nsIArray { + + String NS_IMUTABLEARRAY_IID = + "{af059da0-c85b-40ec-af07-ae4bfdc192cc}"; + + /** + * appendElement() + * + * Append an element at the end of the array. + * + * @param element The element to append. + * @param weak Whether or not to store the element using a weak + * reference. + * @throws NS_ERROR_FAILURE when a weak reference is requested, + * but the element does not support + * nsIWeakReference. + */ + void appendElement(nsISupports element, boolean weak); + + /** + * removeElementAt() + * + * Remove an element at a specific position, moving all elements + * stored at a higher position down one. + * To remove a specific element, use indexOf() to find the index + * first, then call removeElementAt(). + * + * @param index the position of the item + * + */ + void removeElementAt(long index); + + /** + * insertElementAt() + * + * Insert an element at the given position, moving the element + * currently located in that position, and all elements in higher + * position, up by one. + * + * @param element The element to insert + * @param index The position in the array: + * If the position is lower than the current length + * of the array, the elements at that position and + * onwards are bumped one position up. + * If the position is equal to the current length + * of the array, the new element is appended. + * An index lower than 0 or higher than the current + * length of the array is invalid and will be ignored. + * + * @throws NS_ERROR_FAILURE when a weak reference is requested, + * but the element does not support + * nsIWeakReference. + */ + void insertElementAt(nsISupports element, long index, boolean weak); + + /** + * replaceElementAt() + * + * Replace the element at the given position. + * + * @param element The new element to insert + * @param index The position in the array + * If the position is lower than the current length + * of the array, an existing element will be replaced. + * If the position is equal to the current length + * of the array, the new element is appended. + * If the position is higher than the current length + * of the array, empty elements are appended followed + * by the new element at the specified position. + * An index lower than 0 is invalid and will be ignored. + * + * @param weak Whether or not to store the new element using a weak + * reference. + * + * @throws NS_ERROR_FAILURE when a weak reference is requested, + * but the element does not support + * nsIWeakReference. + */ + void replaceElementAt(nsISupports element, long index, boolean weak); + + /** + * clear() + * + * clear the entire array, releasing all stored objects + */ + void clear(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIObserverService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIObserverService.java @@ -0,0 +1,71 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIObserverService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIObserverService + * + * Service allows a client listener (nsIObserver) to register and unregister for + * notifications of specific string referenced topic. Service also provides a + * way to notify registered listeners and a way to enumerate registered client + * listeners. + * + * @status FROZEN + */ +public interface nsIObserverService extends nsISupports { + + String NS_IOBSERVERSERVICE_IID = + "{d07f5192-e3d1-11d2-8acd-00105a1b8860}"; + + /** + * AddObserver + * + * Registers a given listener for a notifications regarding the specified + * topic. + * + * @param anObserve : The interface pointer which will receive notifications. + * @param aTopic : The notification topic or subject. + * @param ownsWeak : If set to false, the nsIObserverService will hold a + * strong reference to |anObserver|. If set to true and + * |anObserver| supports the nsIWeakReference interface, + * a weak reference will be held. Otherwise an error will be + * returned. + */ + void addObserver(nsIObserver anObserver, String aTopic, boolean ownsWeak); + + /** + * removeObserver + * + * Unregisters a given listener from notifications regarding the specified + * topic. + * + * @param anObserver : The interface pointer which will stop recieving + * notifications. + * @param aTopic : The notification topic or subject. + */ + void removeObserver(nsIObserver anObserver, String aTopic); + + /** + * notifyObservers + * + * Notifies all registered listeners of the given topic. + * + * @param aSubject : Notification specific interface pointer. + * @param aTopic : The notification topic or subject. + * @param someData : Notification specific wide string. + */ + void notifyObservers(nsISupports aSubject, String aTopic, String someData); + + /** + * enumerateObservers + * + * Returns an enumeration of all registered listeners. + * + * @param aTopic : The notification topic or subject. + */ + nsISimpleEnumerator enumerateObservers(String aTopic); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIObserver.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIObserver.java @@ -0,0 +1,38 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIObserver.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface is implemented by an object that wants + * to observe an event corresponding to a topic. + * + * @status FROZEN + */ +public interface nsIObserver extends nsISupports { + + String NS_IOBSERVER_IID = + "{db242e01-e4d9-11d2-9dde-000064657374}"; + + /** + * Observe will be called when there is a notification for the + * topic |aTopic|. This assumes that the object implementing + * this interface has been registered with an observer service + * such as the nsIObserverService. + * + * If you expect multiple topics/subjects, the impl is + * responsible for filtering. + * + * You should not modify, add, remove, or enumerate + * notifications in the implemention of observe. + * + * @param aSubject : Notification specific interface pointer. + * @param aTopic : The notification topic or subject. + * @param aData : Notification specific wide string. + * subject event. + */ + void observe(nsISupports aSubject, String aTopic, String aData); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProperties.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProperties.java @@ -0,0 +1,44 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProperties.idl + */ + +package org.mozilla.interfaces; + +public interface nsIProperties extends nsISupports { + + String NS_IPROPERTIES_IID = + "{78650582-4e93-4b60-8e85-26ebd3eb14ca}"; + + /** + * Gets a property with a given name. + * + * @return NS_ERROR_FAILURE if a property with that name doesn't exist. + * @return NS_ERROR_NO_INTERFACE if the found property fails to QI to the + * given iid. + */ + nsISupports get(String prop, String iid); + + /** + * Sets a property with a given name to a given value. + */ + void set(String prop, nsISupports value); + + /** + * Returns true if the property with the given name exists. + */ + boolean has(String prop); + + /** + * Undefines a property. + * @return NS_ERROR_FAILURE if a property with that name doesn't + * already exist. + */ + void undefine(String prop); + + /** + * Returns an array of the keys. + */ + String[] getKeys(long[] count); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISimpleEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISimpleEnumerator.java @@ -0,0 +1,52 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISimpleEnumerator.idl + */ + +package org.mozilla.interfaces; + +/** + * Used to enumerate over elements defined by its implementor. + * Although hasMoreElements() can be called independently of getNext(), + * getNext() must be pre-ceeded by a call to hasMoreElements(). There is + * no way to "reset" an enumerator, once you obtain one. + * + * @status FROZEN + * @version 1.0 + */ +public interface nsISimpleEnumerator extends nsISupports { + + String NS_ISIMPLEENUMERATOR_IID = + "{d1899240-f9d2-11d2-bdd6-000064657374}"; + + /** + * Called to determine whether or not the enumerator has + * any elements that can be returned via getNext(). This method + * is generally used to determine whether or not to initiate or + * continue iteration over the enumerator, though it can be + * called without subsequent getNext() calls. Does not affect + * internal state of enumerator. + * + * @see getNext() + * @return PR_TRUE if there are remaining elements in the enumerator. + * PR_FALSE if there are no more elements in the enumerator. + */ + boolean hasMoreElements(); + + /** + * Called to retrieve the next element in the enumerator. The "next" + * element is the first element upon the first call. Must be + * pre-ceeded by a call to hasMoreElements() which returns PR_TRUE. + * This method is generally called within a loop to iterate over + * the elements in the enumerator. + * + * @see hasMoreElements() + * @return NS_OK if the call succeeded in returning a non-null + * value through the out parameter. + * NS_ERROR_FAILURE if there are no more elements + * to enumerate. + * @return the next element in the enumeration. + */ + nsISupports getNext(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPrimitive.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPrimitive.java @@ -0,0 +1,57 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Primitive base interface. + * + * These first three are pointer types and do data copying + * using the nsIMemory. Be careful! + * + * @status FROZEN + */ +public interface nsISupportsPrimitive extends nsISupports { + + String NS_ISUPPORTSPRIMITIVE_IID = + "{d0d4b136-1dd1-11b2-9371-f0727ef827c0}"; + + int TYPE_ID = 1; + + int TYPE_CSTRING = 2; + + int TYPE_STRING = 3; + + int TYPE_PRBOOL = 4; + + int TYPE_PRUINT8 = 5; + + int TYPE_PRUINT16 = 6; + + int TYPE_PRUINT32 = 7; + + int TYPE_PRUINT64 = 8; + + int TYPE_PRTIME = 9; + + int TYPE_CHAR = 10; + + int TYPE_PRINT16 = 11; + + int TYPE_PRINT32 = 12; + + int TYPE_PRINT64 = 13; + + int TYPE_FLOAT = 14; + + int TYPE_DOUBLE = 15; + + int TYPE_VOID = 16; + + int TYPE_INTERFACE_POINTER = 17; + + int getType(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsID.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsID.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for nsID structures + * + * @status FROZEN + */ +public interface nsISupportsID extends nsISupportsPrimitive { + + String NS_ISUPPORTSID_IID = + "{d18290a0-4a1c-11d3-9890-006008962422}"; + + String getData(); + + void setData(String aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsCString.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsCString.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for ASCII strings + * + * @status FROZEN + */ +public interface nsISupportsCString extends nsISupportsPrimitive { + + String NS_ISUPPORTSCSTRING_IID = + "{d65ff270-4a1c-11d3-9890-006008962422}"; + + String getData(); + + void setData(String aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsString.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsString.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for Unicode strings + * + * @status FROZEN + */ +public interface nsISupportsString extends nsISupportsPrimitive { + + String NS_ISUPPORTSSTRING_IID = + "{d79dc970-4a1c-11d3-9890-006008962422}"; + + String getData(); + + void setData(String aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRBool.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRBool.java @@ -0,0 +1,27 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * The rest are truly primitive and are passed by value + */ +/** + * Scriptable storage for booleans + * + * @status FROZEN + */ +public interface nsISupportsPRBool extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRBOOL_IID = + "{ddc3b490-4a1c-11d3-9890-006008962422}"; + + boolean getData(); + + void setData(boolean aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint8.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint8.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for 8-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRUint8 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRUINT8_IID = + "{dec2e4e0-4a1c-11d3-9890-006008962422}"; + + short getData(); + + void setData(short aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint16.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint16.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for unsigned 16-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRUint16 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRUINT16_IID = + "{dfacb090-4a1c-11d3-9890-006008962422}"; + + int getData(); + + void setData(int aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint32.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint32.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for unsigned 32-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRUint32 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRUINT32_IID = + "{e01dc470-4a1c-11d3-9890-006008962422}"; + + long getData(); + + void setData(long aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint64.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRUint64.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for 64-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRUint64 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRUINT64_IID = + "{e13567c0-4a1c-11d3-9890-006008962422}"; + + double getData(); + + void setData(double aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRTime.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRTime.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for NSPR date/time values + * + * @status FROZEN + */ +public interface nsISupportsPRTime extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRTIME_IID = + "{e2563630-4a1c-11d3-9890-006008962422}"; + + double getData(); + + void setData(double aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsChar.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsChar.java @@ -0,0 +1,25 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for single character values + * (often used to store an ASCII character) + * + * @status FROZEN + */ +public interface nsISupportsChar extends nsISupportsPrimitive { + + String NS_ISUPPORTSCHAR_IID = + "{e2b05e40-4a1c-11d3-9890-006008962422}"; + + char getData(); + + void setData(char aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt16.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt16.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for 16-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRInt16 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRINT16_IID = + "{e30d94b0-4a1c-11d3-9890-006008962422}"; + + short getData(); + + void setData(short aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt32.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt32.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for 32-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRInt32 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRINT32_IID = + "{e36c5250-4a1c-11d3-9890-006008962422}"; + + int getData(); + + void setData(int aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt64.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPRInt64.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for 64-bit integers + * + * @status FROZEN + */ +public interface nsISupportsPRInt64 extends nsISupportsPrimitive { + + String NS_ISUPPORTSPRINT64_IID = + "{e3cb0ff0-4a1c-11d3-9890-006008962422}"; + + long getData(); + + void setData(long aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsFloat.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsFloat.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for floating point numbers + * + * @status FROZEN + */ +public interface nsISupportsFloat extends nsISupportsPrimitive { + + String NS_ISUPPORTSFLOAT_IID = + "{abeaa390-4ac0-11d3-baea-00805f8a5dd7}"; + + float getData(); + + void setData(float aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsDouble.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsDouble.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for doubles + * + * @status FROZEN + */ +public interface nsISupportsDouble extends nsISupportsPrimitive { + + String NS_ISUPPORTSDOUBLE_IID = + "{b32523a0-4ac0-11d3-baea-00805f8a5dd7}"; + + double getData(); + + void setData(double aData); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsVoid.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsVoid.java @@ -0,0 +1,20 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for generic pointers + * + * @status FROZEN + */ +public interface nsISupportsVoid extends nsISupportsPrimitive { + + String NS_ISUPPORTSVOID_IID = + "{464484f0-568d-11d3-baf8-00805f8a5dd7}"; + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsInterfacePointer.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsInterfacePointer.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPrimitives.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable storage for other XPCOM objects + * + * @status FROZEN + */ +public interface nsISupportsInterfacePointer extends nsISupportsPrimitive { + + String NS_ISUPPORTSINTERFACEPOINTER_IID = + "{995ea724-1dd1-11b2-9211-c21bdd3e7ed0}"; + + nsISupports getData(); + + void setData(nsISupports aData); + + String getDataIID(); + + void setDataIID(String aDataIID); + + String toString(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIBinaryInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIBinaryInputStream.java @@ -0,0 +1,60 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIBinaryInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface allows consumption of primitive data types from a "binary + * stream" containing untagged, big-endian binary data, i.e. as produced by an + * implementation of nsIBinaryOutputStream. This might be used, for example, + * to implement network protocols or to read from architecture-neutral disk + * files, i.e. ones that can be read and written by both big-endian and + * little-endian platforms. + * + * @See nsIBinaryOutputStream + */ +public interface nsIBinaryInputStream extends nsIInputStream { + + String NS_IBINARYINPUTSTREAM_IID = + "{7b456cb0-8772-11d3-90cf-0040056a906e}"; + + void setInputStream(nsIInputStream aInputStream); + + boolean readBoolean(); + + short read8(); + + int read16(); + + long read32(); + + double read64(); + + float readFloat(); + + double readDouble(); + + /** + * Read a NUL-terminated 8-bit char* string from a binary stream. + */ + String readCString(); + + /** + * Read a NUL-terminated 16-bit PRUnichar* string from a binary stream. + */ + String readString(); + + /** + * Read an opaque byte array from a binary stream. + */ + String readBytes(long aLength); + + /** + * Read an opaque byte array from a binary stream, storing the results + * as an array of PRUint8s. + */ + byte[] readByteArray(long aLength); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIBinaryOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIBinaryOutputStream.java @@ -0,0 +1,66 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIBinaryOutputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface allows writing of primitive data types (integers, + * floating-point values, booleans, etc.) to a stream in a binary, untagged, + * fixed-endianness format. This might be used, for example, to implement + * network protocols or to produce architecture-neutral binary disk files, + * i.e. ones that can be read and written by both big-endian and little-endian + * platforms. Output is written in big-endian order (high-order byte first), + * as this is traditional network order. + * + * @See nsIBinaryInputStream + */ +public interface nsIBinaryOutputStream extends nsIOutputStream { + + String NS_IBINARYOUTPUTSTREAM_IID = + "{204ee610-8765-11d3-90cf-0040056a906e}"; + + void setOutputStream(nsIOutputStream aOutputStream); + + void writeBoolean(boolean aBoolean); + + void write8(short aByte); + + void write16(int a16); + + void write32(long a32); + + void write64(double a64); + + void writeFloat(float aFloat); + + void writeDouble(double aDouble); + + /** + * Write a NUL-terminated 8-bit char* string to a binary stream. + */ + void writeStringZ(String aString); + + /** + * Write a NUL-terminated 16-bit PRUnichar* string to a binary stream. + */ + void writeWStringZ(String aString); + + /** + * Write a NUL-terminated UTF8-encoded string to a binary stream, produced + * from a NUL-terminated 16-bit PRUnichar* string argument. + */ + void writeUtf8Z(String aString); + + /** + * Write an opaque byte array to a binary stream. + */ + void writeBytes(String aString, long aLength); + + /** + * Write an opaque byte array to a binary stream. + */ + void writeByteArray(byte[] aBytes, long aLength); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIByteArrayInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIByteArrayInputStream.java @@ -0,0 +1,13 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIByteArrayInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIByteArrayInputStream extends nsIInputStream { + + String NS_IBYTEARRAYINPUTSTREAM_IID = + "{b5a21556-35fc-4815-aff1-f9142639686e}"; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDirectoryEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDirectoryEnumerator.java @@ -0,0 +1,36 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIDirectoryEnumerator.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface provides a means for enumerating the contents of a directory. + * It is similar to nsISimpleEnumerator except the retrieved entries are QI'ed + * to nsIFile, and there is a mechanism for closing the directory when the + * enumeration is complete. + * + * @status UNDER_REVIEW + */ +public interface nsIDirectoryEnumerator extends nsISupports { + + String NS_IDIRECTORYENUMERATOR_IID = + "{31f7f4ae-6916-4f2d-a81e-926a4e3022ee}"; + + /** + * Retrieves the next file in the sequence. The "nextFile" element is the + * first element upon the first call. This attribute is null if there is no + * next element. + */ + nsIFile getNextFile(); + + /** + * Closes the directory being enumerated, releasing the system resource. + * @throws NS_OK if the call succeeded and the directory was closed. + * NS_ERROR_FAILURE if the directory close failed. + * It is safe to call this function many times. + */ + void close(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFastLoadFileControl.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFastLoadFileControl.java @@ -0,0 +1,67 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFastLoadFileControl.idl + */ + +package org.mozilla.interfaces; + +/** + * The nsIFastLoadFileControl interface and its subinterfaces are mix-ins for + * classes implementing nsIObjectInputStream and nsIObjectOutputStream, so that + * those stream types can be used with nsIFastLoadService to access and compute + * FastLoad file checksums, update and check FastLoad file dependencies, and + * multiplex documents loaded via non-blocking i/o. + * + * If an nsIObjectInputStream class doesn't support nsIFastLoadReadControl, or + * an nsIObjectOutputStream class doesn't support nsIFastLoadWriteControl, that + * implementation may still be useful for object serialization, but it can't be + * used to read or write a Mozilla FastLoad file. + */ +public interface nsIFastLoadFileControl extends nsISupports { + + String NS_IFASTLOADFILECONTROL_IID = + "{8a1e2c63-af50-4147-af7e-26289dc180dd}"; + + /** + * Get and set the recorded checksum value from the FastLoad file header. + */ + long getChecksum(); + + /** + * Get and set the recorded checksum value from the FastLoad file header. + */ + void setChecksum(long aChecksum); + + /** + * Multiplexed document control methods. A FastLoad file may contain + * multiple interleaved documents identified by a URI specifier string, + * and indexed for fast multiplexor select by an opaque URI object key. + * You StartMuxedDocument when initiating a document load, then Select + * before every batch of calls to (de)serialize document data, and End + * when the load completes. + * + * Document multiplexing is necessary to support incremental FastLoad + * development in a non-blocking i/o architecture such as Mozilla, where + * some (but not all, at first, or for a while during development) of the + * results of parsing and compiling various inputs can be multiplexed to + * or from a FastLoad file. + * + * Note: Select returns the previously selected URI object in case the + * caller is synchronously selecting and writing data to the FastLoad + * file, so the caller can reselect the previous URI and return to code + * the continues to write FastLoad data for the previous URI, unaware of + * the nested select/write/reselect. + */ + void startMuxedDocument(nsISupports aURI, String aURISpec); + + nsISupports selectMuxedDocument(nsISupports aURI); + + void endMuxedDocument(nsISupports aURI); + + /** + * Return true if aURISpec identifies a muxed document in the FastLoad + * file, false otherwise. + */ + boolean hasMuxedDocument(String aURISpec); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFastLoadReadControl.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFastLoadReadControl.java @@ -0,0 +1,27 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFastLoadFileControl.idl + */ + +package org.mozilla.interfaces; + +public interface nsIFastLoadReadControl extends nsIFastLoadFileControl { + + String NS_IFASTLOADREADCONTROL_IID = + "{652ecec6-d40b-45b6-afef-641d6c63a35b}"; + + /** + * Computes the correct checksum of the FastLoad file, independent of the + * header's checksum value. The header checksum field is treated as zero + * when computing the checksum. + */ + long computeChecksum(); + + /** + * Get the collection of dependency nsIFile instances recorded during the + * FastLoad file write or read/update process, and checked during the read + * process to invalidate the FastLoad file if any dependencies are newer. + */ + nsISimpleEnumerator getDependencies(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFastLoadWriteControl.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFastLoadWriteControl.java @@ -0,0 +1,20 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFastLoadFileControl.idl + */ + +package org.mozilla.interfaces; + +public interface nsIFastLoadWriteControl extends nsIFastLoadFileControl { + + String NS_IFASTLOADWRITECONTROL_IID = + "{2ad6e9e6-1379-4e45-a899-a54b27ff915c}"; + + /** + * Add a file dependency of the FastLoad file (e.g., a .jar file) to the + * set of dependencies that trigger regeneration if any dependency has a + * last-modified-time greater than the FastLoad file's mtime. + */ + void addDependency(nsIFile aFile); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFastLoadFileIO.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFastLoadFileIO.java @@ -0,0 +1,17 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFastLoadService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIFastLoadFileIO extends nsISupports { + + String NS_IFASTLOADFILEIO_IID = + "{715577db-d9c5-464a-a32e-0a40c29b22d4}"; + + nsIInputStream getInputStream(); + + nsIOutputStream getOutputStream(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFastLoadService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFastLoadService.java @@ -0,0 +1,70 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFastLoadService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIFastLoadService extends nsISupports { + + String NS_IFASTLOADSERVICE_IID = + "{759e475e-0c23-4dbf-b1b8-78c9369e3072}"; + + nsIFile newFastLoadFile(String aBaseName); + + nsIObjectInputStream newInputStream(nsIInputStream aSrcStream); + + nsIObjectOutputStream newOutputStream(nsIOutputStream aDestStream); + + int NS_FASTLOAD_READ = 1; + + int NS_FASTLOAD_WRITE = 2; + + nsIObjectInputStream getInputStream(); + + void setInputStream(nsIObjectInputStream aInputStream); + + nsIObjectOutputStream getOutputStream(); + + void setOutputStream(nsIObjectOutputStream aOutputStream); + + nsIFastLoadFileIO getFileIO(); + + void setFileIO(nsIFastLoadFileIO aFileIO); + + int getDirection(); + + /** + * These methods associate a URI object with its spec, for faster select + * using the object pointer as a key, rather than the spec string. The + * selectMuxedDocument method returns the previously selected URI object, + * in case a caller needs to reselect the previous after muxing data for + * a given URI synchronously. For the non-blocking or "asynchronous" i/o + * case, the caller must select the source URI from the FastLoad multiplex + * before writing a new burst of data parsed from the slow-loaded source. + * + * Clients of inputStream and outputStream should try to demultiplex data + * from the input stream only if fastLoadService->StartMuxedDocument(uri, + * urispec, NS_FASTLOAD_READ) succeeds. If StartMuxedDocument fails with + * NS_ERROR_NOT_AVAILABLE, callers should slow-load the documents, muxing + * their data to the current output stream. + */ + void startMuxedDocument(nsISupports aURI, String aURISpec, int aDirectionFlags); + + nsISupports selectMuxedDocument(nsISupports aURI); + + void endMuxedDocument(nsISupports aURI); + + void addDependency(nsIFile aFile); + + long computeChecksum(nsIFile aFile, nsIFastLoadReadControl aControl); + + void cacheChecksum(nsIFile aFile, nsIObjectOutputStream aStream); + + /** + * Return true if aURISpec identifies a muxed document in the FastLoad + * file, false otherwise. + */ + boolean hasMuxedDocument(String aURISpec); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIInputStreamTee.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIInputStreamTee.java @@ -0,0 +1,26 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIInputStreamTee.idl + */ + +package org.mozilla.interfaces; + +/** + * A nsIInputStreamTee is a wrapper for an input stream, that when read + * reads the specified amount of data from its |source| and copies that + * data to its |sink|. |sink| must be a blocking output stream. + */ +public interface nsIInputStreamTee extends nsIInputStream { + + String NS_IINPUTSTREAMTEE_IID = + "{44e8b2c8-1ecb-4a63-8b23-3e3500c34f32}"; + + nsIInputStream getSource(); + + void setSource(nsIInputStream aSource); + + nsIOutputStream getSink(); + + void setSink(nsIOutputStream aSink); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsILocalFileWin.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsILocalFileWin.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsILocalFileWin.idl + */ + +package org.mozilla.interfaces; + +public interface nsILocalFileWin extends nsILocalFile { + + String NS_ILOCALFILEWIN_IID = + "{dc42f467-4094-437d-9e3e-8912a072aede}"; + + /** + * getVersionInfoValue + * + * Retrieve a metadata field from the file's VERSIONINFO block. + * Throws NS_ERROR_FAILURE if no value is found, or the value is empty. + * + * @param aField The field to look up. + * + */ + String getVersionInfoField(String aField); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsILineInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsILineInputStream.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsILineInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsILineInputStream extends nsISupports { + + String NS_ILINEINPUTSTREAM_IID = + "{c97b466c-1e6e-4773-a4ab-2b2b3190a7a6}"; + + /** + * Read a single line from the stream, where a line is a + * possibly zero length sequence of 8bit chars terminated by a + * CR, LF, CRLF, LFCR, or eof. + * The line terminator is not returned. + * @retval false + * End of file. This line is the last line of the file + * (aLine is valid). + * @retval true + * The file contains further lines. + * @note Do not mix readLine with other read functions. + * Doing so can cause various problems and is not supported. + */ + boolean readLine(String[] aLine); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIUnicharLineInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIUnicharLineInputStream.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIUnicharLineInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIUnicharLineInputStream extends nsISupports { + + String NS_IUNICHARLINEINPUTSTREAM_IID = + "{67f42475-ba80-40f8-ac0b-649c89230184}"; + + /** + * Read a single line from the stream, where a line is a + * possibly zero length sequence of characters terminated by a + * CR, LF, CRLF, LFCR, or eof. + * The line terminator is not returned. + * @retval false + * End of file. This line is the last line of the file + * (aLine is valid). + * @retval true + * The file contains further lines. + * @note Do not mix readLine with other read functions. + * Doing so can cause various problems and is not supported. + */ + boolean readLine(String[] aLine); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIMultiplexInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIMultiplexInputStream.java @@ -0,0 +1,57 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIMultiplexInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * The multiplex stream concatinates a list of input streams into a single + * stream. + */ +public interface nsIMultiplexInputStream extends nsIInputStream { + + String NS_IMULTIPLEXINPUTSTREAM_IID = + "{a076fd12-1dd1-11b2-b19a-d53b5dffaade}"; + + /** + * Number of streams in this multiplex-stream + */ + long getCount(); + + /** + * Appends a stream to the end of the streams. The cursor of the stream + * should be located at the beginning of the stream if the implementation + * of this nsIMultiplexInputStream also is used as an nsISeekableStream. + * @param stream stream to append + */ + void appendStream(nsIInputStream stream); + + /** + * Insert a stream at specified index. If the cursor of this stream is at + * the beginning of the stream at index, the cursor will be placed at the + * beginning of the inserted stream instead. + * The cursor of the new stream should be located at the beginning of the + * stream if the implementation of this nsIMultiplexInputStream also is + * used as an nsISeekableStream. + * @param stream stream to insert + * @param index index to insert stream at, must be <= count + */ + void insertStream(nsIInputStream stream, long index); + + /** + * Remove stream at specified index. If this stream is the one currently + * being read the readcursor is moved to the beginning of the next + * stream + * @param index remove stream at this index, must be < count + */ + void removeStream(long index); + + /** + * Get stream at specified index. + * @param index return stream at this index, must be < count + * @return stream at specified index + */ + nsIInputStream getStream(long index); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIObjectInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIObjectInputStream.java @@ -0,0 +1,28 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIObjectInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * @see nsIObjectOutputStream + * @see nsIBinaryInputStream + */ +public interface nsIObjectInputStream extends nsIBinaryInputStream { + + String NS_IOBJECTINPUTSTREAM_IID = + "{6c248606-4eae-46fa-9df0-ba58502368eb}"; + + /** + * Read an object from this stream to satisfy a strong or weak reference + * to one of its interfaces. If the interface was not along the primary + * inheritance chain ending in the "root" or XPCOM-identity nsISupports, + * readObject will QueryInterface from the deserialized object root to the + * correct interface, which was specified when the object was serialized. + * + * @see nsIObjectOutputStream + */ + nsISupports readObject(boolean aIsStrongRef); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIObjectOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIObjectOutputStream.java @@ -0,0 +1,52 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIObjectOutputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * @See nsIObjectInputStream + * @See nsIBinaryOutputStream + */ +public interface nsIObjectOutputStream extends nsIBinaryOutputStream { + + String NS_IOBJECTOUTPUTSTREAM_IID = + "{92c898ac-5fde-4b99-87b3-5d486422094b}"; + + /** + * Write the object whose "root" or XPCOM-identity nsISupports is aObject. + * The cause for writing this object is a strong or weak reference, so the + * aIsStrongRef argument must tell which kind of pointer is being followed + * here during serialization. + * + * If the object has only one strong reference in the serialization and no + * weak refs, use writeSingleRefObject. This is a valuable optimization: + * it saves space in the stream, and cycles on both ends of the process. + * + * If the reference being serialized is a pointer to an interface not on + * the primary inheritance chain ending in the root nsISupports, you must + * call writeCompoundObject instead of this method. + */ + void writeObject(nsISupports aObject, boolean aIsStrongRef); + + /** + * Write an object referenced singly and strongly via its root nsISupports + * or a subclass of its root nsISupports. There must not be other refs to + * aObject in memory, or in the serialization. + */ + void writeSingleRefObject(nsISupports aObject); + + /** + * Write the object referenced by an interface pointer at aObject that + * inherits from a non-primary nsISupports, i.e., a reference to one of + * the multiply inherited interfaces derived from an nsISupports other + * than the root or XPCOM-identity nsISupports; or a reference to an + * inner object in the case of true XPCOM aggregation. aIID identifies + * this interface. + */ + void writeCompoundObject(nsISupports aObject, String aIID, boolean aIsStrongRef); + + void writeID(String aID); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIPipe.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIPipe.java @@ -0,0 +1,56 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPipe.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIPipe represents an in-process buffer that can be read using nsIInputStream + * and written using nsIOutputStream. The reader and writer of a pipe do not + * have to be on the same thread. As a result, the pipe is an ideal mechanism + * to bridge data exchange between two threads. For example, a worker thread + * might write data to a pipe from which the main thread will read. + * + * Each end of the pipe can be either blocking or non-blocking. Recall that a + * non-blocking stream will return NS_BASE_STREAM_WOULD_BLOCK if it cannot be + * read or written to without blocking the calling thread. For example, if you + * try to read from an empty pipe that has not yet been closed, then if that + * pipe's input end is non-blocking, then the read call will fail immediately + * with NS_BASE_STREAM_WOULD_BLOCK as the error condition. However, if that + * pipe's input end is blocking, then the read call will not return until the + * pipe has data or until the pipe is closed. This example presumes that the + * pipe is being filled asynchronously on some background thread. + * + * The pipe supports nsIAsyncInputStream and nsIAsyncOutputStream, which give + * the user of a non-blocking pipe the ability to wait for the pipe to become + * ready again. For example, in the case of an empty non-blocking pipe, the + * user can call AsyncWait on the input end of the pipe to be notified when + * the pipe has data to read (or when the pipe becomes closed). + * + * NS_NewPipe2 and NS_NewPipe provide convenient pipe constructors. In most + * cases nsIPipe is not actually used. It is usually enough to just get + * references to the pipe's input and output end. In which case, the pipe is + * automatically closed when the respective pipe ends are released. + */ +public interface nsIPipe extends nsISupports { + + String NS_IPIPE_IID = + "{f4211abc-61b3-11d4-9877-00c04fa0cf4a}"; + + /** + * initialize this pipe + */ + void init(boolean nonBlockingInput, boolean nonBlockingOutput, long segmentSize, long segmentCount, nsIMemory segmentAllocator); + + /** + * The pipe's input end, which also implements nsISearchableInputStream. + */ + nsIAsyncInputStream getInputStream(); + + /** + * The pipe's output end. + */ + nsIAsyncOutputStream getOutputStream(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISearchableInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISearchableInputStream.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIPipe.idl + */ + +package org.mozilla.interfaces; + +/** + * XXX this interface doesn't really belong in here. It is here because + * currently nsPipeInputStream is the only implementation of this interface. + */ +public interface nsISearchableInputStream extends nsISupports { + + String NS_ISEARCHABLEINPUTSTREAM_IID = + "{8c39ef62-f7c9-11d4-98f5-001083010e9b}"; + + /** + * Searches for a string in the input stream. Since the stream has a notion + * of EOF, it is possible that the string may at some time be in the + * buffer, but is is not currently found up to some offset. Consequently, + * both the found and not found cases return an offset: + * if found, return offset where it was found + * if not found, return offset of the first byte not searched + * In the case the stream is at EOF and the string is not found, the first + * byte not searched will correspond to the length of the buffer. + */ + void search(String forString, boolean ignoreCase, boolean[] found, long[] offsetSearchedTo); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISeekableStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISeekableStream.java @@ -0,0 +1,51 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISeekableStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsISeekableStream extends nsISupports { + + String NS_ISEEKABLESTREAM_IID = + "{8429d350-1040-4661-8b71-f2a6ba455980}"; + + int NS_SEEK_SET = 0; + + int NS_SEEK_CUR = 1; + + int NS_SEEK_END = 2; + + /** + * seek + * + * This method moves the stream offset of the steam implementing this + * interface. + * + * @param whence specifies how to interpret the 'offset' parameter in + * setting the stream offset associated with the implementing + * stream. + * + * @param offset specifies a value, in bytes, that is used in conjunction + * with the 'whence' parameter to set the stream offset of the + * implementing stream. A negative value causes seeking in + * the reverse direction. + */ + void seek(int whence, long offset); + + /** + * tell + * + * This method reports the current offset, in bytes, from the start of the + * stream. + */ + long tell(); + + /** + * setEOF + * + * This method truncates the stream at the current offset. + */ + void setEOF(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIStorageStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIStorageStream.java @@ -0,0 +1,75 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIStorageStream.idl + */ + +package org.mozilla.interfaces; + +/** + * The nsIStorageStream interface maintains an internal data buffer that can be + * filled using a single output stream. One or more independent input streams + * can be created to read the data from the buffer non-destructively. + */ +public interface nsIStorageStream extends nsISupports { + + String NS_ISTORAGESTREAM_IID = + "{604ad9d0-753e-11d3-90ca-34278643278f}"; + + /** + * + * Initialize the stream, setting up the amount of space that will be + * allocated for the stream's backing-store. + * + * @param segmentSize + * Size of each segment. Must be a power of two. + * @param maxSize + * Maximum total size of this stream. length will always be less + * than or equal to this value. Passing PR_UINT32_MAX is safe. + * @param segmentAllocator + * Which allocator to use for the segments. May be null, in which + * case a default allocator will be used. + */ + void init(long segmentSize, long maxSize, nsIMemory segmentAllocator); + + /** + * Get a reference to the one and only output stream for this instance. + * The zero-based startPosition argument is used is used to set the initial + * write cursor position. The startPosition cannot be set larger than the + * current buffer length. Calling this method has the side-effect of + * truncating the internal buffer to startPosition bytes. + */ + nsIOutputStream getOutputStream(int startPosition); + + /** + * Create a new input stream to read data (written by the singleton output + * stream) from the internal buffer. Multiple, independent input streams + * can be created. + */ + nsIInputStream newInputStream(int startPosition); + + /** + * The length attribute indicates the total number of bytes stored in the + * nsIStorageStream internal buffer, regardless of any consumption by input + * streams. Assigning to the length field can be used to truncate the + * buffer data, but can not be used when either the instance's output + * stream is in use. + * + * @See #writeInProgress */ + long getLength(); + + /** + * The length attribute indicates the total number of bytes stored in the + * nsIStorageStream internal buffer, regardless of any consumption by input + * streams. Assigning to the length field can be used to truncate the + * buffer data, but can not be used when either the instance's output + * stream is in use. + * + * @See #writeInProgress */ + void setLength(long aLength); + + /** + * True, when output stream has not yet been Close'ed + */ + boolean getWriteInProgress(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIStringInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIStringInputStream.java @@ -0,0 +1,30 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIStringStream.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIStringInputStream + * + * Provides scriptable and specialized C++ only methods for initializing a + * nsIInputStream implementation with a simple character array. + */ +public interface nsIStringInputStream extends nsIInputStream { + + String NS_ISTRINGINPUTSTREAM_IID = + "{450cd2d4-f0fd-424d-b365-b1251f80fd53}"; + + /** + * SetData - assign data to the input stream (copied on assignment). + * + * @param data - stream data + * @param dataLen - stream data length (-1 if length should be computed) + * + * NOTE: C++ code should consider using AdoptData or ShareData to avoid + * making an extra copy of the stream data. + */ + void setData(String data, int dataLen); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIAsyncInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIAsyncInputStream.java @@ -0,0 +1,86 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAsyncInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * If an input stream is non-blocking, it may return NS_BASE_STREAM_WOULD_BLOCK + * when read. The caller must then wait for the stream to have some data to + * read. If the stream implements nsIAsyncInputStream, then the caller can use + * this interface to request an asynchronous notification when the stream + * becomes readable or closed (via the AsyncWait method). + * + * While this interface is almost exclusively used with non-blocking streams, it + * is not necessary that nsIInputStream::isNonBlocking return true. Nor is it + * necessary that a non-blocking nsIInputStream implementation also implement + * nsIAsyncInputStream. + */ +public interface nsIAsyncInputStream extends nsIInputStream { + + String NS_IASYNCINPUTSTREAM_IID = + "{15a15329-00de-44e8-ab06-0d0b0d43dc5b}"; + + /** + * This method closes the stream and sets its internal status. If the + * stream is already closed, then this method is ignored. Once the stream + * is closed, the stream's status cannot be changed. Any successful status + * code passed to this method is treated as NS_BASE_STREAM_CLOSED, which + * has an effect equivalent to nsIInputStream::close. + * + * NOTE: this method exists in part to support pipes, which have both an + * input end and an output end. If the input end of a pipe is closed, then + * writes to the output end of the pipe will fail. The error code returned + * when an attempt is made to write to a "broken" pipe corresponds to the + * status code passed in when the input end of the pipe was closed, which + * greatly simplifies working with pipes in some cases. + * + * @param aStatus + * The error that will be reported if this stream is accessed after + * it has been closed. + */ + void closeWithStatus(long aStatus); + + /** + * Asynchronously wait for the stream to be readable or closed. The + * notification is one-shot, meaning that each asyncWait call will result + * in exactly one notification callback. After the OnInputStreamReady event + * is dispatched, the stream releases its reference to the + * nsIInputStreamCallback object. It is safe to call asyncWait again from the + * notification handler. + * + * This method may be called at any time (even if read has not been called). + * In other words, this method may be called when the stream already has + * data to read. It may also be called when the stream is closed. If the + * stream is already readable or closed when AsyncWait is called, then the + * OnInputStreamReady event will be dispatched immediately. Otherwise, the + * event will be dispatched when the stream becomes readable or closed. + * + * @param aCallback + * This object is notified when the stream becomes ready. + * @param aFlags + * This parameter specifies optional flags passed in to configure + * the behavior of this method. Pass zero to specify no flags. + * @param aRequestedCount + * Wait until at least this many bytes can be read. This is only + * a suggestion to the underlying stream; it may be ignored. The + * caller may pass zero to indicate no preference. + * @param aEventTarget + * Specify NULL to receive notification on ANY thread (possibly even + * recursively on the calling thread -- i.e., synchronously), or + * specify that the notification be delivered to a specific event + * target. + */ + void asyncWait(nsIInputStreamCallback aCallback, long aFlags, long aRequestedCount, nsIEventTarget aEventTarget); + + /** + * If passed to asyncWait, this flag overrides the default behavior, + * causing the OnInputStreamReady notification to be suppressed until the + * stream becomes closed (either as a result of closeWithStatus/close being + * called on the stream or possibly due to some error in the underlying + * stream). + */ + long WAIT_CLOSURE_ONLY = 1L; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIInputStreamCallback.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIInputStreamCallback.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAsyncInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIInputStreamCallback extends nsISupports { + + String NS_IINPUTSTREAMCALLBACK_IID = + "{d1f28e94-3a6e-4050-a5f5-2e81b1fc2a43}"; + + /** + * This is a companion interface for nsIAsyncInputStream::asyncWait. + */ +/** + * Called to indicate that the stream is either readable or closed. + * + * @param aStream + * The stream whose asyncWait method was called. + */ + void onInputStreamReady(nsIAsyncInputStream aStream); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIAsyncOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIAsyncOutputStream.java @@ -0,0 +1,86 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAsyncOutputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * If an output stream is non-blocking, it may return NS_BASE_STREAM_WOULD_BLOCK + * when written to. The caller must then wait for the stream to become + * writable. If the stream implements nsIAsyncOutputStream, then the caller can + * use this interface to request an asynchronous notification when the stream + * becomes writable or closed (via the AsyncWait method). + * + * While this interface is almost exclusively used with non-blocking streams, it + * is not necessary that nsIOutputStream::isNonBlocking return true. Nor is it + * necessary that a non-blocking nsIOutputStream implementation also implement + * nsIAsyncOutputStream. + */ +public interface nsIAsyncOutputStream extends nsIOutputStream { + + String NS_IASYNCOUTPUTSTREAM_IID = + "{10dc9c94-8aff-49c6-8af9-d7fdb7339dae}"; + + /** + * This method closes the stream and sets its internal status. If the + * stream is already closed, then this method is ignored. Once the stream + * is closed, the stream's status cannot be changed. Any successful status + * code passed to this method is treated as NS_BASE_STREAM_CLOSED, which + * is equivalent to nsIInputStream::close. + * + * NOTE: this method exists in part to support pipes, which have both an + * input end and an output end. If the output end of a pipe is closed, then + * reads from the input end of the pipe will fail. The error code returned + * when an attempt is made to read from a "closed" pipe corresponds to the + * status code passed in when the output end of the pipe is closed, which + * greatly simplifies working with pipes in some cases. + * + * @param aStatus + * The error that will be reported if this stream is accessed after + * it has been closed. + */ + void closeWithStatus(long reason); + + /** + * Asynchronously wait for the stream to be writable or closed. The + * notification is one-shot, meaning that each asyncWait call will result + * in exactly one notification callback. After the OnOutputStreamReady event + * is dispatched, the stream releases its reference to the + * nsIOutputStreamCallback object. It is safe to call asyncWait again from the + * notification handler. + * + * This method may be called at any time (even if write has not been called). + * In other words, this method may be called when the stream already has + * room for more data. It may also be called when the stream is closed. If + * the stream is already writable or closed when AsyncWait is called, then the + * OnOutputStreamReady event will be dispatched immediately. Otherwise, the + * event will be dispatched when the stream becomes writable or closed. + * + * @param aCallback + * This object is notified when the stream becomes ready. + * @param aFlags + * This parameter specifies optional flags passed in to configure + * the behavior of this method. Pass zero to specify no flags. + * @param aRequestedCount + * Wait until at least this many bytes can be written. This is only + * a suggestion to the underlying stream; it may be ignored. The + * caller may pass zero to indicate no preference. + * @param aEventTarget + * Specify NULL to receive notification on ANY thread (possibly even + * recursively on the calling thread -- i.e., synchronously), or + * specify that the notification be delivered to a specific event + * target. + */ + void asyncWait(nsIOutputStreamCallback aCallback, long aFlags, long aRequestedCount, nsIEventTarget aEventTarget); + + /** + * If passed to asyncWait, this flag overrides the default behavior, + * causing the OnOutputStreamReady notification to be suppressed until the + * stream becomes closed (either as a result of closeWithStatus/close being + * called on the stream or possibly due to some error in the underlying + * stream). + */ + long WAIT_CLOSURE_ONLY = 1L; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIOutputStreamCallback.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIOutputStreamCallback.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIAsyncOutputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIOutputStreamCallback extends nsISupports { + + String NS_IOUTPUTSTREAMCALLBACK_IID = + "{40dbcdff-9053-42c5-a57c-3ec910d0f148}"; + + /** + * This is a companion interface for nsIAsyncOutputStream::asyncWait. + */ +/** + * Called to indicate that the stream is either writable or closed. + * + * @param aStream + * The stream whose asyncWait method was called. + */ + void onOutputStreamReady(nsIAsyncOutputStream aStream); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIUnicharInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIUnicharInputStream.java @@ -0,0 +1,26 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIUnicharInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIUnicharInputStream extends nsISupports { + + String NS_IUNICHARINPUTSTREAM_IID = + "{d5e3bd80-6723-4b92-b0c9-22f6162fd94f}"; + + /** + * Read into a string object. + * @param aCount The number of characters that should be read + * @return The number of characters that were read. + */ + long readString(long aCount, String[] aString); + + /** + * Close the stream and free associated resources. This also closes the + * underlying stream, if any. + */ + void close(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIUnicharOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIUnicharOutputStream.java @@ -0,0 +1,49 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIUnicharOutputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * An interface that allows writing unicode data. + */ +public interface nsIUnicharOutputStream extends nsISupports { + + String NS_IUNICHAROUTPUTSTREAM_IID = + "{2d00b1bb-8b21-4a63-bcc6-7213f513ac2e}"; + + /** + * Write a single character to the stream. When writing many characters, + * prefer the string-taking write method. + * + * @retval true The character was written successfully + * @retval false Not all bytes of the character could be written. + */ + boolean write(long aCount, int[] c); + + /** + * Write a string to the stream. + * + * @retval true The string was written successfully + * @retval false Not all bytes of the string could be written. + */ + boolean writeString(String str); + + /** + * Flush the stream. This finishes the conversion and writes any bytes that + * finish the current byte sequence. + * + * It does NOT flush the underlying stream. + * + * @see nsIUnicodeEncoder::Finish + */ + void flush(); + + /** + * Close the stream and free associated resources. This also closes the + * underlying stream. + */ + void close(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConverterInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConverterInputStream.java @@ -0,0 +1,40 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConverterInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * A unichar input stream that wraps an input stream. + * This allows reading unicode strings from a stream, automatically converting + * the bytes from a selected character encoding. + */ +public interface nsIConverterInputStream extends nsIUnicharInputStream { + + String NS_ICONVERTERINPUTSTREAM_IID = + "{fc66ffb6-5404-4908-a4a3-27f92fa0579d}"; + + /** + * Default replacement char value, U+FFFD REPLACEMENT CHARACTER. + */ + int DEFAULT_REPLACEMENT_CHARACTER = 65533; + + /** + * Initialize this stream. + * @param aStream + * The underlying stream to read from. + * @param aCharset + * The character encoding to use for converting the bytes of the + * stream. A null charset will be interpreted as UTF-8. + * @param aBufferSize + * How many bytes to buffer. + * @param aReplacementChar + * The character to replace unknown byte sequences in the stream + * with. The standard replacement character is U+FFFD. + * A value of 0x0000 will cause an exception to be thrown if unknown + * byte sequences are encountered in the stream. + */ + void init(nsIInputStream aStream, String aCharset, int aBufferSize, int aReplacementChar); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIConverterOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIConverterOutputStream.java @@ -0,0 +1,43 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIConverterOutputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface allows writing strings to a stream, doing automatic + * character encoding conversion. + */ +public interface nsIConverterOutputStream extends nsIUnicharOutputStream { + + String NS_ICONVERTEROUTPUTSTREAM_IID = + "{4b71113a-cb0d-479f-8ed5-01daeba2e8d4}"; + + /** + * Initialize this stream. Must be called before any other method on this + * interface, or you will crash. The output stream passed to this method + * must not be null, or you will crash. + * + * @param aOutStream + * The underlying output stream to which the converted strings will + * be written. + * @param aCharset + * The character set to use for encoding the characters. A null + * charset will be interpreted as UTF-8. + * @param aBufferSize + * How many bytes to buffer. A value of 0 means that no bytes will be + * buffered. Implementations not supporting buffering may ignore + * this parameter. + * @param aReplacementCharacter + * The replacement character to use when an unsupported character is found. + * The character must be encodable in the selected character + * encoding; otherwise, attempts to write an unsupported character + * will throw NS_ERROR_LOSS_OF_SIGNIFICANT_DATA. + * + * A value of 0x0000 will cause an exception to be thrown upon + * attempts to write unsupported characters. + */ + void init(nsIOutputStream aOutStream, String aCharset, long aBufferSize, int aReplacementCharacter); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDirectoryServiceProvider.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDirectoryServiceProvider.java @@ -0,0 +1,38 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIDirectoryService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIDirectoryServiceProvider + * + * Used by Directory Service to get file locations. + * + * @status FROZEN + */ +public interface nsIDirectoryServiceProvider extends nsISupports { + + String NS_IDIRECTORYSERVICEPROVIDER_IID = + "{bbf8cab0-d43a-11d3-8cc2-00609792278c}"; + + /** + * getFile + * + * Directory Service calls this when it gets the first request for + * a prop or on every request if the prop is not persistent. + * + * @param prop The symbolic name of the file. + * @param persistent TRUE - The returned file will be cached by Directory + * Service. Subsequent requests for this prop will + * bypass the provider and use the cache. + * FALSE - The provider will be asked for this prop + * each time it is requested. + * + * @return The file represented by the property. + * + */ + nsIFile getFile(String prop, boolean[] persistent); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDirectoryServiceProvider2.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDirectoryServiceProvider2.java @@ -0,0 +1,36 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIDirectoryService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIDirectoryServiceProvider2 + * + * An extension of nsIDirectoryServiceProvider which allows + * multiple files to be returned for the given key. + * + * @status FROZEN + */ +public interface nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider { + + String NS_IDIRECTORYSERVICEPROVIDER2_IID = + "{2f977d4b-5485-11d4-87e2-0010a4e75ef2}"; + + /** + * getFiles + * + * Directory Service calls this when it gets a request for + * a prop and the requested type is nsISimpleEnumerator. + * + * @param prop The symbolic name of the file list. + * + * @return An enumerator for a list of file locations. + * The elements in the enumeration are nsIFile + * @returnCode NS_SUCCESS_AGGREGATE_RESULT if this result should be + * aggregated with other "lower" providers. + */ + nsISimpleEnumerator getFiles(String prop); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDirectoryService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDirectoryService.java @@ -0,0 +1,48 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIDirectoryService.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIDirectoryService + * + * @status FROZEN + */ +public interface nsIDirectoryService extends nsISupports { + + String NS_IDIRECTORYSERVICE_IID = + "{57a66a60-d43a-11d3-8cc2-00609792278c}"; + + /** + * init + * + * Must be called. Used internally by XPCOM initialization. + * + */ + void init(); + + /** + * registerProvider + * + * Register a provider with the service. + * + * @param prov The service will keep a strong reference + * to this object. It will be released when + * the service is released. + * + */ + void registerProvider(nsIDirectoryServiceProvider prov); + + /** + * unregisterProvider + * + * Unregister a provider with the service. + * + * @param prov + * + */ + void unregisterProvider(nsIDirectoryServiceProvider prov); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFile.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFile.java @@ -0,0 +1,338 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFile.idl + */ + +package org.mozilla.interfaces; + +/** + * This is the only correct cross-platform way to specify a file. + * Strings are not such a way. If you grew up on windows or unix, you + * may think they are. Welcome to reality. + * + * All methods with string parameters have two forms. The preferred + * form operates on UCS-2 encoded characters strings. An alternate + * form operates on characters strings encoded in the "native" charset. + * + * A string containing characters encoded in the native charset cannot + * be safely passed to javascript via xpconnect. Therefore, the "native + * methods" are not scriptable. + * + * @status FROZEN + */ +public interface nsIFile extends nsISupports { + + String NS_IFILE_IID = + "{c8c0a080-0868-11d3-915f-d9d889d48e3c}"; + + /** + * Create Types + * + * NORMAL_FILE_TYPE - A normal file. + * DIRECTORY_TYPE - A directory/folder. + */ + long NORMAL_FILE_TYPE = 0L; + + long DIRECTORY_TYPE = 1L; + + /** + * append[Native] + * + * This function is used for constructing a descendent of the + * current nsIFile. + * + * @param node + * A string which is intended to be a child node of the nsIFile. + * For the |appendNative| method, the node must be in the native + * filesystem charset. + */ + void append(String node); + + /** + * Normalize the pathName (e.g. removing .. and . components on Unix). + */ + void normalize(); + + /** + * create + * + * This function will create a new file or directory in the + * file system. Any nodes that have not been created or + * resolved, will be. If the file or directory already + * exists create() will return NS_ERROR_FILE_ALREADY_EXISTS. + * + * @param type + * This specifies the type of file system object + * to be made. The only two types at this time + * are file and directory which are defined above. + * If the type is unrecongnized, we will return an + * error (NS_ERROR_FILE_UNKNOWN_TYPE). + * + * @param permissions + * The unix style octal permissions. This may + * be ignored on systems that do not need to do + * permissions. + */ + void create(long type, long permissions); + + /** + * Accessor to the leaf name of the file itself. + * For the |nativeLeafName| method, the nativeLeafName must + * be in the native filesystem charset. + */ + String getLeafName(); + + /** + * Accessor to the leaf name of the file itself. + * For the |nativeLeafName| method, the nativeLeafName must + * be in the native filesystem charset. + */ + void setLeafName(String aLeafName); + + /** + * copyTo[Native] + * + * This will copy this file to the specified newParentDir. + * If a newName is specified, the file will be renamed. + * If 'this' is not created we will return an error + * (NS_ERROR_FILE_TARGET_DOES_NOT_EXIST). + * + * copyTo may fail if the file already exists in the destination + * directory. + * + * copyTo will NOT resolve aliases/shortcuts during the copy. + * + * @param newParentDir + * This param is the destination directory. If the + * newParentDir is null, copyTo() will use the parent + * directory of this file. If the newParentDir is not + * empty and is not a directory, an error will be + * returned (NS_ERROR_FILE_DESTINATION_NOT_DIR). For the + * |CopyToNative| method, the newName must be in the + * native filesystem charset. + * + * @param newName + * This param allows you to specify a new name for + * the file to be copied. This param may be empty, in + * which case the current leaf name will be used. + */ + void copyTo(nsIFile newParentDir, String newName); + + /** + * copyToFollowingLinks[Native] + * + * This function is identical to copyTo with the exception that, + * as the name implies, it follows symbolic links. The XP_UNIX + * implementation always follow symbolic links when copying. For + * the |CopyToFollowingLinks| method, the newName must be in the + * native filesystem charset. + */ + void copyToFollowingLinks(nsIFile newParentDir, String newName); + + /** + * moveTo[Native] + * + * A method to move this file or directory to newParentDir. + * If a newName is specified, the file or directory will be renamed. + * If 'this' is not created we will return an error + * (NS_ERROR_FILE_TARGET_DOES_NOT_EXIST). + * If 'this' is a file, and the destination file already exists, moveTo + * will replace the old file. + * + * moveTo will NOT resolve aliases/shortcuts during the copy. + * moveTo will do the right thing and allow copies across volumes. + * moveTo will return an error (NS_ERROR_FILE_DIR_NOT_EMPTY) if 'this' is + * a directory and the destination directory is not empty. + * moveTo will return an error (NS_ERROR_FILE_ACCESS_DENIED) if 'this' is + * a directory and the destination directory is not writable. + * + * @param newParentDir + * This param is the destination directory. If the + * newParentDir is empty, moveTo() will rename the file + * within its current directory. If the newParentDir is + * not empty and does not name a directory, an error will + * be returned (NS_ERROR_FILE_DESTINATION_NOT_DIR). For + * the |moveToNative| method, the newName must be in the + * native filesystem charset. + * + * @param newName + * This param allows you to specify a new name for + * the file to be moved. This param may be empty, in + * which case the current leaf name will be used. + */ + void moveTo(nsIFile newParentDir, String newName); + + /** + * This will try to delete this file. The 'recursive' flag + * must be PR_TRUE to delete directories which are not empty. + * + * This will not resolve any symlinks. + */ + void remove(boolean recursive); + + /** + * Attributes of nsIFile. + */ + long getPermissions(); + + /** + * Attributes of nsIFile. + */ + void setPermissions(long aPermissions); + + long getPermissionsOfLink(); + + void setPermissionsOfLink(long aPermissionsOfLink); + + /** + * File Times are to be in milliseconds from + * midnight (00:00:00), January 1, 1970 Greenwich Mean + * Time (GMT). + */ + long getLastModifiedTime(); + + /** + * File Times are to be in milliseconds from + * midnight (00:00:00), January 1, 1970 Greenwich Mean + * Time (GMT). + */ + void setLastModifiedTime(long aLastModifiedTime); + + long getLastModifiedTimeOfLink(); + + void setLastModifiedTimeOfLink(long aLastModifiedTimeOfLink); + + /** + * WARNING! On the Mac, getting/setting the file size with nsIFile + * only deals with the size of the data fork. If you need to + * know the size of the combined data and resource forks use the + * GetFileSizeWithResFork() method defined on nsILocalFileMac. + */ + long getFileSize(); + + /** + * WARNING! On the Mac, getting/setting the file size with nsIFile + * only deals with the size of the data fork. If you need to + * know the size of the combined data and resource forks use the + * GetFileSizeWithResFork() method defined on nsILocalFileMac. + */ + void setFileSize(long aFileSize); + + long getFileSizeOfLink(); + + /** + * target & path + * + * Accessor to the string path. The native version of these + * strings are not guaranteed to be a usable path to pass to + * NSPR or the C stdlib. There are problems that affect + * platforms on which a path does not fully specify a file + * because two volumes can have the same name (e.g., XP_MAC). + * This is solved by holding "private", native data in the + * nsIFile implementation. This native data is lost when + * you convert to a string. + * + * DO NOT PASS TO USE WITH NSPR OR STDLIB! + * + * target + * Find out what the symlink points at. Will give error + * (NS_ERROR_FILE_INVALID_PATH) if not a symlink. + * + * path + * Find out what the nsIFile points at. + * + * Note that the ACString attributes are returned in the + * native filesystem charset. + * + */ + String getTarget(); + + String getPath(); + + boolean exists(); + + boolean isWritable(); + + boolean isReadable(); + + boolean isExecutable(); + + boolean isHidden(); + + boolean isDirectory(); + + boolean isFile(); + + boolean isSymlink(); + + /** + * Not a regular file, not a directory, not a symlink. + */ + boolean isSpecial(); + + /** + * createUnique + * + * This function will create a new file or directory in the + * file system. Any nodes that have not been created or + * resolved, will be. If this file already exists, we try + * variations on the leaf name "suggestedName" until we find + * one that did not already exist. + * + * If the search for nonexistent files takes too long + * (thousands of the variants already exist), we give up and + * return NS_ERROR_FILE_TOO_BIG. + * + * @param type + * This specifies the type of file system object + * to be made. The only two types at this time + * are file and directory which are defined above. + * If the type is unrecongnized, we will return an + * error (NS_ERROR_FILE_UNKNOWN_TYPE). + * + * @param permissions + * The unix style octal permissions. This may + * be ignored on systems that do not need to do + * permissions. + */ + void createUnique(long type, long permissions); + + /** + * clone() + * + * This function will allocate and initialize a nsIFile object to the + * exact location of the |this| nsIFile. + * + * @param file + * A nsIFile which this object will be initialize + * with. + * + */ + nsIFile _clone(); + + /** + * Will determine if the inFile equals this. + */ + boolean _equals(nsIFile inFile); + + /** + * Will determine if inFile is a descendant of this file + * If |recur| is true, look in subdirectories too + */ + boolean contains(nsIFile inFile, boolean recur); + + /** + * Parent will be null when this is at the top of the volume. + */ + nsIFile getParent(); + + /** + * Returns an enumeration of the elements in a directory. Each + * element in the enumeration is an nsIFile. + * + * @return NS_ERROR_FILE_NOT_DIRECTORY if the current nsIFile does + * not specify a directory. + */ + nsISimpleEnumerator getDirectoryEntries(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsILocalFile.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsILocalFile.java @@ -0,0 +1,149 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsILocalFile.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface adds methods to nsIFile that are particular to a file + * that is accessible via the local file system. + * + * It follows the same string conventions as nsIFile. + * + * @status FROZEN + */ +public interface nsILocalFile extends nsIFile { + + String NS_ILOCALFILE_IID = + "{aa610f20-a889-11d3-8c81-000064657374}"; + + /** + * initWith[Native]Path + * + * This function will initialize the nsILocalFile object. Any + * internal state information will be reset. + * + * NOTE: This function has a known bug on the macintosh and + * other OSes which do not represent file locations as paths. + * If you do use this function, be very aware of this problem! + * + * @param filePath + * A string which specifies a full file path to a + * location. Relative paths will be treated as an + * error (NS_ERROR_FILE_UNRECOGNIZED_PATH). For + * initWithNativePath, the filePath must be in the native + * filesystem charset. + */ + void initWithPath(String filePath); + + /** + * initWithFile + * + * Initialize this object with another file + * + * @param aFile + * the file this becomes equivalent to + */ + void initWithFile(nsILocalFile aFile); + + /** + * followLinks + * + * This attribute will determine if the nsLocalFile will auto + * resolve symbolic links. By default, this value will be false + * on all non unix systems. On unix, this attribute is effectively + * a noop. + */ + boolean getFollowLinks(); + + /** + * followLinks + * + * This attribute will determine if the nsLocalFile will auto + * resolve symbolic links. By default, this value will be false + * on all non unix systems. On unix, this attribute is effectively + * a noop. + */ + void setFollowLinks(boolean aFollowLinks); + + long getDiskSpaceAvailable(); + + /** + * appendRelative[Native]Path + * + * Append a relative path to the current path of the nsILocalFile object. + * + * @param relativeFilePath + * relativeFilePath is a native relative path. For security reasons, + * this cannot contain .. or cannot start with a directory separator. + * For the |appendRelativeNativePath| method, the relativeFilePath + * must be in the native filesystem charset. + */ + void appendRelativePath(String relativeFilePath); + + /** + * Accessor to a null terminated string which will specify + * the file in a persistent manner for disk storage. + * + * The character set of this attribute is undefined. DO NOT TRY TO + * INTERPRET IT AS HUMAN READABLE TEXT! + */ + String getPersistentDescriptor(); + + /** + * Accessor to a null terminated string which will specify + * the file in a persistent manner for disk storage. + * + * The character set of this attribute is undefined. DO NOT TRY TO + * INTERPRET IT AS HUMAN READABLE TEXT! + */ + void setPersistentDescriptor(String aPersistentDescriptor); + + /** + * reveal + * + * Ask the operating system to open the folder which contains + * this file or folder. This routine only works on platforms which + * support the ability to open a folder... + */ + void reveal(); + + /** + * launch + * + * Ask the operating system to attempt to open the file. + * this really just simulates "double clicking" the file on your platform. + * This routine only works on platforms which support this functionality. + */ + void launch(); + + /** + * getRelativeDescriptor + * + * Returns a relative file path in an opaque, XP format. It is therefore + * not a native path. + * + * The character set of the string returned from this function is + * undefined. DO NOT TRY TO INTERPRET IT AS HUMAN READABLE TEXT! + * + * @param fromFile + * the file from which the descriptor is relative. + * There is no defined result if this param is null. + */ + String getRelativeDescriptor(nsILocalFile fromFile); + + /** + * setRelativeDescriptor + * + * Initializes the file to the location relative to fromFile using + * a string returned by getRelativeDescriptor. + * + * @param fromFile + * the file to which the descriptor is relative + * @param relative + * the relative descriptor obtained from getRelativeDescriptor + */ + void setRelativeDescriptor(nsILocalFile fromFile, String relativeDesc); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIInputStream.java @@ -0,0 +1,33 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIInputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIInputStream extends nsISupports { + + String NS_IINPUTSTREAM_IID = + "{fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a}"; + + /** + * nsIInputStream + * + * @status FROZEN + */ +/** + * Close the stream. + */ + void close(); + + /** + * @return number of bytes currently available in the stream + */ + long available(); + + /** + * @return true if stream is non-blocking + */ + boolean isNonBlocking(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIOutputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIOutputStream.java @@ -0,0 +1,76 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIOutputStream.idl + */ + +package org.mozilla.interfaces; + +public interface nsIOutputStream extends nsISupports { + + String NS_IOUTPUTSTREAM_IID = + "{0d0acd2a-61b4-11d4-9877-00c04fa0cf4a}"; + + /** + * nsIOutputStream + * + * @status FROZEN + */ +/** + * Close the stream. Forces the output stream to flush any buffered data. + * + * @throws NS_BASE_STREAM_WOULD_BLOCK if unable to flush without blocking + * the calling thread (non-blocking mode only) + */ + void close(); + + /** + * Flush the stream. + * + * @throws NS_BASE_STREAM_WOULD_BLOCK if unable to flush without blocking + * the calling thread (non-blocking mode only) + */ + void flush(); + + /** + * Write data into the stream. + * + * @param aBuf the buffer containing the data to be written + * @param aCount the maximum number of bytes to be written + * + * @return number of bytes written (may be less than aCount) + * + * @throws NS_BASE_STREAM_WOULD_BLOCK if writing to the output stream would + * block the calling thread (non-blocking mode only) + * @throws on failure + */ + long write(String aBuf, long aCount); + + /** + * Writes data into the stream from an input stream. + * + * @param aFromStream the stream containing the data to be written + * @param aCount the maximum number of bytes to be written + * + * @return number of bytes written (may be less than aCount) + * + * @throws NS_BASE_STREAM_WOULD_BLOCK if writing to the output stream would + * block the calling thread (non-blocking mode only) + * @throws on failure + * + * NOTE: This method is defined by this interface in order to allow the + * output stream to efficiently copy the data from the input stream into + * its internal buffer (if any). If this method was provided as an external + * facility, a separate char* buffer would need to be used in order to call + * the output stream's other Write method. + */ + long writeFrom(nsIInputStream aFromStream, long aCount); + + /** + * @return true if stream is non-blocking + * + * NOTE: writing to a blocking output stream will block the calling thread + * until all given data can be consumed by the stream. + */ + boolean isNonBlocking(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIScriptableInputStream.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIScriptableInputStream.java @@ -0,0 +1,41 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIScriptableInputStream.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIScriptableInputStream provides scriptable access to the nsIInputStream. + * + * @status FROZEN + */ +public interface nsIScriptableInputStream extends nsISupports { + + String NS_ISCRIPTABLEINPUTSTREAM_IID = + "{a2a32f90-9b90-11d3-a189-0050041caf44}"; + + /** + * Closes the stream. + */ + void close(); + + /** Wrap the given nsIInputStream with this nsIScriptableInputStream. + * @param aInputStream [in] parameter providing the stream to wrap + */ + void init(nsIInputStream aInputStream); + + /** Return the number of bytes currently available in the stream + * @param _retval [out] parameter to hold the number of bytes + * if an error occurs, the parameter will be undefined + * @return error status + */ + long available(); + + /** Read data from the stream. + * @param aCount [in] the maximum number of bytes to read + * @param _retval [out] the data + */ + String read(long aCount); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIComponentManagerObsolete.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIComponentManagerObsolete.java @@ -0,0 +1,255 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIComponentManagerObsolete.idl + */ + +package org.mozilla.interfaces; + +public interface nsIComponentManagerObsolete extends nsISupports { + + String NS_ICOMPONENTMANAGEROBSOLETE_IID = + "{8458a740-d5dc-11d2-92fb-00e09805570f}"; + + /** + * findFactory + * + * Returns the factory object that can be used to create instances of + * CID aClass + * + * @param aClass The classid of the factory that is being requested + */ + nsIFactory findFactory(String aClass); + + /** + * classIDToContractid + * + * Get the ContractID for a given ClassID. A ClassIDs may implement multiple + * ContractIDs. This function return the last registered ContractID. + * + * @param aClass : ClassID for which ContractID is requested. + * @return aClassName : returns class name asssociated with aClass + * @return : ContractID last registered for aClass + */ + String cLSIDToContractID(String aClass, String[] aClassName); + + /** + * registryLocationForSpec + * + * Given a file specification, return the registry representation of + * the filename. Files that are found relative to the components + * directory will have a registry representation + * "rel:" while filenames that are not, will have + * "abs:". + */ + String registryLocationForSpec(nsIFile aSpec); + + /** + * specForRegistyLocation + * + * Create a file specification for the registry representation (rel:/abs:) + * got via registryLocationForSpec. + */ + nsIFile specForRegistryLocation(String aLocation); + + /** + * registerFactory + * + * Register a factory and ContractID associated with CID aClass + * + * @param aClass : CID of object + * @param aClassName : Class Name of CID + * @param aContractID : ContractID associated with CID aClass + * @param aFactory : Factory that will be registered for CID aClass + * @param aReplace : Boolean that indicates whether to replace a previous + * registration for the CID aClass. + */ + void registerFactory(String aClass, String aClassName, String aContractID, nsIFactory aFactory, boolean aReplace); + + /** + * registerComponent + * + * Register a native dll module via its registry representation as returned + * by registryLocationForSpec() as the container of CID implemenation + * aClass and associate aContractID and aClassName to the CID aClass. Native + * dll component type is assumed. + * + * @param aClass : CID implemenation contained in module + * @param aClassName : Class name associated with CID aClass + * @param aContractID : ContractID associated with CID aClass + * @param aLocation : Location of module (dll). Format of this is the + * registry representation as returned by + * registryLocationForSpec() + * @param aReplace : Boolean that indicates whether to replace a previous + * module registration for aClass. + * @param aPersist : Remember this registration across sessions. + */ + void registerComponent(String aClass, String aClassName, String aContractID, String aLocation, boolean aReplace, boolean aPersist); + + /** + * registerComponentWithType + * + * Register a module's location via its registry representation + * as returned by registryLocationForSpec() as the container of CID implemenation + * aClass of type aType and associate aContractID and aClassName to the CID aClass. + * + * @param aClass : CID implemenation contained in module + * @param aClassName : Class name associated with CID aClass + * @param aContractID : ContractID associated with CID aClass + * @param aSpec : Filename spec for module's location. + * @param aLocation : Location of module of type aType. Format of this string + * is the registry representation as returned by + * registryLocationForSpec() + * @param aReplace : Boolean that indicates whether to replace a previous + * loader registration for aClass. + * @param aPersist : Remember this registration across sessions. + * @param aType : Component Type of CID aClass. + */ + void registerComponentWithType(String aClass, String aClassName, String aContractID, nsIFile aSpec, String aLocation, boolean aReplace, boolean aPersist, String aType); + + /** + * registerComponentSpec + * + * Register a native dll module via its file specification as the container + * of CID implemenation aClass and associate aContractID and aClassName to the + * CID aClass. Native dll component type is assumed. + * + * @param aClass : CID implemenation contained in module + * @param aClassName : Class name associated with CID aClass + * @param aContractID : ContractID associated with CID aClass + * @param aLibrary : File specification Location of module (dll). + * @param aReplace : Boolean that indicates whether to replace a previous + * module registration for aClass. + * @param aPersist : Remember this registration across sessions. + */ + void registerComponentSpec(String aClass, String aClassName, String aContractID, nsIFile aLibrary, boolean aReplace, boolean aPersist); + + /** + * registerComponentLib + * + * Register a native dll module via its dll name (not full path) as the + * container of CID implemenation aClass and associate aContractID and aClassName + * to the CID aClass. Native dll component type is assumed and the system + * services will be used to load this dll. + * + * @param aClass : CID implemenation contained in module + * @param aClassName : Class name associated with CID aClass + * @param aContractID : ContractID associated with CID aClass + * @param aDllNameLocation : Dll name of module. + * @param aReplace : Boolean that indicates whether to replace a previous + * module registration for aClass. + * @param aPersist : Remember this registration across sessions. + */ + void registerComponentLib(String aClass, String aClassName, String aContractID, String aDllName, boolean aReplace, boolean aPersist); + + /** + * unregisterFactory + * + * Unregister a factory associated with CID aClass. + * + * @param aClass : ClassID being unregistered + * @param aFactory : Factory previously registered to create instances of + * ClassID aClass. + */ + void unregisterFactory(String aClass, nsIFactory aFactory); + + /** + * unregisterComponent + * + * Disassociate module aLocation represented as registry location as returned + * by registryLocationForSpec() as containing ClassID aClass. + * + * @param aClass : ClassID being unregistered + * @param aLocation : Location of module. Format of this is the registry + * representation as returned by registryLocationForSpec(). + * Components of any type will be unregistered. + */ + void unregisterComponent(String aClass, String aLocation); + + /** + * unregisterComponentSpec + * + * Disassociate module references by file specification aLibrarySpec as + * containing ClassID aClass. + */ + void unregisterComponentSpec(String aClass, nsIFile aLibrarySpec); + + /** + * freeLibraries + * + * Enumerates all loaded modules and unloads unused modules. + */ + void freeLibraries(); + + /** + * ID values for 'when' + */ + int NS_Startup = 0; + + int NS_Script = 1; + + int NS_Timer = 2; + + int NS_Shutdown = 3; + + /** + * autoRegister + * + * Enumerates directory looking for modules of all types and registers + * modules who have changed (modtime or size) since the last time + * autoRegister() was invoked. + * + * @param when : ID values of when the call is being made. + * @param directory : Directory the will be enumerated. + */ + void autoRegister(int when, nsIFile directory); + + /** + * autoRegisterComponent + * + * Loads module using appropriate loader and gives it an opportunity to + * register its CIDs if module's modtime or size changed since the last + * time this was called. + * + * @param when : ID values of when the call is being made. + * @param aFileLocation : File specification of module. + */ + void autoRegisterComponent(int when, nsIFile aFileLocation); + + /** + * autoUnregisterComponent + * + * Loads module using approriate loader and gives it an opportunity to + * unregister its CIDs + */ + void autoUnregisterComponent(int when, nsIFile aFileLocation); + + /** + * isRegistered + * + * Returns true if a factory or module is registered for CID aClass. + * + * @param aClass : ClassID queried for registeration + * @return : true if a factory or module is registered for CID aClass. + * false otherwise. + */ + boolean isRegistered(String aClass); + + /** + * enumerateCLSIDs + * + * Enumerate the list of all registered ClassIDs. + * + * @return : enumerator for ClassIDs. + */ + nsIEnumerator enumerateCLSIDs(); + + /** + * enumerateContractIDs + * + * Enumerate the list of all registered ContractIDs. + * + * @return : enumerator for ContractIDs. + */ + nsIEnumerator enumerateContractIDs(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIClassInfo.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIClassInfo.java @@ -0,0 +1,88 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIClassInfo.idl + */ + +package org.mozilla.interfaces; + +/** + * Provides information about a specific implementation class + * @status FROZEN + */ +public interface nsIClassInfo extends nsISupports { + + String NS_ICLASSINFO_IID = + "{986c11d0-f340-11d4-9075-0010a4e73d9a}"; + + /** + * Get an ordered list of the interface ids that instances of the class + * promise to implement. Note that nsISupports is an implicit member + * of any such list and need not be included. + * + * Should set *count = 0 and *array = null and return NS_OK if getting the + * list is not supported. + */ + String[] getInterfaces(long[] count); + + /** + * Get a language mapping specific helper object that may assist in using + * objects of this class in a specific lanaguage. For instance, if asked + * for the helper for nsIProgrammingLanguage::JAVASCRIPT this might return + * an object that can be QI'd into the nsIXPCScriptable interface to assist + * XPConnect in supplying JavaScript specific behavior to callers of the + * instance object. + * + * see: nsIProgrammingLanguage.idl + * + * Should return null if no helper available for given language. + */ + nsISupports getHelperForLanguage(long language); + + /** + * A contract ID through which an instance of this class can be created + * (or accessed as a service, if |flags & SINGLETON|), or null. + */ + String getContractID(); + + /** + * A human readable string naming the class, or null. + */ + String getClassDescription(); + + /** + * A class ID through which an instance of this class can be created + * (or accessed as a service, if |flags & SINGLETON|), or null. + */ + String getClassID(); + + /** + * Return language type from list in nsIProgrammingLanguage + */ + long getImplementationLanguage(); + + /** + * Bitflags for 'flags' attribute. + */ + long SINGLETON = 1L; + + long THREADSAFE = 2L; + + long MAIN_THREAD_ONLY = 4L; + + long DOM_OBJECT = 8L; + + long PLUGIN_OBJECT = 16L; + + long EAGER_CLASSINFO = 32L; + + /** + * 'flags' attribute bitflag: whether objects of this type implement + * nsIContent. + */ + long CONTENT_NODE = 64L; + + long RESERVED = 2147483648L; + + long getFlags(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIComponentRegistrar.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIComponentRegistrar.java @@ -0,0 +1,185 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIComponentRegistrar.idl + */ + +package org.mozilla.interfaces; + +public interface nsIComponentRegistrar extends nsISupports { + + String NS_ICOMPONENTREGISTRAR_IID = + "{2417cbfe-65ad-48a6-b4b6-eb84db174392}"; + + /** + * autoRegister + * + * Register a component file or all component files in a directory. + * + * Component files must have an associated loader and export the required + * symbols which this loader defines. For example, if the given file is a + * native library (which is built into XPCOM), it must export the symbol + * "NSGetModule". Other loaders may have different semantics. + * + * This method may only be called from the main thread. + * + * @param aSpec : Filename spec for component file's location. If aSpec + * is a directory, then every component file in the + * directory will be registered. + * If the aSpec is null, then the application component's + * directory as defined by NS_XPCOM_COMPONENT_DIR will be + * registered (see nsIDirectoryService.idl) + * + * @return NS_OK : Registration was successful. + * NS_ERROR: Method failure. + */ + void autoRegister(nsIFile aSpec); + + /** + * autoUnregister + * + * Unregister a component file or all component files in a directory. + * This method may only be called from the main thread. + * + * @param aSpec : Filename spec for component file's location. If aSpec + * is a directory, the every component file in the directory + * will be registered. + * If aSpec is null, then the application component's + * directory as defined by NS_XPCOM_COMPONENT_DIR will be + * registered. (see nsIDirectoryService.idl) + * + * @return NS_OK Unregistration was successful. + * NS_ERROR* Method failure. + */ + void autoUnregister(nsIFile aSpec); + + /** + * registerFactory + * + * Register a factory with a given ContractID, CID and Class Name. + * + * @param aClass : CID of object + * @param aClassName : Class Name of CID + * @param aContractID : ContractID associated with CID aClass + * @param aFactory : Factory that will be registered for CID aClass + * + * @return NS_OK Registration was successful. + * NS_ERROR* method failure. + */ + void registerFactory(String aClass, String aClassName, String aContractID, nsIFactory aFactory); + + /** + * unregisterFactory + * + * Unregister a factory associated with CID aClass. + * + * @param aClass : CID being unregistered + * @param aFactory : Factory previously registered to create instances of + * CID aClass. + * + * @return NS_OK Unregistration was successful. + * NS_ERROR* Method failure. + */ + void unregisterFactory(String aClass, nsIFactory aFactory); + + /** + * registerFactoryLocation + * + * Register a factory with a given ContractID, CID and Class Name + * + * @param aClass : CID of object + * @param aClassName : Class Name of CID + * @param aContractID : ContractID associated with CID aClass + * @param aFile : Component File. This file must have an associated + * loader and export the required symbols which this + * loader specifies. + * @param aLoaderStr : Opaque loader specific string. This value is + * passed into the nsIModule's registerSelf + * callback and must be fowarded unmodified when + * registering factories via their location. + * @param aType : Component Type of CID aClass. This value is + * passed into the nsIModule's registerSelf + * callback and must be fowarded unmodified when + * registering factories via their location. + * + * @return NS_OK Registration was successful. + * NS_ERROR* Method failure. + */ + void registerFactoryLocation(String aClass, String aClassName, String aContractID, nsIFile aFile, String aLoaderStr, String aType); + + /** + * unregisterFactoryLocation + * + * Unregister a factory associated with CID aClass. + * + * @param aClass : CID being unregistered + * @param aFile : Component File previously registered + * + * @return NS_OK Unregistration was successful. + * NS_ERROR* Method failure. + */ + void unregisterFactoryLocation(String aClass, nsIFile aFile); + + /** + * isCIDRegistered + * + * Returns true if a factory is registered for the CID. + * + * @param aClass : CID queried for registeration + * @return : true if a factory is registered for CID + * false otherwise. + */ + boolean isCIDRegistered(String aClass); + + /** + * isContractIDRegistered + * + * Returns true if a factory is registered for the contract id. + * + * @param aClass : contract id queried for registeration + * @return : true if a factory is registered for contract id + * false otherwise. + */ + boolean isContractIDRegistered(String aContractID); + + /** + * enumerateCIDs + * + * Enumerate the list of all registered CIDs. + * + * @return : enumerator for CIDs. Elements of the enumeration can be QI'ed + * for the nsISupportsID interface. From the nsISupportsID, you + * can obtain the actual CID. + */ + nsISimpleEnumerator enumerateCIDs(); + + /** + * enumerateContractIDs + * + * Enumerate the list of all registered ContractIDs. + * + * @return : enumerator for ContractIDs. Elements of the enumeration can be + * QI'ed for the nsISupportsCString interface. From the + * nsISupportsCString interface, you can obtain the actual + * Contract ID string. + */ + nsISimpleEnumerator enumerateContractIDs(); + + /** + * CIDToContractID + * + * Returns the Contract ID for a given CID, if one exists and is registered. + * + * @return : Contract ID. + */ + String cIDToContractID(String aClass); + + /** + * contractIDToCID + * + * Returns the CID for a given Contract ID, if one exists and is registered. + * + * @return : Contract ID. + */ + String contractIDToCID(String aContractID); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFactory.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFactory.java @@ -0,0 +1,49 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFactory.idl + */ + +package org.mozilla.interfaces; + +/** + * A class factory allows the creation of nsISupports derived + * components without specifying a concrete base class. + * + * @status FROZEN + */ +public interface nsIFactory extends nsISupports { + + String NS_IFACTORY_IID = + "{00000001-0000-0000-c000-000000000046}"; + + /** + * Creates an instance of a component. + * + * @param aOuter Pointer to a component that wishes to be aggregated + * in the resulting instance. This will be nsnull if no + * aggregation is requested. + * @param iid The IID of the interface being requested in + * the component which is being currently created. + * @param result [out] Pointer to the newly created instance, if successful. + * @return NS_OK - Component successfully created and the interface + * being requested was successfully returned in result. + * NS_NOINTERFACE - Interface not accessible. + * NS_ERROR_NO_AGGREGATION - if an 'outer' object is supplied, but the + * component is not aggregatable. + * NS_ERROR* - Method failure. + */ + nsISupports createInstance(nsISupports aOuter, String iid); + + /** + * LockFactory provides the client a way to keep the component + * in memory until it is finished with it. The client can call + * LockFactory(PR_TRUE) to lock the factory and LockFactory(PR_FALSE) + * to release the factory. + * + * @param lock - Must be PR_TRUE or PR_FALSE + * @return NS_OK - If the lock operation was successful. + * NS_ERROR* - Method failure. + */ + void lockFactory(boolean lock); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIModule.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIModule.java @@ -0,0 +1,72 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIModule.idl + */ + +package org.mozilla.interfaces; + +/** + * The nsIModule interface. + * @status FROZEN + */ +public interface nsIModule extends nsISupports { + + String NS_IMODULE_IID = + "{7392d032-5371-11d3-994e-00805fd26fee}"; + + /** + * Object Instance Creation + * + * Obtains a Class Object from a nsIModule for a given CID and IID pair. + * This class object can either be query to a nsIFactory or a may be + * query to a nsIClassInfo. + * + * @param aCompMgr : The global component manager + * @param aClass : ClassID of object instance requested + * @param aIID : IID of interface requested + * + */ + nsISupports getClassObject(nsIComponentManager aCompMgr, String aClass, String aIID); + + /** + * One time registration callback + * + * When the nsIModule is discovered, this method will be + * called so that any setup registration can be preformed. + * + * @param aCompMgr : The global component manager + * @param aLocation : The location of the nsIModule on disk + * @param aLoaderStr: Opaque loader specific string + * @param aType : Loader Type being used to load this module + */ + void registerSelf(nsIComponentManager aCompMgr, nsIFile aLocation, String aLoaderStr, String aType); + + /** + * One time unregistration callback + * + * When the nsIModule is being unregistered, this method will be + * called so that any unregistration can be preformed + * + * @param aCompMgr : The global component manager + * @param aLocation : The location of the nsIModule on disk + * @param aLoaderStr : Opaque loader specific string + * + */ + void unregisterSelf(nsIComponentManager aCompMgr, nsIFile aLocation, String aLoaderStr); + + /** + * Module load management + * + * @param aCompMgr : The global component manager + * + * @return indicates to the caller if the module can be unloaded. + * Returning PR_TRUE isn't a guarantee that the module will be + * unloaded. It constitues only willingness of the module to be + * unloaded. It is very important to ensure that no outstanding + * references to the module's code/data exist before returning + * PR_TRUE. + * Returning PR_FALSE guaratees that the module wont be unloaded. + */ + boolean canUnload(nsIComponentManager aCompMgr); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIServiceManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIServiceManager.java @@ -0,0 +1,58 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIServiceManager.idl + */ + +package org.mozilla.interfaces; + +/** + * The nsIServiceManager manager interface provides a means to obtain + * global services in an application. The service manager depends on the + * repository to find and instantiate factories to obtain services. + * + * Users of the service manager must first obtain a pointer to the global + * service manager by calling NS_GetServiceManager. After that, + * they can request specific services by calling GetService. When they are + * finished they can NS_RELEASE() the service as usual. + * + * A user of a service may keep references to particular services indefinitely + * and only must call Release when it shuts down. + * + * @status FROZEN + */ +public interface nsIServiceManager extends nsISupports { + + String NS_ISERVICEMANAGER_IID = + "{8bb35ed9-e332-462d-9155-4a002ab5c958}"; + + /** + * getServiceByContractID + * + * Returns the instance that implements aClass or aContractID and the + * interface aIID. This may result in the instance being created. + * + * @param aClass or aContractID : aClass or aContractID of object + * instance requested + * @param aIID : IID of interface requested + * @param result : resulting service + */ + nsISupports getService(String aClass, String aIID); + + nsISupports getServiceByContractID(String aContractID, String aIID); + + /** + * isServiceInstantiated + * + * isServiceInstantiated will return a true if the service has already + * been created, otherwise false + * + * @param aClass or aContractID : aClass or aContractID of object + * instance requested + * @param aIID : IID of interface requested + * @param aIID : IID of interface requested + */ + boolean isServiceInstantiated(String aClass, String aIID); + + boolean isServiceInstantiatedByContractID(String aContractID, String aIID); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIComponentManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIComponentManager.java @@ -0,0 +1,56 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIComponentManager.idl + */ + +package org.mozilla.interfaces; + +public interface nsIComponentManager extends nsISupports { + + String NS_ICOMPONENTMANAGER_IID = + "{a88e5a60-205a-4bb1-94e1-2628daf51eae}"; + + /** + * getClassObject + * + * Returns the factory object that can be used to create instances of + * CID aClass + * + * @param aClass The classid of the factory that is being requested + */ + nsISupports getClassObject(String aClass, String aIID); + + /** + * getClassObjectByContractID + * + * Returns the factory object that can be used to create instances of + * CID aClass + * + * @param aClass The classid of the factory that is being requested + */ + nsISupports getClassObjectByContractID(String aContractID, String aIID); + + /** + * createInstance + * + * Create an instance of the CID aClass and return the interface aIID. + * + * @param aClass : ClassID of object instance requested + * @param aDelegate : Used for aggregation + * @param aIID : IID of interface requested + */ + nsISupports createInstance(String aClass, nsISupports aDelegate, String aIID); + + /** + * createInstanceByContractID + * + * Create an instance of the CID that implements aContractID and return the + * interface aIID. + * + * @param aContractID : aContractID of object instance requested + * @param aDelegate : Used for aggregation + * @param aIID : IID of interface requested + */ + nsISupports createInstanceByContractID(String aContractID, nsISupports aDelegate, String aIID); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsICategoryManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsICategoryManager.java @@ -0,0 +1,62 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsICategoryManager.idl + */ + +package org.mozilla.interfaces; + +public interface nsICategoryManager extends nsISupports { + + String NS_ICATEGORYMANAGER_IID = + "{3275b2cd-af6d-429a-80d7-f0c5120342ac}"; + + /** + * Get the value for the given category's entry. + * @param aCategory The name of the category ("protocol") + * @param aEntry The entry you're looking for ("http") + * @return The value. + */ + String getCategoryEntry(String aCategory, String aEntry); + + /** + * Add an entry to a category. + * @param aCategory The name of the category ("protocol") + * @param aEntry The entry to be added ("http") + * @param aValue The value for the entry ("moz.httprulez.1") + * @param aPersist Should this data persist between invocations? + * @param aReplace Should we replace an existing entry? + * @return Previous entry, if any + */ + String addCategoryEntry(String aCategory, String aEntry, String aValue, boolean aPersist, boolean aReplace); + + /** + * Delete an entry from the category. + * @param aCategory The name of the category ("protocol") + * @param aEntry The entry to be added ("http") + * @param aPersist Delete persistent data from registry, if present? + */ + void deleteCategoryEntry(String aCategory, String aEntry, boolean aPersist); + + /** + * Delete a category and all entries. + * @param aCategory The category to be deleted. + */ + void deleteCategory(String aCategory); + + /** + * Enumerate the entries in a category. + * @param aCategory The category to be enumerated. + * @return a simple enumerator, each result QIs to + * nsISupportsCString. + */ + nsISimpleEnumerator enumerateCategory(String aCategory); + + /** + * Enumerate all existing categories + * @param aCategory The category to be enumerated. + * @return a simple enumerator, each result QIs to + * nsISupportsCString. + */ + nsISimpleEnumerator enumerateCategories(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIThread.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIThread.java @@ -0,0 +1,49 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIThread.idl + */ + +package org.mozilla.interfaces; + +public interface nsIThread extends nsISupports { + + String NS_ITHREAD_IID = + "{6be5e380-6886-11d3-9382-00104ba0fd40}"; + + long PRIORITY_LOW = 0L; + + long PRIORITY_NORMAL = 1L; + + long PRIORITY_HIGH = 2L; + + long PRIORITY_URGENT = 3L; + + long SCOPE_LOCAL = 0L; + + long SCOPE_GLOBAL = 1L; + + long SCOPE_BOUND = 2L; + + long STATE_JOINABLE = 0L; + + long STATE_UNJOINABLE = 1L; + + void join(); + + void interrupt(); + + long getPriority(); + + void setPriority(long aPriority); + + long getScope(); + + long getState(); + + void init(nsIRunnable aRunnable, long aStackSize, long aPriority, long aScope, long aState); + + nsIThread getCurrentThread(); + + void sleep(long msec); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsITimerCallback.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsITimerCallback.java @@ -0,0 +1,18 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsITimer.idl + */ + +package org.mozilla.interfaces; + +public interface nsITimerCallback extends nsISupports { + + String NS_ITIMERCALLBACK_IID = + "{a796816d-7d47-4348-9ab8-c7aeb3216a7d}"; + + /** + * @param aTimer the timer which has expired + */ + void _notify(nsITimer timer); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsITimer.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsITimer.java @@ -0,0 +1,109 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsITimer.idl + */ + +package org.mozilla.interfaces; + +/** + * The callback interface for timers. + */ +public interface nsITimer extends nsISupports { + + String NS_ITIMER_IID = + "{436a83fa-b396-11d9-bcfa-00112478d626}"; + + /** + * nsITimer instances must be initialized by calling one of the "init" methods + * documented below. You may also re-initialize an existing instance with new + * delay to avoid the overhead of destroying and creating a timer. It is not + * necessary to cancel the timer in that case. + */ +/** + * Type of a timer that fires once only. + */ + short TYPE_ONE_SHOT = 0; + + /** + * After firing, a TYPE_REPEATING_SLACK timer is stopped and not restarted + * until its callback completes. Specified timer period will be at least + * the time between when processing for last firing the callback completes + * and when the next firing occurs. + * + * This is the preferable repeating type for most situations. + */ + short TYPE_REPEATING_SLACK = 1; + + /** + * An TYPE_REPEATING_PRECISE repeating timer aims to have constant period + * between firings. The processing time for each timer callback should not + * influence the timer period. However, if the processing for the last + * timer firing could not be completed until just before the next firing + * occurs, then you could have two timer notification routines being + * executed in quick succession. + */ + short TYPE_REPEATING_PRECISE = 2; + + /** + * Initialize a timer that will fire after the said delay. + * A user must keep a reference to this timer till it is + * is no longer needed or has been cancelled. + * + * @param aObserver the callback object that observes the + * ``timer-callback'' topic with the subject being + * the timer itself when the timer fires: + * + * observe(nsISupports aSubject, => nsITimer + * string aTopic, => ``timer-callback'' + * wstring data => null + * + * @param aDelay delay in milliseconds for timer to fire + * @param aType timer type per TYPE* consts defined above + */ + void init(nsIObserver aObserver, long aDelay, long aType); + + /** + * Initialize a timer to fire after the given millisecond interval. + * This version takes a function to call and a closure to pass to + * that function. + * + * @param aFunc nsITimerCallback interface to call when timer expires + * @param aDelay The millisecond interval + * @param aType Timer type per TYPE* consts defined above + */ + void initWithCallback(nsITimerCallback aCallback, long aDelay, long aType); + + /** + * Cancel the timer. This method works on all types, not just on repeating + * timers -- you might want to cancel a TYPE_ONE_SHOT timer, and even reuse + * it by re-initializing it (to avoid object destruction and creation costs + * by conserving one timer instance). + */ + void cancel(); + + /** + * The millisecond delay of the timeout + */ + long getDelay(); + + /** + * The millisecond delay of the timeout + */ + void setDelay(long aDelay); + + /** + * The timer type : one shot or repeating + */ + long getType(); + + /** + * The timer type : one shot or repeating + */ + void setType(long aType); + + /** + * The nsITimerCallback object passed to initWithCallback. + */ + nsITimerCallback getCallback(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsITimerInternal.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsITimerInternal.java @@ -0,0 +1,17 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsITimerInternal.idl + */ + +package org.mozilla.interfaces; + +public interface nsITimerInternal extends nsISupports { + + String NS_ITIMERINTERNAL_IID = + "{6dd8f185-ceb8-4878-8e38-2d13edc2d079}"; + + boolean getIdle(); + + void setIdle(boolean aIdle); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsITimerManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsITimerManager.java @@ -0,0 +1,39 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsITimerManager.idl + */ + +package org.mozilla.interfaces; + +public interface nsITimerManager extends nsISupports { + + String NS_ITIMERMANAGER_IID = + "{8fce8c6a-1dd2-11b2-8352-8cdd2b965efc}"; + + /** + * A flag that turns on the use of idle timers on the main thread. + * this should only be called once. + * + * By default, idle timers are off. + * + * One this is set to TRUE, you are expected to call hasIdleTimers/fireNextIdleTimer + * when you have time in your main loop. + */ + boolean getUseIdleTimers(); + + /** + * A flag that turns on the use of idle timers on the main thread. + * this should only be called once. + * + * By default, idle timers are off. + * + * One this is set to TRUE, you are expected to call hasIdleTimers/fireNextIdleTimer + * when you have time in your main loop. + */ + void setUseIdleTimers(boolean aUseIdleTimers); + + boolean hasIdleTimers(); + + void fireNextIdleTimer(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRunnable.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRunnable.java @@ -0,0 +1,15 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRunnable.idl + */ + +package org.mozilla.interfaces; + +public interface nsIRunnable extends nsISupports { + + String NS_IRUNNABLE_IID = + "{4a2abaf0-6886-11d3-9382-00104ba0fd40}"; + + void run(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIEventTarget.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIEventTarget.java @@ -0,0 +1,24 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIEventTarget.idl + */ + +package org.mozilla.interfaces; + +/** + * nsIEventTarget + * + * This interface is used to dispatch events to a particular thread. In many + * cases the event target also supports nsIEventQueue. + */ +public interface nsIEventTarget extends nsISupports { + + String NS_IEVENTTARGET_IID = + "{ea99ad5b-cc67-4efb-97c9-2ef620a59f2a}"; + + /** + * This method returns true if the event target is the current thread. + */ + boolean isOnCurrentThread(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIEventQueue.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIEventQueue.java @@ -0,0 +1,29 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIEventQueue.idl + */ + +package org.mozilla.interfaces; + +public interface nsIEventQueue extends nsIEventTarget { + + String NS_IEVENTQUEUE_IID = + "{176afb41-00a4-11d3-9f2a-00400553eef0}"; + + boolean pendingEvents(); + + void processPendingEvents(); + + void eventLoop(); + + void init(boolean aNative); + + void enterMonitor(); + + void exitMonitor(); + + boolean isQueueNative(); + + void stopAcceptingEvents(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIEventQueueService.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIEventQueueService.java @@ -0,0 +1,63 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIEventQueueService.idl + */ + +package org.mozilla.interfaces; + +public interface nsIEventQueueService extends nsISupports { + + String NS_IEVENTQUEUESERVICE_IID = + "{a6cf90dc-15b3-11d2-932e-00805f8add32}"; + + /** + * Creates and holds a native event queue for the current thread. + * "Native" queues have an associated callback mechanism which is + * automatically triggered when an event is posted. See plevent.c for + * details. + * @return NS_OK on success, or a host of failure indications + */ + void createThreadEventQueue(); + + /** + * Creates and hold a monitored event queue for the current thread. + * "Monitored" queues have no callback processing mechanism. + * @return NS_OK on success, or a host of failure indications + */ + void createMonitoredThreadEventQueue(); + + /** + * Somewhat misnamed, this method releases the service's hold on the event + * queue(s) for this thread. Subsequent attempts to access this thread's + * queue (GetThreadEventQueue, for example) may fail, though the queue itself + * will be destroyed only after all references to it are released and the + * queue itself is no longer actively processing events. + * @return nonsense. + */ + void destroyThreadEventQueue(); + + nsIEventQueue createFromIThread(nsIThread aThread, boolean aNative); + + nsIEventQueue pushThreadEventQueue(); + + void popThreadEventQueue(nsIEventQueue aQueue); + + /** + * Returns the appropriate special event queue, AddRef()ed. Really + * just a scriptable version of ResolveEventQueue. + * + * @arg aQueue Either CURRENT_THREAD_EVENT_QUEUE or + * UI_THREAD_EVENT_QUEUE + * @return The requested nsIEventQueue, AddRef()ed + * @exception NS_ERROR_NULL_POINTER Zero pointer passed in for return value + * @exception NS_ERROR_ILLEGAL_VALUE Bogus constant passed in aQueue + * @exception NS_ERROR_FAILURE Error while calling + * GetThreadEventQueue() + */ + nsIEventQueue getSpecialEventQueue(int aQueue); + + int CURRENT_THREAD_EVENT_QUEUE = 0; + + int UI_THREAD_EVENT_QUEUE = 1; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIEnvironment.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIEnvironment.java @@ -0,0 +1,57 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIEnvironment.idl + */ + +package org.mozilla.interfaces; + +/** + * Scriptable access to the current process environment. + * + */ +public interface nsIEnvironment extends nsISupports { + + String NS_IENVIRONMENT_IID = + "{101d5941-d820-4e85-a266-9a3469940807}"; + + /** + * Set the value of an environment variable. + * + * @param aName the variable name to set. + * @param aValue the value to set. + */ + void set(String aName, String aValue); + + /** + * Get the value of an environment variable. + * + * @param aName the variable name to retrieve. + * @return returns the value of the env variable. An empty string + * will be returned when the env variable does not exist or + * when the value itself is an empty string - please use + * |exists()| to probe whether the env variable exists + * or not. + */ + String get(String aName); + + /** + * Check the existence of an environment variable. + * This method checks whether an environment variable is present in + * the environment or not. + * + * - For Unix/Linux platforms we follow the Unix definition: + * An environment variable exists when |getenv()| returns a non-NULL value. + * An environment variable does not exist when |getenv()| returns NULL. + * - For non-Unix/Linux platforms we have to fall back to a + * "portable" definition (which is incorrect for Unix/Linux!!!!) + * which simply checks whether the string returned by |Get()| is empty + * or not. + * + * @param aName the variable name to probe. + * @return if the variable has been set, the value returned is + * PR_TRUE. If the variable was not defined in the + * environment PR_FALSE will be returned. + */ + boolean exists(String aName); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProcess.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProcess.java @@ -0,0 +1,37 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProcess.idl + */ + +package org.mozilla.interfaces; + +public interface nsIProcess extends nsISupports { + + String NS_IPROCESS_IID = + "{9da0b650-d07e-4617-a18a-250035572ac8}"; + + void init(nsIFile executable); + + void initWithPid(long pid); + + void kill(); + + /** XXX what charset? **/ +/** Executes the file this object was initialized with + * @param blocking Whether to wait until the process terminates before returning or not + * @param args An array of arguments to pass to the process + * @param count The length of the args array + * @return the PID of the newly spawned process */ + long run(boolean blocking, String[] args, long count); + + nsIFile getLocation(); + + long getPid(); + + String getProcessName(); + + long getProcessSignature(); + + int getExitValue(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsISupportsPriority.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsISupportsPriority.java @@ -0,0 +1,62 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsISupportsPriority.idl + */ + +package org.mozilla.interfaces; + +/** + * This interface exposes the general notion of a scheduled object with a + * integral priority value. Following UNIX conventions, smaller (and possibly + * negative) values have higher priority. + * + * This interface does not strictly define what happens when the priority of an + * object is changed. An implementation of this interface is free to define + * the side-effects of changing the priority of an object. In some cases, + * changing the priority of an object may be disallowed (resulting in an + * exception being thrown) or may simply be ignored. + */ +public interface nsISupportsPriority extends nsISupports { + + String NS_ISUPPORTSPRIORITY_IID = + "{aa578b44-abd5-4c19-8b14-36d4de6fdc36}"; + + /** + * Typical priority values. + */ + int PRIORITY_HIGHEST = -20; + + int PRIORITY_HIGH = -10; + + int PRIORITY_NORMAL = 0; + + int PRIORITY_LOW = 10; + + int PRIORITY_LOWEST = 20; + + /** + * This attribute may be modified to change the priority of this object. The + * implementation of this interface is free to truncate a given priority + * value to whatever limits are appropriate. Typically, this attribute is + * initialized to PRIORITY_NORMAL, but implementations may choose to assign a + * different initial value. + */ + int getPriority(); + + /** + * This attribute may be modified to change the priority of this object. The + * implementation of this interface is free to truncate a given priority + * value to whatever limits are appropriate. Typically, this attribute is + * initialized to PRIORITY_NORMAL, but implementations may choose to assign a + * different initial value. + */ + void setPriority(int aPriority); + + /** + * This method adjusts the priority attribute by a given delta. It helps + * reduce the amount of coding required to increment or decrement the value + * of the priority attribute. + */ + void adjustPriority(int delta); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIXPTLoaderSink.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIXPTLoaderSink.java @@ -0,0 +1,25 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIXPTLoader.idl + */ + +package org.mozilla.interfaces; + +/** + * Implement nsIXPTLoaderSink if you want to enumerate the entries in + * an XPT archive of some kind + */ +public interface nsIXPTLoaderSink extends nsISupports { + + String NS_IXPTLOADERSINK_IID = + "{6e48c500-8682-4730-add6-7db693b9e7ba}"; + + /** + * called by the loader for each entry in the archive + * @param itemName the name of this particular item in the archive + * @param index the index of the item inthe archive + * @param stream contains the contents of the xpt file + */ + void foundEntry(String itemName, int index, nsIInputStream xptData); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIXPTLoader.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIXPTLoader.java @@ -0,0 +1,37 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIXPTLoader.idl + */ + +package org.mozilla.interfaces; + +/** + * The XPT loader interface: implemented by a loader to grab an input + * stream which will be consumed by the interface loader. + */ +public interface nsIXPTLoader extends nsISupports { + + String NS_IXPTLOADER_IID = + "{368a15d9-17a9-4c2b-ac3d-a35b3a22b876}"; + + /** + * enumerate entries in the given archive + * for each entry found, the loader will call the sink's + * foundEntry() method with the appropriate information and a + * stream that the consumer can read from + * @param file the file to read from + * @param sink an object which will be called with each file found + * in the file + */ + void enumerateEntries(nsILocalFile file, nsIXPTLoaderSink sink); + + /** + * Load a specific entry from the archive + * @param file the file to read from + * @param name the name of the xpt within the file + * @return an input stream that will read the raw xpt data from + * the file + */ + nsIInputStream loadEntry(nsILocalFile file, String name); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIFileSpec.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIFileSpec.java @@ -0,0 +1,137 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFileSpec.idl + */ + +package org.mozilla.interfaces; + +public interface nsIFileSpec extends nsISupports { + + String NS_IFILESPEC_IID = + "{37ef2e71-edef-46c7-acd9-f0b6e0b15083}"; + + void fromFileSpec(nsIFileSpec original); + + String getURLString(); + + void setURLString(String aURLString); + + String getUnixStyleFilePath(); + + void setUnixStyleFilePath(String aUnixStyleFilePath); + + String getPersistentDescriptorString(); + + void setPersistentDescriptorString(String aPersistentDescriptorString); + + String getNativePath(); + + void setNativePath(String aNativePath); + + String getNSPRPath(); + + void error(); + + boolean isValid(); + + boolean failed(); + + String getLeafName(); + + void setLeafName(String aLeafName); + + nsIFileSpec getParent(); + + nsIInputStream getInputStream(); + + nsIOutputStream getOutputStream(); + + boolean isChildOf(nsIFileSpec possibleParent); + + String getFileContents(); + + void setFileContents(String aFileContents); + + void makeUnique(); + + void makeUniqueWithSuggestedName(String suggestedName); + + void makeUniqueDir(); + + void makeUniqueDirWithSuggestedName(String suggestedName); + + long getModDate(); + + boolean modDateChanged(long oldStamp); + + boolean isDirectory(); + + boolean isFile(); + + boolean exists(); + + boolean isHidden(); + + boolean _equals(nsIFileSpec spec); + + long getFileSize(); + + long getDiskSpaceAvailable(); + + void appendRelativeUnixPath(String relativePath); + + void createDir(); + + void touch(); + + boolean isSymlink(); + + void resolveSymlink(); + + void delete(boolean recursive); + + void truncate(int aNewLength); + + void rename(String newLeafName); + + void copyToDir(nsIFileSpec newParentDir); + + void moveToDir(nsIFileSpec newParentDir); + + void execute(String args); + + void openStreamForReading(); + + void openStreamForWriting(); + + void openStreamForReadingAndWriting(); + + void closeStream(); + + boolean isStreamOpen(); + + boolean eof(); + + int read(String[] buffer, int requestedCount); + + void readLine(String[] line, int bufferSize, boolean[] wasTruncated); + + /** Check eof() before each call. + * CAUTION: false result only indicates line was truncated + * to fit buffer, or an error occurred (OTHER THAN eof). + */ + int write(String data, int requestedCount); + + void flush(); + + void seek(int offset); + + int tell(); + + void endLine(); + + String getUnicodePath(); + + void setUnicodePath(String aUnicodePath); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProxyCreateInstance.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProxyCreateInstance.java @@ -0,0 +1,13 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProxyCreateInstance.idl + */ + +package org.mozilla.interfaces; + +public interface nsIProxyCreateInstance extends nsISupports { + + String NS_IPROXYCREATEINSTANCE_IID = + "{948c2080-0398-11d3-915e-0000863011c4}"; + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIProxyObjectManager.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIProxyObjectManager.java @@ -0,0 +1,39 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIProxyObjectManager.idl + */ + +package org.mozilla.interfaces; + +/** + * See http://www.mozilla.org/projects/xpcom/Proxies.html + */ +public interface nsIProxyObjectManager extends nsISupports { + + String NS_IPROXYOBJECTMANAGER_IID = + "{eea90d43-b059-11d2-915e-c12b696c9333}"; + + /** + * Constants for proxyType + */ +/** + * Synchronous: Block until result available, like function call. + */ + int INVOKE_SYNC = 1; + + /** + * Asynchronous: Return without waiting for result. + * (Warning: do not pass &pointers into stack when using this flag.) + */ + int INVOKE_ASYNC = 2; + + /** + * Always create proxy even if for same thread as current thread. + */ + int FORCE_PROXY_CREATION = 4; + + nsISupports getProxyForObject(nsIEventQueue destQueue, String iid, nsISupports object, int proxyType); + + nsISupports getProxy(nsIEventQueue destQueue, String cid, nsISupports aOuter, String iid, int proxyType); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIDirectoryIterator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIDirectoryIterator.java @@ -0,0 +1,21 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIFileSpec.idl + */ + +package org.mozilla.interfaces; + +public interface nsIDirectoryIterator extends nsISupports { + + String NS_IDIRECTORYITERATOR_IID = + "{d8c0a083-0868-11d3-915f-d9d889d48e3c}"; + + void init(nsIFileSpec parent, boolean resolveSymlink); + + boolean exists(); + + void next(); + + nsIFileSpec getCurrentSpec(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRegistry.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRegistry.java @@ -0,0 +1,111 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRegistry.idl + */ + +package org.mozilla.interfaces; + +public interface nsIRegistry extends nsISupports { + + String NS_IREGISTRY_IID = + "{5d41a440-8e37-11d2-8059-00600811a9c3}"; + + int None = 0; + + int Users = 1; + + int Common = 2; + + int CurrentUser = 3; + + int ApplicationComponentRegistry = 1; + + int ApplicationRegistry = 2; + + int ApplicationCustomRegistry = -1; + + void open(nsIFile regFile); + + void openWellKnownRegistry(int regid); + + void flush(); + + boolean isOpen(); + + long addKey(long baseKey, String keyname); + + long getKey(long baseKey, String keyname); + + void removeKey(long baseKey, String keyname); + + String getString(long baseKey, String valname); + + void setString(long baseKey, String valname, String value); + + String getStringUTF8(long baseKey, String path); + + void setStringUTF8(long baseKey, String path, String value); + + byte[] getBytesUTF8(long baseKey, String path, long[] length); + + void setBytesUTF8(long baseKey, String path, long length, byte[] valueArray); + + int getInt(long baseKey, String path); + + void setInt(long baseKey, String path, int value); + + long getLongLong(long baseKey, String path); + + void setLongLong(long baseKey, String path, long[] value); + + /** + * addSubtree() and friends need to be renamed to addKeyUTF8(). + * If you are using these forms make sure you pass UTF8 data + */ + long addSubtree(long baseKey, String path); + + void removeSubtree(long baseKey, String path); + + long getSubtree(long baseKey, String path); + + long addSubtreeRaw(long baseKey, String path); + + void removeSubtreeRaw(long baseKey, String path); + + long getSubtreeRaw(long baseKey, String path); + + nsIEnumerator enumerateSubtrees(long baseKey); + + nsIEnumerator enumerateAllSubtrees(long baseKey); + + nsIEnumerator enumerateValues(long baseKey); + + long String = 1L; + + long Int32 = 2L; + + long Bytes = 3L; + + long File = 4L; + + long getValueType(long baseKey, String path); + + long getValueLength(long baseKey, String path); + + void deleteValue(long baseKey, String path); + + /** + * escapeKey() takes arbitrary binary data and converts it into + * valid ASCII which can be used as registry key or value names + */ + byte[] escapeKey(byte[] key, long terminator, long[] length); + + byte[] unescapeKey(byte[] escaped, long terminator, long[] length); + + String getCurrentUserName(); + + void setCurrentUserName(String aCurrentUserName); + + void pack(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRegistryEnumerator.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRegistryEnumerator.java @@ -0,0 +1,15 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRegistry.idl + */ + +package org.mozilla.interfaces; + +public interface nsIRegistryEnumerator extends nsIEnumerator { + + String NS_IREGISTRYENUMERATOR_IID = + "{8cecf236-1dd2-11b2-893c-f9848956eaec}"; + + String currentItemInPlaceUTF8(long[] key); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRegistryNode.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRegistryNode.java @@ -0,0 +1,19 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRegistry.idl + */ + +package org.mozilla.interfaces; + +public interface nsIRegistryNode extends nsISupports { + + String NS_IREGISTRYNODE_IID = + "{d1b54831-ac07-11d2-805e-00600811a9c3}"; + + String getNameUTF8(); + + String getName(); + + long getKey(); + +} \ No newline at end of file --- xulrunner-1.8.1.14+nobinonly.orig/_javagen/default/org/mozilla/interfaces/nsIRegistryValue.java +++ xulrunner-1.8.1.14+nobinonly/_javagen/default/org/mozilla/interfaces/nsIRegistryValue.java @@ -0,0 +1,21 @@ +/* + * DO NOT EDIT. THIS FILE IS GENERATED FROM + * nsIRegistry.idl + */ + +package org.mozilla.interfaces; + +public interface nsIRegistryValue extends nsISupports { + + String NS_IREGISTRYVALUE_IID = + "{5316c380-b2f8-11d2-a374-0080c6f80e4b}"; + + String getName(); + + String getNameUTF8(); + + long getType(); + + long getLength(); + +} \ No newline at end of file