diff --git a/debian/changelog b/debian/changelog index d4fca80633..67762a1e75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gtk+2.0 (2.12.8-1) UNRELEASED; urgency=low + + * New upstream bugfix release: + + debian/patches/040_filechooser_single-click.patch, + debian/patches/093_directfb-type-changes.patch, + debian/patches/094_directfb-deprecation-fixes.patch: + - Dropped, merged upstream. + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Wed, 13 Feb 2008 09:11:50 +0100 + gtk+2.0 (2.12.7-1) unstable; urgency=low * Fix GNOME casing in gtk-faq and gtk doc base descriptions. diff --git a/debian/patches/040_filechooser_single-click.patch b/debian/patches/040_filechooser_single-click.patch deleted file mode 100644 index 6c57003436..0000000000 --- a/debian/patches/040_filechooser_single-click.patch +++ /dev/null @@ -1,147 +0,0 @@ -Debian #405296; GNOME #148828; permit single click in filechooser instead of -requiring double-click. - ---- gtk+2.0-2.12.4.orig/gtk/gtkfilechooserdefault.c 2008-01-08 05:20:08.000000000 +0100 -+++ gtk+2.0-2.12.4/gtk/gtkfilechooserdefault.c 2008-01-08 17:55:56.000000000 +0100 -@@ -390,10 +390,6 @@ - - static void filter_combo_changed (GtkComboBox *combo_box, - GtkFileChooserDefault *impl); --static void shortcuts_row_activated_cb (GtkTreeView *tree_view, -- GtkTreePath *path, -- GtkTreeViewColumn *column, -- GtkFileChooserDefault *impl); - - static gboolean shortcuts_key_press_event_cb (GtkWidget *widget, - GdkEventKey *event, -@@ -1996,9 +1992,7 @@ - - profile_start ("start", NULL); - -- /* As there is no separator now, we want to start there. -- */ -- start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); -+ start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR) + 1; - num_inserted = 0; - - for (; paths; paths = paths->next) -@@ -2010,6 +2004,8 @@ - if (impl->local_only && - !gtk_file_system_path_is_local (impl->file_system, path)) - continue; -+ if (shortcut_find_position (impl, path) != -1) -+ continue; - - label = gtk_file_system_get_bookmark_label (impl->file_system, path); - -@@ -2239,13 +2235,14 @@ - impl->num_bookmarks + 1); - - impl->num_bookmarks = 0; -+ shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); - - bookmarks = gtk_file_system_list_bookmarks (impl->file_system); - shortcuts_append_paths (impl, bookmarks); - gtk_file_paths_free (bookmarks); - -- if (impl->num_bookmarks > 0) -- shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); -+ if (impl->num_bookmarks == 0) -+ shortcuts_remove_rows (impl, shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR), 1); - - if (impl->shortcuts_pane_filter_model) - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model)); -@@ -3651,8 +3648,22 @@ - shortcuts_selection_changed_cb (GtkTreeSelection *selection, - GtkFileChooserDefault *impl) - { -+ GtkTreeIter iter; -+ GtkTreeIter child_iter; -+ - bookmarks_check_remove_sensitivity (impl); - shortcuts_check_popup_sensitivity (impl); -+ -+ if (impl->changing_folder) -+ return; -+ -+ if (gtk_tree_selection_get_selected(selection, NULL, &iter)) -+ { -+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), -+ &child_iter, -+ &iter); -+ shortcuts_activate_iter (impl, &child_iter); -+ } - } - - static gboolean -@@ -3924,7 +3935,7 @@ - GDK_ACTION_COPY | GDK_ACTION_MOVE); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view)); -- gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); -+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - gtk_tree_selection_set_select_function (selection, - shortcuts_select_func, - impl, NULL); -@@ -3932,9 +3943,6 @@ - g_signal_connect (selection, "changed", - G_CALLBACK (shortcuts_selection_changed_cb), impl); - -- g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated", -- G_CALLBACK (shortcuts_row_activated_cb), impl); -- - g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event", - G_CALLBACK (shortcuts_key_press_event_cb), impl); - -@@ -8598,25 +8606,6 @@ - gtk_file_path_free (path); - return retval; - } -- else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view) -- { -- /* The focus is on a dialog's action area button, *and* the widget that -- * was focused immediately before it is the shortcuts list. Switch to the -- * selected shortcut and tell the caller not to respond. -- */ -- GtkTreeIter iter; -- -- if (shortcuts_get_selected (impl, &iter)) -- { -- shortcuts_activate_iter (impl, &iter); -- -- focus_browse_tree_view_if_possible (impl); -- } -- else -- goto file_list; -- -- return FALSE; -- } - else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view) - { - /* The focus is on a dialog's action area button, *and* the widget that -@@ -10476,25 +10465,6 @@ - } - } - --/* Callback used when a row in the shortcuts list is activated */ --static void --shortcuts_row_activated_cb (GtkTreeView *tree_view, -- GtkTreePath *path, -- GtkTreeViewColumn *column, -- GtkFileChooserDefault *impl) --{ -- GtkTreeIter iter; -- GtkTreeIter child_iter; -- -- if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path)) -- return; -- -- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), -- &child_iter, -- &iter); -- shortcuts_activate_iter (impl, &child_iter); --} -- - /* Handler for GtkWidget::key-press-event on the shortcuts list */ - static gboolean - shortcuts_key_press_event_cb (GtkWidget *widget, diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index b5e2028220..122d3cd1bc 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -9,18 +9,118 @@ exclude config.guess and sub with diff -urN -x config.guess -x config.sub This is required because of patches touching autotools files, but also because of upstream using an older libtool; see GNOME #484426; Debian #445001. ---- a/aclocal.m4 2008-01-29 10:05:20.000000000 +0100 -+++ b/aclocal.m4 2008-01-29 10:05:43.000000000 +0100 +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/aclocal.m4 gtk+2.0-2.12.8/aclocal.m4 +--- gtk+2.0-2.12.8.old/aclocal.m4 2008-02-12 18:58:22.000000000 +0100 ++++ gtk+2.0-2.12.8/aclocal.m4 2008-02-13 09:22:36.000000000 +0100 @@ -941,7 +941,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL -+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL ++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1493,7 +1493,6 @@ +@@ -1029,7 +1029,6 @@ + AC_REQUIRE([AC_OBJEXT])dnl + AC_REQUIRE([AC_EXEEXT])dnl + dnl +- + AC_LIBTOOL_SYS_MAX_CMD_LEN + AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + AC_LIBTOOL_OBJDIR +@@ -1131,6 +1130,8 @@ + ;; + esac + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -1210,9 +1211,80 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + ])# _LT_LINKER_BOILERPLATE + ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) + + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- +@@ -1493,7 +1565,6 @@ esac ;; *64-bit*) @@ -28,7 +128,56 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -2552,13 +2551,11 @@ +@@ -1538,7 +1609,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -1631,7 +1706,7 @@ + $2=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + +@@ -1902,7 +1977,7 @@ + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -1910,7 +1985,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -2227,7 +2302,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2552,13 +2627,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -43,7 +192,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2570,6 +2567,18 @@ +@@ -2570,6 +2643,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -62,7 +211,30 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. netbsd*) version_type=sunos need_lib_prefix=no -@@ -3344,7 +3353,7 @@ +@@ -2750,6 +2835,13 @@ + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -3249,7 +3341,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3344,7 +3436,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -71,7 +243,112 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else -@@ -4378,7 +4387,7 @@ +@@ -3685,7 +3777,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -3742,6 +3834,7 @@ + _LT_AC_TAGVAR(predeps, $1)= + _LT_AC_TAGVAR(postdeps, $1)= + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + + # Source file extension for C++ test sources. + ac_ext=cpp +@@ -3851,7 +3944,7 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -3864,7 +3957,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -4010,51 +4103,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -4305,7 +4370,7 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -4378,7 +4443,7 @@ ;; esac ;; @@ -80,7 +357,111 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -6059,7 +6068,7 @@ +@@ -4740,7 +4805,8 @@ + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl + dnl we can't use the lt_simple_compile_test_code here, + dnl because it contains code intended for an executable, + dnl not a library. It's possible we should let each +@@ -4865,6 +4931,11 @@ + + $rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +@@ -4921,7 +4992,6 @@ + ;; + esac + ]) +- + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac +@@ -5006,7 +5076,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -5183,6 +5253,7 @@ + _LT_AC_TAGVAR(predeps, $1) \ + _LT_AC_TAGVAR(postdeps, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ + _LT_AC_TAGVAR(archive_cmds, $1) \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ + _LT_AC_TAGVAR(postinstall_cmds, $1) \ +@@ -5245,7 +5316,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -5482,6 +5553,10 @@ + # shared library. + postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +@@ -5831,7 +5906,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -5888,7 +5963,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform +@@ -5925,7 +6001,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -6021,7 +6097,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +@@ -6059,7 +6135,7 @@ ;; esac ;; @@ -89,7 +470,54 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -6434,6 +6443,9 @@ +@@ -6172,7 +6248,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) +@@ -6242,7 +6319,8 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +@@ -6379,7 +6457,7 @@ + # + if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +@@ -6403,7 +6481,7 @@ + # + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" + AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +@@ -6419,7 +6497,7 @@ + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -6434,10 +6512,14 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; @@ -99,7 +527,37 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -6639,12 +6651,13 @@ + esac ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -6468,12 +6550,14 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) +@@ -6523,7 +6607,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -6639,12 +6723,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -114,7 +572,41 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -7076,7 +7089,7 @@ +@@ -6742,7 +6827,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -6762,7 +6847,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -6922,11 +7007,10 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -7076,7 +7160,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -123,17 +615,46 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -8313,7 +8326,7 @@ - esac - done +@@ -7754,14 +7838,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG -- PKG_PROG_PKG_CONFIG([0.16]) -+ PKG_PROG_PKG_CONFIG([0.7]) - - no_glib="" - ---- a/configure 2008-01-29 10:05:20.000000000 +0100 -+++ b/configure 2008-01-29 10:05:43.000000000 +0100 +@@ -7805,9 +7891,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/configure gtk+2.0-2.12.8/configure +--- gtk+2.0-2.12.8.old/configure 2008-02-12 18:58:36.000000000 +0100 ++++ gtk+2.0-2.12.8/configure 2008-02-13 09:22:41.000000000 +0100 @@ -863,6 +863,8 @@ CCDEPMODE am__fastdepCC_TRUE @@ -143,7 +664,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. CXX CXXFLAGS ac_ct_CXX -@@ -1016,6 +1018,7 @@ +@@ -880,6 +882,8 @@ + ECHO + AR + RANLIB ++DSYMUTIL ++NMEDIT + DLLTOOL + AS + OBJDUMP +@@ -1016,6 +1020,7 @@ USE_DIRECTFB_TRUE USE_DIRECTFB_FALSE GDK_PACKAGES @@ -151,7 +681,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_EXTRA_LIBS GDK_EXTRA_CFLAGS GDK_DEP_LIBS -@@ -3872,6 +3875,16 @@ +@@ -3872,6 +3877,16 @@ @@ -168,7 +698,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -5098,7 +5111,7 @@ +@@ -5003,7 +5018,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -5098,7 +5113,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -177,16 +716,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -5219,7 +5232,7 @@ +@@ -5219,7 +5234,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5222 "configure"' > conftest.$ac_ext -+ echo '#line 5235 "configure"' > conftest.$ac_ext ++ echo '#line 5237 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -5284,7 +5297,6 @@ +@@ -5284,7 +5299,6 @@ esac ;; *64-bit*) @@ -194,49 +733,504 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -7779,11 +7791,11 @@ +@@ -5392,7 +5406,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -6811,7 +6829,6 @@ + + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +- + # find the maximum length of command line arguments + { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +@@ -7126,7 +7143,7 @@ + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -7686,6 +7703,318 @@ + ;; + esac + ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ + enable_dlopen=no + enable_win32_dll=yes + +@@ -7751,7 +8080,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + +@@ -7779,11 +8108,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8111: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7786: \$? = $ac_status" >&5 -+ echo "$as_me:7798: \$? = $ac_status" >&5 ++ echo "$as_me:8115: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8069,11 +8081,11 @@ +@@ -8053,10 +8382,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works=no ++ lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" +@@ -8069,27 +8398,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8072: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8084: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8401: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8076: \$? = $ac_status" >&5 -+ echo "$as_me:8088: \$? = $ac_status" >&5 ++ echo "$as_me:8405: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8173,11 +8185,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works=yes ++ lt_cv_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } + +-if test x"$lt_prog_compiler_pic_works" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -8116,10 +8445,10 @@ + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works=no ++ lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -8132,20 +8461,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + else +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_prog_compiler_static_works" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= +@@ -8173,11 +8502,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8176: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8188: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8505: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8180: \$? = $ac_status" >&5 -+ echo "$as_me:8192: \$? = $ac_status" >&5 ++ echo "$as_me:8509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8437,12 +8449,13 @@ +@@ -8257,12 +8586,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -8321,7 +8651,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -8437,12 +8767,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -251,7 +1245,41 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -8986,7 +8999,7 @@ +@@ -8540,7 +8871,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -8560,7 +8891,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -8832,11 +9163,10 @@ + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -8986,7 +9316,7 @@ link_all_deplibs=yes ;; @@ -260,7 +1288,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9681,13 +9694,11 @@ +@@ -9356,7 +9686,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9681,13 +10011,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -275,7 +1312,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -9699,6 +9710,18 @@ +@@ -9699,6 +10027,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -294,25 +1331,207 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. netbsd*) version_type=sunos need_lib_prefix=no -@@ -10524,7 +10547,7 @@ +@@ -9880,6 +10220,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -10199,7 +10554,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + { echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +@@ -10475,7 +10830,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + +@@ -10524,7 +10879,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -11595,7 +11956,7 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -11608,7 +11969,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -11866,51 +12227,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -12161,7 +12494,7 @@ + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -12234,7 +12567,7 @@ ;; esac ;; @@ -321,7 +1540,53 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -12935,7 +12958,7 @@ +@@ -12568,7 +12901,6 @@ + GCC_CXX="$GXX" + LD_CXX="$LD" + +- + cat > conftest.$ac_ext <&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_CXX=no ++ lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" +@@ -13044,27 +13380,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13047: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13070: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13383: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13051: \$? = $ac_status" >&5 -+ echo "$as_me:13074: \$? = $ac_status" >&5 ++ echo "$as_me:13387: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -13148,11 +13171,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_CXX=yes ++ lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +@@ -13091,10 +13427,10 @@ + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_CXX=no ++ lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -13107,20 +13443,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + else +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : + else + lt_prog_compiler_static_CXX= +@@ -13148,11 +13484,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13151: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13174: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13487: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13155: \$? = $ac_status" >&5 -+ echo "$as_me:13178: \$? = $ac_status" >&5 ++ echo "$as_me:13491: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -13220,6 +13243,9 @@ +@@ -13205,7 +13541,7 @@ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -13220,10 +13556,14 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; @@ -368,7 +1715,21 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -13649,13 +13675,11 @@ + esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + + { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +@@ -13325,7 +13665,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13649,13 +13989,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -383,7 +1744,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -13667,6 +13691,18 @@ +@@ -13667,6 +14005,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -402,35 +1763,191 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. netbsd*) version_type=sunos need_lib_prefix=no -@@ -14712,11 +14748,11 @@ +@@ -13848,6 +14198,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -13931,6 +14296,7 @@ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ ++ compiler_lib_search_dirs_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ +@@ -14179,6 +14545,10 @@ + # shared library. + postdeps=$lt_postdeps_CXX + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +@@ -14393,7 +14763,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -14431,7 +14801,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -14696,10 +15066,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_F77=no ++ lt_cv_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" +@@ -14712,27 +15082,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14715: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14751: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15085: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14719: \$? = $ac_status" >&5 -+ echo "$as_me:14755: \$? = $ac_status" >&5 ++ echo "$as_me:15089: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -14816,11 +14852,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_F77=yes ++ lt_cv_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } + +-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +@@ -14759,10 +15129,10 @@ + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_F77=no ++ lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -14775,20 +15145,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + else +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + +-if test x"$lt_prog_compiler_static_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : + else + lt_prog_compiler_static_F77= +@@ -14816,11 +15186,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14819: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14855: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15189: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14823: \$? = $ac_status" >&5 -+ echo "$as_me:14859: \$? = $ac_status" >&5 ++ echo "$as_me:15193: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -15080,12 +15116,13 @@ +@@ -14900,12 +15270,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -14964,7 +15335,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -15080,12 +15451,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -445,7 +1962,41 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15609,7 +15646,7 @@ +@@ -15183,7 +15555,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -15203,7 +15575,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -15455,11 +15827,10 @@ + link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -15609,7 +15980,7 @@ link_all_deplibs_F77=yes ;; @@ -454,7 +2005,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16252,13 +16289,11 @@ +@@ -15928,7 +16299,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16252,13 +16623,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -469,7 +2029,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16270,6 +16305,18 @@ +@@ -16270,6 +16639,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -488,49 +2048,214 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. netbsd*) version_type=sunos need_lib_prefix=no -@@ -17005,11 +17052,11 @@ +@@ -16451,6 +16832,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -16534,6 +16930,7 @@ + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ ++ compiler_lib_search_dirs_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ +@@ -16782,6 +17179,10 @@ + # shared library. + postdeps=$lt_postdeps_F77 + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +@@ -16956,7 +17357,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -17005,11 +17406,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17008: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17409: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17012: \$? = $ac_status" >&5 -+ echo "$as_me:17059: \$? = $ac_status" >&5 ++ echo "$as_me:17413: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17295,11 +17342,11 @@ +@@ -17069,7 +17470,7 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + darwin* | rhapsody*) +@@ -17139,7 +17540,7 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + hpux9* | hpux10* | hpux11*) +@@ -17279,10 +17680,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_GCJ=no ++ lt_cv_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" +@@ -17295,27 +17696,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17298: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17345: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17699: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17302: \$? = $ac_status" >&5 -+ echo "$as_me:17349: \$? = $ac_status" >&5 ++ echo "$as_me:17703: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17399,11 +17446,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_GCJ=yes ++ lt_cv_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +@@ -17342,10 +17743,10 @@ + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_GCJ=no ++ lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -17358,20 +17759,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + else +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : + else + lt_prog_compiler_static_GCJ= +@@ -17399,11 +17800,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17402: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17449: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17803: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17406: \$? = $ac_status" >&5 -+ echo "$as_me:17453: \$? = $ac_status" >&5 ++ echo "$as_me:17807: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -17663,12 +17710,13 @@ +@@ -17483,12 +17884,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -17547,7 +17949,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -17663,12 +18065,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -545,7 +2270,41 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18212,7 +18260,7 @@ +@@ -17766,7 +18169,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -17786,7 +18189,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -18058,11 +18461,10 @@ + link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -18212,7 +18614,7 @@ link_all_deplibs_GCJ=yes ;; @@ -554,7 +2313,16 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -18855,13 +18903,11 @@ +@@ -18531,7 +18933,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18855,13 +19257,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -569,7 +2337,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -18873,6 +18919,18 @@ +@@ -18873,6 +19273,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -588,16 +2356,138 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. netbsd*) version_type=sunos need_lib_prefix=no -@@ -24002,7 +24060,7 @@ +@@ -19054,6 +19466,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -19137,6 +19564,7 @@ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ ++ compiler_lib_search_dirs_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ +@@ -19385,6 +19813,10 @@ + # shared library. + postdeps=$lt_postdeps_GCJ + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +@@ -19558,7 +19990,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -19618,6 +20050,7 @@ + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ ++ compiler_lib_search_dirs_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ +@@ -19866,6 +20299,10 @@ + # shared library. + postdeps=$lt_postdeps_RC + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_RC +@@ -21330,10 +21767,11 @@ + { echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 + echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } + +-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then ++ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 + ac_status=$? +@@ -21343,13 +21781,15 @@ + else + pkg_failed=yes fi - if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.16 -+ _pkg_min_version=0.7 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 - echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -@@ -32444,8 +32502,18 @@ +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BASE_DEPENDENCIES_LIBS"; then +- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_LIBS"; then ++ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 + ac_status=$? +@@ -21359,8 +21799,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -21373,9 +21814,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0"` + else +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 +@@ -32440,8 +32881,18 @@ if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then { echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6; } @@ -618,7 +2508,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. else { { echo "$as_me:$LINENO: error: *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -@@ -32581,20 +32649,21 @@ +@@ -32577,20 +33028,21 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" @@ -645,7 +2535,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi -@@ -32604,6 +32673,7 @@ +@@ -32600,6 +33052,7 @@ @@ -653,7 +2543,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. ######################################## # Check for Accessibility Toolkit flags ######################################## -@@ -32709,7 +32779,7 @@ +@@ -32705,7 +33158,7 @@ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -662,7 +2552,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. fi -@@ -33894,6 +33964,13 @@ +@@ -33890,6 +34343,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -676,7 +2566,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -34964,9 +35041,9 @@ +@@ -34960,9 +35420,9 @@ CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim @@ -688,7 +2578,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -35008,6 +35085,8 @@ +@@ -35004,6 +35464,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -697,25 +2587,38 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -@@ -35103,8 +35182,6 @@ +@@ -35018,6 +35480,8 @@ + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim + DLLTOOL!$DLLTOOL$ac_delim + AS!$AS$ac_delim + OBJDUMP!$OBJDUMP$ac_delim +@@ -35097,10 +35561,6 @@ + INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim + INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim - INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim - INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim +-INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim +-INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim -INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim -INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -35146,6 +35223,8 @@ +@@ -35142,6 +35602,10 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF ++INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim ++INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim +INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim +INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim -@@ -35199,6 +35278,7 @@ +@@ -35195,6 +35659,7 @@ USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim GDK_PACKAGES!$GDK_PACKAGES$ac_delim @@ -723,20 +2626,24 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim -@@ -35240,9 +35320,6 @@ +@@ -35234,11 +35699,6 @@ + DB2HTML!$DB2HTML$ac_delim + HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim - XSLTPROC!$XSLTPROC$ac_delim - XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim +-XSLTPROC!$XSLTPROC$ac_delim +-XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim -XMLCATALOG!$XMLCATALOG$ac_delim -ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim -ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -35284,11 +35361,14 @@ +@@ -35280,11 +35740,16 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF ++XSLTPROC!$XSLTPROC$ac_delim ++XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim +XMLCATALOG!$XMLCATALOG$ac_delim +ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim +ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim @@ -745,13 +2652,22 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ---- a/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/contrib/gdk-pixbuf-xlib/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.8/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.12.8.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/contrib/gdk-pixbuf-xlib/Makefile.in 2008-02-13 09:22:42.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -760,7 +2676,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -768,9 +2684,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/contrib/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/contrib/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -90,6 +90,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/contrib/Makefile.in gtk+2.0-2.12.8/contrib/Makefile.in +--- gtk+2.0-2.12.8.old/contrib/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/contrib/Makefile.in 2008-02-13 09:22:42.000000000 +0100 +@@ -81,6 +81,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -90,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -779,7 +2712,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +115,7 @@ +@@ -113,6 +116,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -787,9 +2720,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/demos/gtk-demo/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/demos/gtk-demo/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -220,6 +224,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.8/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.12.8.old/demos/gtk-demo/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/demos/gtk-demo/Makefile.in 2008-02-13 09:22:42.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -798,7 +2748,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -806,9 +2756,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/demos/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/demos/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -90,6 +90,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/demos/Makefile.in gtk+2.0-2.12.8/demos/Makefile.in +--- gtk+2.0-2.12.8.old/demos/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/demos/Makefile.in 2008-02-13 09:22:42.000000000 +0100 +@@ -81,6 +81,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -90,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -817,7 +2784,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +115,7 @@ +@@ -113,6 +116,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -825,9 +2792,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/faq/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/faq/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -220,6 +224,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/faq/Makefile.in gtk+2.0-2.12.8/docs/faq/Makefile.in +--- gtk+2.0-2.12.8.old/docs/faq/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/faq/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -836,7 +2820,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -844,9 +2828,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/Makefile.in gtk+2.0-2.12.8/docs/Makefile.in +--- gtk+2.0-2.12.8.old/docs/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -855,7 +2856,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -863,9 +2864,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/reference/gdk/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/reference/gdk/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -95,6 +95,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.8/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.12.8.old/docs/reference/gdk/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/reference/gdk/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -86,6 +86,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -95,6 +96,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -874,7 +2892,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -118,6 +120,7 @@ +@@ -118,6 +121,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -882,9 +2900,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/reference/gdk-pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/reference/gdk-pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -95,6 +95,8 @@ +@@ -225,6 +229,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.8/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.12.8.old/docs/reference/gdk-pixbuf/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/reference/gdk-pixbuf/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -86,6 +86,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -95,6 +96,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -893,7 +2928,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -118,6 +120,7 @@ +@@ -118,6 +121,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -901,9 +2936,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/reference/gtk/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/reference/gtk/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -95,6 +95,8 @@ +@@ -225,6 +229,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.8/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.12.8.old/docs/reference/gtk/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/reference/gtk/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -86,6 +86,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -95,6 +96,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -912,7 +2964,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -118,6 +120,7 @@ +@@ -118,6 +121,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -920,9 +2972,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/reference/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/reference/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -225,6 +229,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/reference/Makefile.in gtk+2.0-2.12.8/docs/reference/Makefile.in +--- gtk+2.0-2.12.8.old/docs/reference/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/reference/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -931,7 +3000,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -939,9 +3008,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/tools/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/tools/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/tools/Makefile.in gtk+2.0-2.12.8/docs/tools/Makefile.in +--- gtk+2.0-2.12.8.old/docs/tools/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/tools/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -950,7 +3036,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -958,9 +3044,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/docs/tutorial/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/docs/tutorial/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/docs/tutorial/Makefile.in gtk+2.0-2.12.8/docs/tutorial/Makefile.in +--- gtk+2.0-2.12.8.old/docs/tutorial/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/docs/tutorial/Makefile.in 2008-02-13 09:22:43.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -969,7 +3072,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -977,9 +3080,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/directfb/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/directfb/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/directfb/Makefile.in gtk+2.0-2.12.8/gdk/directfb/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/directfb/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/directfb/Makefile.in 2008-02-13 09:22:44.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -988,7 +3108,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -996,9 +3116,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/Makefile.in gtk+2.0-2.12.8/gdk/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/Makefile.in 2008-02-13 09:22:44.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1007,7 +3144,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1015,9 +3152,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/quartz/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/quartz/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/quartz/Makefile.in gtk+2.0-2.12.8/gdk/quartz/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/quartz/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/quartz/Makefile.in 2008-02-13 09:22:45.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1026,7 +3180,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1034,9 +3188,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/win32/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/win32/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/win32/Makefile.in gtk+2.0-2.12.8/gdk/win32/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/win32/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/win32/Makefile.in 2008-02-13 09:22:45.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1045,7 +3216,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1053,9 +3224,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/win32/rc/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/win32/rc/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.8/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/win32/rc/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/win32/rc/Makefile.in 2008-02-13 09:22:45.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1064,7 +3252,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1072,9 +3260,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk/x11/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk/x11/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -91,6 +91,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk/x11/Makefile.in gtk+2.0-2.12.8/gdk/x11/Makefile.in +--- gtk+2.0-2.12.8.old/gdk/x11/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk/x11/Makefile.in 2008-02-13 09:22:45.000000000 +0100 +@@ -82,6 +82,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -91,6 +92,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1083,7 +3288,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -114,6 +116,7 @@ +@@ -114,6 +117,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1091,9 +3296,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk-pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk-pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -221,6 +225,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.8/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.12.8.old/gdk-pixbuf/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk-pixbuf/Makefile.in 2008-02-13 09:22:44.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1102,7 +3324,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1110,9 +3332,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gdk-pixbuf/pixops/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gdk-pixbuf/pixops/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.8/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.12.8.old/gdk-pixbuf/pixops/Makefile.in 2008-02-12 18:58:32.000000000 +0100 ++++ gtk+2.0-2.12.8/gdk-pixbuf/pixops/Makefile.in 2008-02-13 09:22:44.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1121,7 +3360,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1129,9 +3368,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gtk/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gtk/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -113,6 +113,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/Makefile.in gtk+2.0-2.12.8/gtk/Makefile.in +--- gtk+2.0-2.12.8.old/gtk/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/gtk/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -104,6 +104,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -113,6 +114,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1140,7 +3396,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -136,6 +138,7 @@ +@@ -136,6 +139,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1148,7 +3404,15 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -379,6 +382,8 @@ +@@ -243,6 +247,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +@@ -379,6 +384,8 @@ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ @@ -1157,7 +3421,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ -@@ -634,13 +639,16 @@ +@@ -634,13 +641,16 @@ # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ gtktextlayout.h \ @@ -1177,7 +3441,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. gtksearchenginebeagle.h \ gtksearchenginetracker.h\ gtksearchenginesimple.h \ -@@ -650,10 +658,7 @@ +@@ -650,10 +660,7 @@ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ @@ -1188,9 +3452,18 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. gtkfilesystemunix.h \ gtkhsv.h \ gtkiconcache.h \ ---- a/gtk/theme-bits/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gtk/theme-bits/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.8/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.12.8.old/gtk/theme-bits/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/gtk/theme-bits/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1199,7 +3472,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1207,9 +3480,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/gtk/xdgmime/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/gtk/xdgmime/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.8/gtk/xdgmime/Makefile.in +--- gtk+2.0-2.12.8.old/gtk/xdgmime/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/gtk/xdgmime/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1218,7 +3508,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1226,18 +3516,116 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/ltmain.sh 2008-01-29 10:05:20.000000000 +0100 -+++ b/ltmain.sh 2008-01-29 10:05:43.000000000 +0100 -@@ -43,7 +43,7 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/ltmain.sh gtk+2.0-2.12.8/ltmain.sh +--- gtk+2.0-2.12.8.old/ltmain.sh 2008-01-30 21:26:55.000000000 +0100 ++++ gtk+2.0-2.12.8/ltmain.sh 2008-02-02 14:28:24.000000000 +0100 +@@ -2,7 +2,7 @@ + # NOTE: Changing this file will not affect anything until you rerun configure. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007 Free Software Foundation, Inc. ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.24 -+VERSION="1.5.24 Debian 1.5.24-1" - TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" ++VERSION="1.5.26 Debian 1.5.26-1" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -@@ -2122,7 +2122,10 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -113,15 +113,21 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" + $lt_var=C + export $lt_var + fi" + done + ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi ++ + # Make sure IFS has a sensible default + lt_nl=' + ' +@@ -485,7 +491,7 @@ + echo "\ + $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +-Copyright (C) 2007 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $? +@@ -788,6 +794,7 @@ + *.for) xform=for ;; + *.java) xform=java ;; + *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -956,7 +963,7 @@ + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit $EXIT_FAILURE +@@ -1028,7 +1035,7 @@ + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist + exit $EXIT_FAILURE +@@ -1161,6 +1168,7 @@ + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" + + func_infer_tag $base_compile + +@@ -1646,6 +1654,11 @@ + continue + ;; + ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -2122,7 +2135,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; @@ -1249,7 +3637,55 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. esac fi if test "$pass" = dlopen; then -@@ -3244,6 +3247,11 @@ +@@ -2149,7 +2165,12 @@ + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" +@@ -2945,12 +2966,18 @@ + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= + fi + # do not add paths which are already there + case " $newlib_search_path " in +@@ -3098,9 +3125,10 @@ + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -3244,6 +3272,11 @@ revision="$number_minor" lt_irix_increment=no ;; @@ -1261,9 +3697,41 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. esac ;; no) ---- a/m4macros/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/m4macros/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -4237,9 +4270,10 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -6478,7 +6512,7 @@ + fi + + # Restore saved environment variables +- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/m4macros/Makefile.in gtk+2.0-2.12.8/m4macros/Makefile.in +--- gtk+2.0-2.12.8.old/m4macros/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/m4macros/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1272,7 +3740,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1280,9 +3748,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -90,6 +90,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/Makefile.in gtk+2.0-2.12.8/Makefile.in +--- gtk+2.0-2.12.8.old/Makefile.in 2008-02-12 18:58:31.000000000 +0100 ++++ gtk+2.0-2.12.8/Makefile.in 2008-02-13 09:22:42.000000000 +0100 +@@ -81,6 +81,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -90,6 +91,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1291,7 +3776,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +115,7 @@ +@@ -113,6 +116,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1299,7 +3784,15 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -330,7 +333,10 @@ +@@ -220,6 +224,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +@@ -330,7 +335,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -1311,7 +3804,14 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros # require automake 1.4 -@@ -488,7 +494,8 @@ +@@ -482,13 +490,14 @@ + DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \ + acinclude.m4 aclocal.m4 compile config.guess config.h.in \ +- config.h.win32.in config.sub configure.in depcomp \ ++ config.h.win32.in config.sub configure configure.in depcomp \ + gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \ + gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \ gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \ missing mkinstalldirs @@ -1321,7 +3821,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -740,7 +747,7 @@ +@@ -740,7 +749,7 @@ || exit 1; \ fi; \ done @@ -1330,9 +3830,18 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ ---- a/modules/engines/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/engines/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/Makefile.in gtk+2.0-2.12.8/modules/engines/Makefile.in +--- gtk+2.0-2.12.8.old/modules/engines/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/engines/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1341,7 +3850,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1349,9 +3858,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/engines/ms-windows/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/engines/ms-windows/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/engines/ms-windows/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1360,7 +3886,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1368,9 +3894,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1379,7 +3922,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1387,9 +3930,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/engines/ms-windows/Theme/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/engines/ms-windows/Theme/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.12.8.old/modules/engines/ms-windows/Theme/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/engines/ms-windows/Theme/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1398,7 +3958,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1406,9 +3966,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/engines/pixbuf/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/engines/pixbuf/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.8/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.12.8.old/modules/engines/pixbuf/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/engines/pixbuf/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1417,7 +3994,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1425,9 +4002,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/input/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/input/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/input/Makefile.in gtk+2.0-2.12.8/modules/input/Makefile.in +--- gtk+2.0-2.12.8.old/modules/input/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/input/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1436,7 +4030,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1444,7 +4038,15 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -431,9 +434,10 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +@@ -431,9 +436,10 @@ imconffiledir = $(sysconfdir)/gtk-2.0 dist_imconffile_DATA = im-multipress.conf @@ -1456,7 +4058,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. module_LTLIBRARIES = \ $(IM_XIM_MODULE) \ -@@ -986,7 +990,18 @@ +@@ -986,7 +992,18 @@ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -1476,9 +4078,18 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- a/modules/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/Makefile.in gtk+2.0-2.12.8/modules/Makefile.in +--- gtk+2.0-2.12.8.old/modules/Makefile.in 2008-02-12 18:58:33.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/Makefile.in 2008-02-13 09:22:46.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1487,7 +4098,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1495,9 +4106,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/printbackends/cups/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/printbackends/cups/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.8/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.12.8.old/modules/printbackends/cups/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/printbackends/cups/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1506,7 +4134,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1514,9 +4142,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/printbackends/file/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/printbackends/file/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.8/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.12.8.old/modules/printbackends/file/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/printbackends/file/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1525,7 +4170,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1533,9 +4178,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/printbackends/lpr/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/printbackends/lpr/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.8/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.12.8.old/modules/printbackends/lpr/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/printbackends/lpr/Makefile.in 2008-02-13 09:22:48.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1544,7 +4206,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1552,9 +4214,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/printbackends/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/printbackends/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -91,6 +91,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/Makefile.in gtk+2.0-2.12.8/modules/printbackends/Makefile.in +--- gtk+2.0-2.12.8.old/modules/printbackends/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/printbackends/Makefile.in 2008-02-13 09:22:47.000000000 +0100 +@@ -82,6 +82,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -91,6 +92,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1563,7 +4242,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -114,6 +116,7 @@ +@@ -114,6 +117,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1571,9 +4250,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/modules/printbackends/test/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/modules/printbackends/test/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -221,6 +225,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.8/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.12.8.old/modules/printbackends/test/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/modules/printbackends/test/Makefile.in 2008-02-13 09:22:48.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1582,7 +4278,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1590,9 +4286,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/perf/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/perf/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -89,6 +89,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/perf/Makefile.in gtk+2.0-2.12.8/perf/Makefile.in +--- gtk+2.0-2.12.8.old/perf/Makefile.in 2008-02-12 18:58:34.000000000 +0100 ++++ gtk+2.0-2.12.8/perf/Makefile.in 2008-02-13 09:22:48.000000000 +0100 +@@ -80,6 +80,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -89,6 +90,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1601,7 +4314,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -112,6 +114,7 @@ +@@ -112,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1609,9 +4322,26 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ ---- a/tests/Makefile.in 2008-01-29 10:05:20.000000000 +0100 -+++ b/tests/Makefile.in 2008-01-29 10:05:43.000000000 +0100 -@@ -92,6 +92,8 @@ +@@ -219,6 +223,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ +diff -Naur -x'*.orig' -x'*config.sub' -x'*config.guess' gtk+2.0-2.12.8.old/tests/Makefile.in gtk+2.0-2.12.8/tests/Makefile.in +--- gtk+2.0-2.12.8.old/tests/Makefile.in 2008-02-12 18:58:35.000000000 +0100 ++++ gtk+2.0-2.12.8/tests/Makefile.in 2008-02-13 09:22:48.000000000 +0100 +@@ -83,6 +83,7 @@ + DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ + DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -92,6 +93,8 @@ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ @@ -1620,7 +4350,7 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -115,6 +117,7 @@ +@@ -115,6 +118,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -1628,3 +4358,11 @@ of upstream using an older libtool; see GNOME #484426; Debian #445001. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -222,6 +226,7 @@ + MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ + MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OS_LINUX_FALSE = @OS_LINUX_FALSE@ diff --git a/debian/patches/093_directfb-type-changes.patch b/debian/patches/093_directfb-type-changes.patch deleted file mode 100644 index 2614a71d29..0000000000 --- a/debian/patches/093_directfb-type-changes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gtk+2.0-2.12.4.orig/gdk/directfb/gdkcursor-directfb.c 2008-01-08 05:20:48.000000000 +0100 -+++ gtk+2.0-2.12.4/gdk/directfb/gdkcursor-directfb.c 2008-01-08 17:58:13.000000000 +0100 -@@ -46,6 +46,19 @@ - #define u8 __u8 - #endif - -+ -+/* Workaround for DirectFB >= 1.0.0-rc2 not -+ * defining __u32 anymore when DIRECTFB_NO_CRUFT -+ * is set, which is the default on Debian systems. -+ */ -+#ifndef __u32 -+#define __u32 u32 -+#endif -+ -+#ifndef __u8 -+#define __u8 u8 -+#endif -+ - static struct { - const guchar *bits; - int width, height, hotx, hoty; diff --git a/debian/patches/094_directfb-deprecation-fixes.patch b/debian/patches/094_directfb-deprecation-fixes.patch deleted file mode 100644 index 7d3133d3f1..0000000000 --- a/debian/patches/094_directfb-deprecation-fixes.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- gtk+2.0-2.12.6.orig/gdk/directfb/gdkdrawable-directfb.c 2008-01-29 17:34:23.000000000 +0100 -+++ gtk+2.0-2.12.6/gdk/directfb/gdkdrawable-directfb.c 2008-01-29 17:34:42.000000000 +0100 -@@ -477,7 +477,7 @@ - gint angle1, - gint angle2) - { -- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION); -+ WARN_UNIMPLEMENTED (G_STRLOC); - } - - static void -@@ -561,7 +561,7 @@ - const gchar *text, - gint text_length) - { -- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION); -+ WARN_UNIMPLEMENTED (G_STRLOC); - } - - static void -@@ -573,7 +573,7 @@ - const GdkWChar *text, - gint text_length) - { -- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION); -+ WARN_UNIMPLEMENTED (G_STRLOC); - } - - static void ---- gtk+2.0-2.12.6.orig/gdk/directfb/gdkimage-directfb.c 2008-01-29 17:34:59.000000000 +0100 -+++ gtk+2.0-2.12.6/gdk/directfb/gdkimage-directfb.c 2008-01-29 17:35:10.000000000 +0100 -@@ -151,7 +151,7 @@ - - GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h)); - -- g_message ("not fully implemented %s", G_GNUC_FUNCTION); -+ g_message ("not fully implemented %s", G_STRLOC); - - image->bpl = (w + 7) / 8; - image->mem = g_malloc (image->bpl * h); -@@ -209,7 +209,7 @@ - format = DSPF_ARGB; - break; - default: -- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth); -+ g_message ("unimplemented %s for depth %d", G_STRLOC, depth); - return NULL; - } - ---- gtk+2.0-2.12.6.orig/gdk/directfb/gdkinput-directfb.c 2008-01-29 17:35:30.000000000 +0100 -+++ gtk+2.0-2.12.6/gdk/directfb/gdkinput-directfb.c 2008-01-29 17:35:38.000000000 +0100 -@@ -228,7 +228,7 @@ - gdk_device_set_mode (GdkDevice *device, - GdkInputMode mode) - { -- g_message ("unimplemented %s", G_GNUC_FUNCTION); -+ g_message ("unimplemented %s", G_STRLOC); - - return FALSE; - } -@@ -303,7 +303,7 @@ - gint mask, - GdkExtensionMode mode) - { -- g_message ("unimplemented %s", G_GNUC_FUNCTION); -+ g_message ("unimplemented %s", G_STRLOC); - } - - GList * ---- gtk+2.0-2.12.6.orig/gdk/directfb/gdkpixmap-directfb.c 2008-01-29 17:35:52.000000000 +0100 -+++ gtk+2.0-2.12.6/gdk/directfb/gdkpixmap-directfb.c 2008-01-29 17:36:10.000000000 +0100 -@@ -172,7 +172,7 @@ - format = DSPF_RGB32; - break; - default: -- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth); -+ g_message ("unimplemented %s for depth %d", G_STRLOC, depth); - return NULL; - } - } ---- gtk+2.0-2.12.6.orig/gdk/directfb/gdkwindow-directfb.c 2008-01-29 17:36:26.000000000 +0100 -+++ gtk+2.0-2.12.6/gdk/directfb/gdkwindow-directfb.c 2008-01-29 17:36:36.000000000 +0100 -@@ -2411,7 +2411,7 @@ - return; - - /* N/A */ -- g_message("unimplemented %s", G_GNUC_FUNCTION); -+ g_message("unimplemented %s", G_STRLOC); - } - - void -@@ -2444,7 +2444,7 @@ - return FALSE; - - /* N/A */ -- g_message("unimplemented %s", G_GNUC_FUNCTION); -+ g_message("unimplemented %s", G_STRLOC); - - return FALSE; - } -@@ -2462,7 +2462,7 @@ - if (GDK_WINDOW_DESTROYED (window)) - return; - -- g_message("unimplemented %s", G_GNUC_FUNCTION); -+ g_message("unimplemented %s", G_STRLOC); - } - - void -@@ -2477,7 +2477,7 @@ - if (GDK_WINDOW_DESTROYED (window)) - return; - -- g_message("unimplemented %s", G_GNUC_FUNCTION); -+ g_message("unimplemented %s", G_STRLOC); - } - - /** diff --git a/debian/patches/series b/debian/patches/series index cb4843382c..cbd97bb208 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,13 +14,10 @@ 030_gtkentry_password-char-circle.patch 031_gtksearchenginetracker_fixes.patch 033_treeview_resizing.patch -040_filechooser_single-click.patch 041_ia32-libs.patch 042_treeview_single-focus.patch 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch 091_workaround_no_gtk_init_incorrect_display.patch 092_recentfiles-recursion-fix.patch -093_directfb-type-changes.patch -094_directfb-deprecation-fixes.patch 095_gtk-im-module-setting.patch