--- gnome-panel-2.20.0.1.orig/debian/patches/15_no_animation_if_composited.patch +++ gnome-panel-2.20.0.1/debian/patches/15_no_animation_if_composited.patch @@ -0,0 +1,26 @@ +--- gnome-panel-2.19.92.orig/debian/patches/15_no_animation_if_composited.patch ++++ gnome-panel-2.19.92/debian/patches/15_no_animation_if_composited.patch +@@ -0,0 +1,23 @@ ++diff -ur gnome-panel-2.19.92/gnome-panel/panel-config-global.c gnome-panel-2.19.92.new/gnome-panel/panel-config-global.c ++--- gnome-panel-2.19.92/gnome-panel/panel-config-global.c 2007-09-04 12:34:26.000000000 -0500 +++++ gnome-panel-2.19.92.new/gnome-panel/panel-config-global.c 2007-09-14 11:57:00.000000000 -0500 ++@@ -29,6 +29,7 @@ ++ ++ #include ++ #include +++#include ++ ++ #include "panel-globals.h" ++ #include "panel-gconf.h" ++@@ -57,6 +58,11 @@ ++ { ++ g_assert (global_config_initialised == TRUE); ++ +++ //if composited don't show animation +++ GdkScreen *screen = gdk_screen_get_default (); +++ if (screen) +++ return !gdk_screen_is_composited (screen); +++ ++ return global_config.enable_animations; ++ } ++ --- gnome-panel-2.20.0.1.orig/debian/patches/04_default_panel_config.patch +++ gnome-panel-2.20.0.1/debian/patches/04_default_panel_config.patch @@ -0,0 +1,413 @@ +diff -Nur gnome-panel-2.19.5/gnome-panel/panel-default-setup.entries gnome-panel-2.19.5.new/gnome-panel/panel-default-setup.entries +--- gnome-panel-2.19.5/gnome-panel/panel-default-setup.entries 2007-07-08 22:25:49.000000000 +0200 ++++ gnome-panel-2.19.5.new/gnome-panel/panel-default-setup.entries 2007-08-06 21:56:07.000000000 +0200 +@@ -35,6 +35,12 @@ + + email_launcher + ++ ++ yelp_launcher ++ ++ ++ session_dialog ++ + + + +@@ -47,9 +53,6 @@ + + + +- window_menu +- +- + mixer + + +@@ -67,6 +70,15 @@ + + workspace_switcher + ++ ++ trashapplet ++ ++ ++ deskbar ++ ++ ++ fast_user_switch ++ + + + +@@ -262,7 +274,7 @@ + objects/browser_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- epiphany.desktop ++ firefox.desktop + + + +@@ -316,7 +328,7 @@ + objects/email_launcher/launcher_location + /schemas/apps/panel/objects/launcher_location + +- evolution.desktop ++ evolution-mail.desktop + + + +@@ -329,61 +341,61 @@ + objects/email_launcher/menu_path/schemas/apps/panel/objects/menu_path + objects/email_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + +- applets/window_menu/object_type ++ objects/yelp_launcher/object_type + /schemas/apps/panel/objects/object_type + +- bonobo-applet ++ launcher-object + + + +- applets/window_menu/toplevel_id ++ objects/yelp_launcher/toplevel_id + /schemas/apps/panel/objects/toplevel_id + + top_panel + + + +- applets/window_menu/position ++ objects/yelp_launcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 4 + + + +- applets/window_menu/panel_right_stick ++ objects/yelp_launcher/panel_right_stick + /schemas/apps/panel/objects/panel_right_stick + +- true ++ false + + + +- applets/window_menu/locked ++ objects/yelp_launcher/locked + /schemas/apps/panel/objects/locked + + true + + + +- applets/window_menu/bonobo_iid +- /schemas/apps/panel/objects/bonobo_iid ++ objects/yelp_launcher/launcher_location ++ /schemas/apps/panel/objects/launcher_location + +- OAFIID:GNOME_WindowMenuApplet ++ file:///usr/share/applications/yelp.desktop + + + +- applets/window_menu/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id +- applets/window_menu/tooltip/schemas/apps/panel/objects/tooltip +- applets/window_menu/use_custom_icon/schemas/apps/panel/objects/use_custom_icon +- applets/window_menu/custom_icon/schemas/apps/panel/objects/custom_icon +- applets/window_menu/use_menu_path/schemas/apps/panel/objects/use_menu_path +- applets/window_menu/menu_path/schemas/apps/panel/objects/menu_path +- applets/window_menu/launcher_location/schemas/apps/panel/objects/launcher_location +- applets/window_menu/action_type/schemas/apps/panel/objects/action_type ++ objects/yelp_launcher/bonobo_iid/schemas/apps/panel/objects/bonobo_iid ++ objects/yelp_launcher/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ objects/yelp_launcher/tooltip/schemas/apps/panel/objects/tooltip ++ objects/yelp_launcher/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ objects/yelp_launcher/custom_icon/schemas/apps/panel/objects/custom_icon ++ objects/yelp_launcher/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ objects/yelp_launcher/menu_path/schemas/apps/panel/objects/menu_path ++ objects/yelp_launcher/action_type/schemas/apps/panel/objects/action_type + +- ++ + + + applets/mixer/object_type +@@ -403,7 +415,7 @@ + applets/mixer/position + /schemas/apps/panel/objects/position + +- 1 ++ 2 + + + +@@ -457,7 +469,7 @@ + applets/clock/position + /schemas/apps/panel/objects/position + +- 2 ++ 1 + + + +@@ -545,6 +557,114 @@ + applets/notification_area/launcher_location/schemas/apps/panel/objects/launcher_location + applets/notification_area/action_type/schemas/apps/panel/objects/action_type + ++ ++ ++ ++ applets/deskbar/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ bonobo-applet ++ ++ ++ ++ applets/deskbar/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ top_panel ++ ++ ++ ++ applets/deskbar/position ++ /schemas/apps/panel/objects/position ++ ++ 4 ++ ++ ++ ++ applets/deskbar/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ applets/deskbar/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ applets/deskbar/bonobo_iid ++ /schemas/apps/panel/objects/bonobo_iid ++ ++ OAFIID:Deskbar_Applet ++ ++ ++ ++ applets/deskbar/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/deskbar/tooltip/schemas/apps/panel/objects/tooltip ++ applets/deskbar/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/deskbar/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/deskbar/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/deskbar/menu_path/schemas/apps/panel/objects/menu_path ++ applets/deskbar/launcher_location/schemas/apps/panel/objects/launcher_location ++ applets/deskbar/action_type/schemas/apps/panel/objects/action_type ++ ++ ++ ++ ++ applets/fast_user_switch/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ bonobo-applet ++ ++ ++ ++ applets/fast_user_switch/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ top_panel ++ ++ ++ ++ applets/fast_user_switch/position ++ /schemas/apps/panel/objects/position ++ ++ 5 ++ ++ ++ ++ applets/fast_user_switch/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ applets/fast_user_switch/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ applets/fast_user_switch/bonobo_iid ++ /schemas/apps/panel/objects/bonobo_iid ++ ++ OAFIID:GNOME_FastUserSwitchApplet ++ ++ ++ ++ applets/fast_user_switch/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/fast_user_switch/tooltip/schemas/apps/panel/objects/tooltip ++ applets/fast_user_switch/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/fast_user_switch/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/fast_user_switch/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/fast_user_switch/menu_path/schemas/apps/panel/objects/menu_path ++ applets/fast_user_switch/launcher_location/schemas/apps/panel/objects/launcher_location ++ applets/fast_user_switch/action_type/schemas/apps/panel/objects/action_type ++ + + + +@@ -599,6 +719,67 @@ + applets/show_desktop_button/launcher_location/schemas/apps/panel/objects/launcher_location + applets/show_desktop_button/action_type/schemas/apps/panel/objects/action_type + ++ ++ ++ ++ objects/session_dialog/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ action-applet ++ ++ ++ ++ objects/session_dialog/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ top_panel ++ ++ ++ ++ objects/session_dialog/position ++ /schemas/apps/panel/objects/position ++ ++ 0 ++ ++ ++ ++ objects/session_dialog/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ objects/session_dialog/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ objects/session_dialog/action_type ++ /schemas/apps/panel/objects/action_type ++ ++ logout ++ ++ ++ ++ objects/session_dialog/launcher_location ++ /schemas/apps/panel/objects/launcher_location ++ ++ ++ ++ ++ ++ objects/session_dialog/bonobo_iid/schemas/apps/panel/objects/bonobo_iid ++ objects/session_dialog/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ objects/session_dialog/tooltip/schemas/apps/panel/objects/tooltip ++ objects/session_dialog/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ objects/session_dialog/custom_icon/schemas/apps/panel/objects/custom_icon ++ objects/session_dialog/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ objects/session_dialog/menu_path/schemas/apps/panel/objects/menu_path ++ objects/session_dialog/action_type/schemas/apps/panel/objects/action_type ++ + + + +@@ -673,7 +854,7 @@ + applets/workspace_switcher/position + /schemas/apps/panel/objects/position + +- 0 ++ 1 + + + +@@ -707,6 +888,59 @@ + applets/workspace_switcher/launcher_location/schemas/apps/panel/objects/launcher_location + applets/workspace_switcher/action_type/schemas/apps/panel/objects/action_type + ++ ++ ++ ++ applets/trashapplet/object_type ++ /schemas/apps/panel/objects/object_type ++ ++ bonobo-applet ++ ++ ++ ++ applets/trashapplet/toplevel_id ++ /schemas/apps/panel/objects/toplevel_id ++ ++ bottom_panel ++ ++ ++ ++ applets/trashapplet/position ++ /schemas/apps/panel/objects/position ++ ++ 0 ++ ++ ++ ++ applets/trashapplet/panel_right_stick ++ /schemas/apps/panel/objects/panel_right_stick ++ ++ true ++ ++ ++ ++ applets/trashapplet/locked ++ /schemas/apps/panel/objects/locked ++ ++ true ++ ++ ++ ++ applets/trashapplet/bonobo_iid ++ /schemas/apps/panel/objects/bonobo_iid ++ ++ OAFIID:GNOME_Panel_TrashApplet ++ ++ ++ ++ applets/trashapplet/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id ++ applets/trashapplet/tooltip/schemas/apps/panel/objects/tooltip ++ applets/trashapplet/use_custom_icon/schemas/apps/panel/objects/use_custom_icon ++ applets/trashapplet/custom_icon/schemas/apps/panel/objects/custom_icon ++ applets/trashapplet/use_menu_path/schemas/apps/panel/objects/use_menu_path ++ applets/trashapplet/menu_path/schemas/apps/panel/objects/menu_path ++ applets/trashapplet/launcher_location/schemas/apps/panel/objects/launcher_location ++ + + + --- gnome-panel-2.20.0.1.orig/debian/patches/12_autoreconf.patch +++ gnome-panel-2.20.0.1/debian/patches/12_autoreconf.patch @@ -0,0 +1,38221 @@ +diff -Nur gnome-panel-2.20.0/aclocal.m4 gnome-panel-2.20.0.new/aclocal.m4 +--- gnome-panel-2.20.0/aclocal.m4 2007-09-17 21:33:09.000000000 +0200 ++++ gnome-panel-2.20.0.new/aclocal.m4 2007-09-18 11:28:34.000000000 +0200 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.10 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# 2005, 2006 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,4654 +11,4733 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++m4_if(m4_PACKAGE_VERSION, [2.61],, ++[m4_fatal([this file was generated for autoconf 2.61. ++You have another version of autoconf. If you want to use that, ++you should regenerate the build system entirely.], [63])]) + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.9.6])]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ [ --disable-schemas-install Disable the schemas installation], ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +-# Free Software Foundation, Inc. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) ++ ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +-# serial 7 ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 8 ++AC_SUBST($1)dnl ++]) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ USE_NLS=yes ++ AC_SUBST(USE_NLS) + ++ gt_cv_have_gettext=no + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ fi + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" ++ ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi + fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi + fi ++ ]) ++ ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) + fi +- done + +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + ++ # We need to process the po/ directory. ++ POSUB=po + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-#serial 3 ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) + ]) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +-# serial 8 ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +-# Do all the work for Automake. -*- Autoconf -*- ++# gnome-common.m4 ++# + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl GNOME_COMMON_INIT + +-# serial 12 ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. ++ dnl ensure that when the Automake generated makefile calls aclocal, ++ dnl it honours the $ACLOCAL_FLAGS environment variable ++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ++ if test -n "$ac_macro_dir"; then ++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" ++ fi + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi ++ AC_SUBST([ACLOCAL_AMFLAGS]) ++]) + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) + +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi ++]) + +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) ++ if test $USE_MAINTAINER_MODE = yes; then ++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED" ++ else ++ DISABLE_DEPRECATED="" ++ fi ++ AC_SUBST(DISABLE_DEPRECATED) + ]) + ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** + +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) + +-# serial 2 ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) + +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl For C++, do basically the same thing. + +-# serial 4 ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) + +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no ++ fi ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 3 ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi + fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) ++ AC_MSG_RESULT($complCXXFLAGS) + +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +-# serial 4 ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) + ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if test "$gdu_cv_have_gdu" = "yes"; then ++ ifelse([$2],,[:],[$2]) + else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) + fi ++ ++GNOME_DOC_DEFINES + ]) + +-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl -*- mode: autoconf -*- + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +-# +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). +-# +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) +-AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' ++# serial 1 ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH([html-dir], ++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST([HTML_DIR]) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) ++ ++ have_gtk_doc=no ++ if test x$enable_gtk_doc = xyes; then ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi ++ ++ dnl do we want to do a version check? ++ifelse([$1],[],, ++ [gtk_doc_min_version=$1 ++ if test "$have_gtk_doc" = yes; then ++ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ have_gtk_doc=no ++ fi ++ fi ++]) ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi + fi +-fi +-AC_SUBST([mkdir_p])]) + +-# Helper functions for option handling. -*- Autoconf -*- ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# serial 3 ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 36 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) + +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++AC_SUBST(INTLTOOL_DESKTOP_RULE) ++AC_SUBST(INTLTOOL_DIRECTORY_RULE) ++AC_SUBST(INTLTOOL_KEYS_RULE) ++AC_SUBST(INTLTOOL_PROP_RULE) ++AC_SUBST(INTLTOOL_OAF_RULE) ++AC_SUBST(INTLTOOL_PONG_RULE) ++AC_SUBST(INTLTOOL_SERVER_RULE) ++AC_SUBST(INTLTOOL_SHEET_RULE) ++AC_SUBST(INTLTOOL_SOUNDLIST_RULE) ++AC_SUBST(INTLTOOL_UI_RULE) ++AC_SUBST(INTLTOOL_XAM_RULE) ++AC_SUBST(INTLTOOL_KBD_RULE) ++AC_SUBST(INTLTOOL_XML_RULE) ++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++AC_SUBST(INTLTOOL_CAVES_RULE) ++AC_SUBST(INTLTOOL_SCHEMAS_RULE) ++AC_SUBST(INTLTOOL_THEME_RULE) ++AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Use the tools built into the package, not the ones that are installed. ++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') ++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') ++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found; required for intltool]) ++fi ++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then ++ AC_MSG_ERROR([perl 5.x required for intltool]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++IT_PO_SUBDIR([po]) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl The following is very similar to ++dnl ++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) ++dnl ++dnl with the following slight differences: ++dnl - the *.in files are in ac_aux_dir, ++dnl - if the file haven't changed upon reconfigure, it's not touched, ++dnl - the evaluation of the third parameter enables a hack which computes ++dnl the actual value of $libdir, ++dnl - the user sees "executing intltool commands", instead of ++dnl "creating intltool-extract" and such. ++dnl ++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were ++dnl a reason for it. + +-# serial 4 ++AC_CONFIG_COMMANDS([intltool], [ + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then ++for file in intltool-extract intltool-merge intltool-update; do ++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ ++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ ++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ ++ < ${ac_aux_dir}/${file}.in > ${file}.out ++ if cmp -s ${file} ${file}.out 2>/dev/null; then ++ rm -f ${file}.out ++ else ++ mv -f ${file}.out ${file} ++ fi ++ chmod ugo+x ${file} ++ chmod u+w ${file} ++done + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++], ++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' ++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) ++]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. + +-# AM_PROG_INSTALL_STRIP ++# IT_PO_SUBDIR(DIRNAME) + # --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.tmp" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) + +-# Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) + +-# serial 2 + +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +-done +-rm -rf conftest.dir + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files +-dnl + +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` +- else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE +- fi ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) + +- AC_ARG_WITH(gconf-source, +- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +- AC_ARG_WITH(gconf-schema-file-dir, +- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl + +- AC_ARG_ENABLE(schemas-install, +- [ --disable-schemas-install Disable the schemas installation], +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 +-# +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl ++ ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl + dnl + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi + ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl +-]) +- +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [AC_REQUIRE([AC_CANONICAL_HOST])dnl +- USE_NLS=yes +- AC_SUBST(USE_NLS) ++esac + +- gt_cv_have_gettext=no ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++# Constants: ++rm="rm -f" + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= + +- # We need to process the po/ directory. +- POSUB=po ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++_LT_CC_BASENAME([$compiler]) + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC ++ fi ++ ;; ++esac + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++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) + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` +-else +- localedir=`eval echo "${datadir}/locale"` +-fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) +-]) ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER + + +-# gnome-common.m4 +-# ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) + +-dnl GNOME_COMMON_INIT + +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_COMPILER_BOILERPLATE + +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi + +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++ac_outfile=conftest.$ac_objext ++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* ++])# _LT_LINKER_BOILERPLATE + +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) + +- if test $USE_MAINTAINER_MODE = yes; then +- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED" +- else +- DISABLE_DEPRECATED="" +- fi +- AC_SUBST(DISABLE_DEPRECATED) +-]) ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi + +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH + +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break + fi +- AC_MSG_RESULT($complCFLAGS) ++ done ++fi + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + +-dnl For C++, do basically the same thing. ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi + fi + fi + fi +- AC_MSG_RESULT($warnCXXFLAGS) ++fi ++fi + +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac +- +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) +- +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH + +-# serial 48 AC_PROG_LIBTOOL + ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; + ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) LD="${LD-ld} -64" ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac + ++need_locks="$enable_libtool_lock" + +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++])# _LT_AC_LOCK + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ 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. ++ $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 ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++]) + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION + + +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-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 +- +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH +- +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +- +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $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 ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $rm conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) + +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION + +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" + +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; + +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ = "XX$teststring") >/dev/null 2>&1 && ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi + ;; + esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) + fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN + +-_LT_CC_BASENAME([$compiler]) + +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + +-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) + +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default ++#if HAVE_DLFCN_H ++#include ++#endif + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++#include + ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_AC_SYS_COMPILER ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF + +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) + ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= + +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; + ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; + +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$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* +-])# _LT_LINKER_BOILERPLATE ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; + ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; + +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX ++ *) ++ 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"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [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"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac + ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi + +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +-case X$ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) + +-echo=${ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +-fi ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi + +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat </dev/null 2>&1 && unset CDPATH ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac + +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac + fi ++])# AC_LIBTOOL_DLOPEN_SELF + +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler ++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++]) ++])# AC_LIBTOOL_PROG_CC_C_O + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi +- fi +- fi ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl ++ ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn + fi ++else ++ need_locks=no + fi +-fi ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR + + +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate + fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; ++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" ++ ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++])# AC_LIBTOOL_SYS_LIB_STRIP ++ ++ ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++m4_if($1,[],[ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' + ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; +- esac ++ ++aix4* | aix5*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi + ;; + esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH + fi +- rm -rf conftest* + ;; + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; +- ]) +-esac + +-need_locks="$enable_libtool_lock" ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; + +-])# _LT_AC_LOCK ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; + ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no + +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$3" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- 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. +- $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 +- $2=yes +- fi +- fi +- $rm conftest* +-]) +- +-if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) +-else +- ifelse([$6], , :, [$6]) +-fi +-])# AC_LIBTOOL_COMPILER_OPTION ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes + ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; + +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The linker can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $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 +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $rm conftest* +- LDFLAGS="$save_LDFLAGS" +-]) ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; + +-if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) +-else +- ifelse([$5], , :, [$5]) +-fi +-])# AC_LIBTOOL_LINKER_OPTION ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; + ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; + +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" ++freebsd1*) ++ dynamic_linker=no ++ ;; + +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes + ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes + ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes + ;; +- +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes + ;; ++ esac ++ ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' + ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; + +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= + ;; + *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ +- = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac + ;; + esac +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; + +-#include ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes + +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ fi + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' + else +- puts (dlerror ()); +- +- exit (status); +-}] +-EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' + fi +-fi +-rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; + +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= ++nto-qnx*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; + ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; + +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; + +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) +- ;; ++rdos*) ++ dynamic_linker=no ++ ;; + +- *) +- 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"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [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"]) +- ]) +- ]) +- ]) +- ]) +- ]) +- ;; ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; + esac ++ ;; + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH + fi ++ ;; + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; + +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no + +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) ++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" ++fi ++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) +- fi + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) ++ fi + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +-])# AC_LIBTOOL_DLOPEN_SELF ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++ else ++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++ fi ++ fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do ++ IFS="$lt_save_ifs" ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++ "") ;; ++ *) AC_MSG_ERROR([invalid tag name: $tagname]) ++ ;; ++ esac + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +-]) +-])# AC_LIBTOOL_PROG_CC_C_O ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) ++ fi + ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile + +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_LIBTOOL_LANG_CXX_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +-hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn +- fi +-else +- need_locks=no +-fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" ++ fi ++ ;; + +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; + ++ *) ++ AC_MSG_ERROR([Unsupported tag name: $tagname]) ++ ;; ++ esac + +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- +-# Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" ++ fi ++ fi ++ done ++ IFS="$lt_save_ifs" + +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" + else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless + fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++])# _LT_AC_TAGCONFIG + + +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) +- ;; +- esac +-fi +-])# AC_LIBTOOL_SYS_LIB_STRIP ++# AC_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN + + +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi +-need_lib_prefix=unknown +-hardcode_into_libs=no ++# AC_LIBTOOL_WIN32_DLL ++# -------------------- ++# declare package support for building win32 DLLs ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_WIN32_DLL + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH ++# AC_ENABLE_SHARED([DEFAULT]) ++# --------------------------- ++# implement the --enable-shared flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_SHARED], ++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([shared], ++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++])# AC_ENABLE_SHARED + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; + +-aix4* | aix5*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; ++# AC_DISABLE_SHARED ++# ----------------- ++# set the default shared flag to --disable-shared ++AC_DEFUN([AC_DISABLE_SHARED], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_SHARED(no) ++])# AC_DISABLE_SHARED + +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; + +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; ++# AC_ENABLE_STATIC([DEFAULT]) ++# --------------------------- ++# implement the --enable-static flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_STATIC], ++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([static], ++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC + +-bsdi[[45]]*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; + +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no ++# AC_DISABLE_STATIC ++# ----------------- ++# set the default static flag to --disable-static ++AC_DEFUN([AC_DISABLE_STATIC], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_STATIC(no) ++])# AC_DISABLE_STATIC + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes + +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++# --------------------------------- ++# implement the --enable-fast-install flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([fast-install], ++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" + ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; ++ esac], ++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++])# AC_ENABLE_FAST_INSTALL + +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; + +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; ++# AC_DISABLE_FAST_INSTALL ++# ----------------------- ++# set the default to --disable-fast-install ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_FAST_INSTALL(no) ++])# AC_DISABLE_FAST_INSTALL + +-freebsd1*) +- dynamic_linker=no +- ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; ++# AC_LIBTOOL_PICMODE([MODE]) ++# -------------------------- ++# implement the --with-pic flag ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++AC_DEFUN([AC_LIBTOOL_PICMODE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++pic_mode=ifelse($#,1,$1,default) ++])# AC_LIBTOOL_PICMODE + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac +- fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- freebsd*) # from 4.6 on +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; + +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes ++# AC_PROG_EGREP ++# ------------- ++# This is predefined starting with Autoconf 2.54, so this conditional ++# definition can be removed once we require Autoconf 2.54 or later. ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' ++ fi]) ++ EGREP=$ac_cv_prog_egrep ++ AC_SUBST([EGREP]) ++])]) ++ ++ ++# AC_PATH_TOOL_PREFIX ++# ------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([AC_PATH_TOOL_PREFIX], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="ifelse([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break + fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++])# AC_PATH_TOOL_PREFIX + +-interix3*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; + +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; ++# AC_PATH_MAGIC ++# ------------- ++# find a file program which can recognize a shared library ++AC_DEFUN([AC_PATH_MAGIC], ++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ else ++ MAGIC_CMD=: ++ fi ++fi ++])# AC_PATH_MAGIC ++ ++ ++# AC_PROG_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([AC_PROG_LD], ++[AC_ARG_WITH([gnu-ld], ++ [AC_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no]) ++AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld + ;; + *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown + ;; + esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &1 conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac ++# AC_PROG_LD_RELOAD_FLAG ++# ---------------------- ++# find reload flag for linker ++# -- PORTME Some linkers may need a different reload flag. ++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], ++[AC_CACHE_CHECK([for $LD option to reload object files], ++ lt_cv_ld_reload_flag, ++ [lt_cv_ld_reload_flag='-r']) ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +- rm -rf conftest* + ;; +- esac ++esac ++])# AC_PROG_LD_RELOAD_FLAG + +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" +- fi + +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; ++# AC_DEPLIBS_CHECK_METHOD ++# ----------------------- ++# how to check for library dependencies ++# -- PORTME fill in with the dynamic library characteristics ++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ++[AC_CACHE_CHECK([how to recognize dependent libraries], ++lt_cv_deplibs_check_method, ++[lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. + +-knetbsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++case $host_os in ++aix4* | aix5*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes ++beos*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++bsdi[[45]]*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' + ;; + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' + else +- shlibpath_overrides_runpath=yes ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi + ;; + +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' ++gnu*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac + ;; + +-sysv4 | sysv4.3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; ++interix[[3-9]]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; + esac ++ lt_cv_deplibs_check_method=pass_all + ;; + +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no ++netbsd* | netbsdelf*-gnu) ++ 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 +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi +- sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-*) +- dynamic_linker=no ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown + ;; +-esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no + +-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" +-fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ fi ++ ;; + ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; + +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++]) ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++])# AC_DEPLIBS_CHECK_METHOD + +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac + +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi ++# AC_PROG_NM ++# ---------- ++# find the pathname to a BSD-compatible name lister ++AC_DEFUN([AC_PROG_NM], ++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM + +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile + +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; ++# AC_CHECK_LIBM ++# ------------- ++# check for math library ++AC_DEFUN([AC_CHECK_LIBM], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it ++ ;; ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ;; ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ;; ++esac ++])# AC_CHECK_LIBM + +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; + +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac ++# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl convenience library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ case $enable_ltdl_convenience in ++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++ "") enable_ltdl_convenience=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++ esac ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_CONVENIENCE + +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" + +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" ++# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl installable library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. ++# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ AC_CHECK_LIB(ltdl, lt_dlinit, ++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++ [if test x"$enable_ltdl_install" = xno; then ++ AC_MSG_WARN([libltdl not installed, but installation disabled]) ++ else ++ enable_ltdl_install=yes ++ fi ++ ]) ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= + fi +-fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE + + +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX + + +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED ++# _LT_AC_LANG_CXX ++# --------------- ++AC_DEFUN([_LT_AC_LANG_CXX], ++[AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++])# _LT_AC_LANG_CXX + ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP + +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED ++# AC_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 + + +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC ++# _LT_AC_LANG_F77 ++# --------------- ++AC_DEFUN([_LT_AC_LANG_F77], ++[AC_REQUIRE([AC_PROG_F77]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++])# _LT_AC_LANG_F77 + + +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ + + +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL ++# _LT_AC_LANG_GCJ ++# --------------- ++AC_DEFUN([_LT_AC_LANG_GCJ], ++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++])# _LT_AC_LANG_GCJ + + +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL ++# AC_LIBTOOL_RC ++# ------------- ++# enable support for Windows resource files ++AC_DEFUN([AC_LIBTOOL_RC], ++[AC_REQUIRE([LT_AC_PROG_RC]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++])# AC_LIBTOOL_RC + + +-# AC_LIBTOOL_PICMODE([MODE]) +-# -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE ++# AC_LIBTOOL_LANG_C_CONFIG ++# ------------------------ ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++[lt_save_CC="$CC" ++AC_LANG_PUSH(C) + ++# Source file extension for C test sources. ++ac_ext=c + +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) ++# Object file extension for compiled C test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" + +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognise shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <&2 ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' + +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org ++_LT_AC_SYS_COMPILER + +-EOF +- fi ;; +- esac +- fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_PATH_TOOL_PREFIX ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++AC_LIBTOOL_SYS_LIB_STRIP ++AC_LIBTOOL_DLOPEN_SELF + +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognise a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# AC_PATH_MAGIC ++# Report which library types will actually be built ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) + ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no + +-# AC_PROG_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; +- esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++else ++ $as_unset lt_cv_prog_gnu_ld ++fi ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++else ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +- ;; +- hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl +- ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl +- ;; +- esac +- ;; ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++else ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++fi + +-interix3*) +- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +- ;; ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; ++ AC_PROG_LD + +-# This must be Linux ELF. +-linux*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +-netbsd*) +- 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 +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +- fi +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown +- ;; +- +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi + else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi +- ;; + +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++fi + +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` +- ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all +- ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' +- ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so +- ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all +- ;; +- pc) +- lt_cv_deplibs_check_method=pass_all ++# PORTME: fill in a description of your system's C++ link characteristics ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++_LT_AC_TAGVAR(ld_shlibs, $1)=yes ++case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- esac +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; +-esac +-]) +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD +- ++ aix4* | aix5*) ++ 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. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no + +-# AC_PROG_NM +-# ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then +- lt_nm_to_check="$lt_nm_to_check nm" +- fi +- for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" ++ # 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*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes + break + ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; + esac +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM ++ done ++ ;; ++ esac + ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-# AC_CHECK_LIBM +-# ------------- +-# check for math library +-AC_DEFUN([AC_CHECK_LIBM], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +- # These system don't have libm, or don't need it +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, cos, LIBM="-lm") +- ;; +-esac +-])# AC_CHECK_LIBM ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +-# (note the single quotes!). If your package is not flat and you're not +-# using automake, define top_builddir and top_srcdir appropriately in +-# the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# and an installed libltdl is not found, it is assumed to be `libltdl'. +-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and top_srcdir +-# appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE +- ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +-])# _LT_AC_LANG_CXX ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + +-# _LT_AC_PROG_CXXCPP +-# ------------------ +-AC_DEFUN([_LT_AC_PROG_CXXCPP], +-[ +-AC_REQUIRE([AC_PROG_CXX]) +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_PROG_CXXCPP +-fi +-])# _LT_AC_PROG_CXXCPP ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ 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 + +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes ++ 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*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++ _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 -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ freebsd-elf*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ gnu*) ++ ;; ++ hpux9*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. + +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ case $host_cpu in ++ hppa*64*|ia64*) ;; ++ *) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac + +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ +- +- +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ +- +- +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC +- +- +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# Object file extension for compiled C test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' +- +-_LT_AC_SYS_COMPILER ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + +-# Report which library types will actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _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*) ++ # 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' + +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + +-aix4* | aix5*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ 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= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + +-# AC_LIBTOOL_LANG_CXX_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + +-# Source file extension for C++ test sources. +-ac_ext=cpp ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $rm $lib.exp' + +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +- AC_PROG_LD ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ psos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) +- 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. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # 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*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- esac ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ output_verbose_link_cmd='echo' + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi ++ # The C++ compiler must be used to create the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ fi + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac + ;; ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' + +- chorus*) + case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- 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 +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- 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*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $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 -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$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(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; +- +- dgux*) + case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; +- ghcx*) +- # Green Hills C++ Compiler ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +@@ -4668,603 +4747,388 @@ + ;; + esac + ;; +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF ++ vxworks*) ++ # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. ++esac ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac ++AC_LIBTOOL_POSTDEP_PREDEP($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++AC_LIBTOOL_CONFIG($1) + +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++AC_LANG_POP ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++])# AC_LIBTOOL_LANG_CXX_CONFIG + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++# ------------------------------------ ++# Figure out "hidden" library dependencies from verbose ++# 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],[ ++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 ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1` in +- *"Version 7."*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _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*) +- # 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' ++ # The `*' in the case matches for architectures that use `case' in ++ # $output_verbose_cmd can trigger glob expansion during the loop ++ # eval without this substitution. ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ for p in `eval $output_verbose_link_cmd`; do ++ case $p in + +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" \ ++ || test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then ++ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then ++ _LT_AC_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then ++ _LT_AC_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; + esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling $1 test program" ++fi ++ ++$rm -f confest.$objext ++ ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++interix[[3-9]]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_AC_TAGVAR(predep_objects,$1)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; + esac +- ;; +- netbsd*) +- 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= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi +- output_verbose_link_cmd='echo' + ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++ esac ++ ;; ++esac ++]) + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++case " $_LT_AC_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++])# AC_LIBTOOL_POSTDEP_PREDEP + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# AC_LIBTOOL_LANG_F77_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) ++AC_DEFUN([_LT_AC_LANG_F77_CONFIG], ++[AC_REQUIRE([AC_PROG_F77]) ++AC_LANG_PUSH(Fortran 77) + +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++# Source file extension for f77 test sources. ++ac_ext=f + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# Code to be used in simple link tests ++lt_simple_link_test_code="\ ++ program t ++ end ++" + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) + +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++aix4* | aix5*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++AC_MSG_RESULT([$enable_shared]) + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++_LT_AC_TAGVAR(GCC, $1)="$G77" ++_LT_AC_TAGVAR(LD, $1)="$LD" + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++AC_LIBTOOL_CONFIG($1) + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_F77_CONFIG + +- output_verbose_link_cmd='echo' + +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++# AC_LIBTOOL_LANG_GCJ_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) ++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], ++[AC_LANG_SAVE + +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# Source file extension for Java test sources. ++ac_ext=java + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}" + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-AC_LIBTOOL_POSTDEP_PREDEP($1) ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) + AC_LIBTOOL_PROG_COMPILER_PIC($1) + AC_LIBTOOL_PROG_CC_C_O($1) + AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +@@ -5274,302 +5138,32 @@ + + AC_LIBTOOL_CONFIG($1) + +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_GCJ_CONFIG + +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------------------ +-# Figure out "hidden" library dependencies from verbose +-# 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],[ +-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 +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -6560,7 +6110,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6625,1486 +6175,2433 @@ + *) + ;; + esac +- ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ 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). ++ # 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' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ 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' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ newsos6) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ rdos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ solaris*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ ++ uts4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++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_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++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_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++]) ++ ++ ++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++# ------------------------------------ ++# See if the linker supports building shared libraries. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++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*) ++ # 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 ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ ;; ++ 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' ++ ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++],[ ++ runpath_var= ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)= ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++ _LT_AC_TAGVAR(module_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_AC_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # 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_" ++ # 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. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix3* | aix4* | aix5*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | k*bsd*-gnu) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ tmp_addflag= ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test $supports_anon_versioning = yes; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ $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 ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ 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= ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; ++ ++ aix4* | aix5*) ++ 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. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # 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 ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # 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*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ # see comment about different semantics on the GNU ld section ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ ++ 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 "$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}' ++ else ++ case $cc_basename in ++ xlc*) ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' ++ _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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ freebsd1*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + esac +- ;; +- vxworks*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-], +-[ +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + fi + ;; + +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. ++ netbsd* | netbsdelf*-gnu) ++ 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 ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- mingw* | 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' ++ newsos6) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi + ;; + +- interix3*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. ++ os2*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; ++ solaris*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi + ;; + esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; +- +- mingw* | 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' ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ runpath_var='LD_RUN_PATH' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ sysv4.3*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ fi + ;; + +- linux*) +- case $cc_basename in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All Alpha code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- esac ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + +- osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + +- solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +- esac ++ uts4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. + ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $rm conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 + fi ++ $rm conftest* ++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) + ;; ++ esac ++ fi ++ ;; ++esac ++])# AC_LIBTOOL_PROG_LD_SHLIBS + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; + +- unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; ++# _LT_AC_FILE_LTDLL_C ++# ------------------- ++# Be careful that the start marker always follows a newline. ++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++# /* ltdll.c starts here */ ++# #define WIN32_LEAN_AND_MEAN ++# #include ++# #undef WIN32_LEAN_AND_MEAN ++# #include ++# ++# #ifndef __CYGWIN__ ++# # ifdef __CYGWIN32__ ++# # define __CYGWIN__ __CYGWIN32__ ++# # endif ++# #endif ++# ++# #ifdef __cplusplus ++# extern "C" { ++# #endif ++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++# #ifdef __cplusplus ++# } ++# #endif ++# ++# #ifdef __CYGWIN__ ++# #include ++# DECLARE_CYGWIN_DLL( DllMain ); ++# #endif ++# HINSTANCE __hDllInstance_base; ++# ++# BOOL APIENTRY ++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++# { ++# __hDllInstance_base = hInst; ++# return TRUE; ++# } ++# /* ltdll.c ends here */ ++])# _LT_AC_FILE_LTDLL_C ++ ++ ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) + +- uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +- +-# +-# Check to make sure the PIC flag actually works. +-# +-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_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac + +-# +-# Check to make sure the static flag actually works. +-# +-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_tmp_static_flag, +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++AC_DEFUN([LT_AC_PROG_RC], ++[AC_CHECK_TOOL(RC, windres, no) + ]) + + +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ +-# See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-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*) +- # 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 +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; +- 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' +- ;; +- *) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- esac +-],[ +- runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # 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_" +- # 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. +- extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- _LT_CC_BASENAME([$compiler]) +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +- +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' +- +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac ++# Cheap backport of AS_EXECUTABLE_P and required macros ++# from Autoconf 2.59; we should not use $as_executable_p directly. + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix3* | aix4* | aix5*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++# _AS_TEST_PREPARE ++# ---------------- ++m4_ifndef([_AS_TEST_PREPARE], ++[m4_defun([_AS_TEST_PREPARE], ++[if test -x / >/dev/null 2>&1; then ++ as_executable_p='test -x' ++else ++ as_executable_p='test -f' ++fi ++])])# _AS_TEST_PREPARE + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. ++# AS_EXECUTABLE_P ++# --------------- ++# Check whether a file is executable. ++m4_ifndef([AS_EXECUTABLE_P], ++[m4_defun([AS_EXECUTABLE_P], ++[AS_REQUIRE([_AS_TEST_PREPARE])dnl ++$as_executable_p $1[]dnl ++])])# AS_EXECUTABLE_P + +-EOF ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_SED. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi +- ;; ++ done ++ done ++done ++IFS=$as_save_IFS ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG + +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[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 + +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +- interix3*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- ;; + +- linux*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- tmp_addflag= +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +- netbsd*) +- 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= +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++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 --errors-to-stdout --print-errors "$2"` ++ else ++ $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 + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++$$1_PKG_ERRORS + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +-_LT_EOF +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +- sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++_PKG_TEXT + +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then +- runpath_var= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- aix4* | aix5*) +- 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. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # 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 +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) + +- # 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*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.10])dnl ++_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# AM_CONDITIONAL -*- Autoconf -*- + +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' +- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; ++# serial 8 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++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 "$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}' +- else +- case $cc_basename in +- xlc*) +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$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(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# serial 9 + +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +- hpux9*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ break + fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- fi +- ;; + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- fi +- ;; ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- netbsd*) +- 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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++#serial 3 + +- openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +- os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; + +- osf3*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# serial 8 + +- solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- wlarc='' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; +- *) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Do all the work for Automake. -*- Autoconf -*- + +- sysv4) +- case $host_vendor in +- sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +- ;; ++# serial 12 ++ ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.60])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++fi + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++]) + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; + +- uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +-# Do we need to explicitly link libc? ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. + # +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++# serial 2 + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac +- fi +- ;; +-esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include +-# #undef WIN32_LEAN_AND_MEAN +-# #include +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; +-# +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# serial 4 + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) + ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) ++# serial 3 + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf + ]) + +-# NOTE: This macro has been submitted for inclusion into # +-# GNU Autoconf as AC_PROG_SED. When it is available in # +-# a released version of Autoconf we should remove this # +-# macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], +-[AC_MSG_CHECKING([for a sed that does not truncate output]) +-AC_CACHE_VAL(lt_cv_path_SED, +-[# Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done +- done +-done +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-]) +-SED=$lt_cv_path_SED +-AC_MSG_RESULT([$SED]) +-]) ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. + # +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# General Public License for more details. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 5 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# serial 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) + # ---------------------------------- +-AC_DEFUN([PKG_PROG_PKG_CONFIG], +-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. + # +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + ++# serial 4 + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[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 ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi + ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-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 --errors-to-stdout --print-errors "$2"` +- else +- $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 ++# Check how to create a tarball. -*- Autoconf -*- + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-$$1_PKG_ERRORS ++# serial 2 + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +-_PKG_TEXT +-])], +- [$4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +-_PKG_TEXT ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + +-m4_include([m4/d-type.m4]) +-m4_include([m4/gnome-doc-utils.m4]) +-m4_include([m4/gtk-doc.m4]) +-m4_include([m4/intltool.m4]) +diff -Nur gnome-panel-2.20.0/applets/clock/e-map/Makefile.in gnome-panel-2.20.0.new/applets/clock/e-map/Makefile.in +--- gnome-panel-2.20.0/applets/clock/e-map/Makefile.in 2007-09-17 21:33:28.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/clock/e-map/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = applets/clock/e-map + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -55,17 +48,18 @@ + am_libemap_a_OBJECTS = libemap_a-e-map.$(OBJEXT) \ + libemap_a-e-map-marshal.$(OBJEXT) + libemap_a_OBJECTS = $(am_libemap_a_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libemap_a_SOURCES) + DIST_SOURCES = $(libemap_a_SOURCES) + ETAGS = etags +@@ -74,8 +68,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -92,8 +84,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -115,20 +105,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -136,14 +118,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -154,14 +131,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -173,7 +148,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -186,14 +160,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -216,6 +187,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -223,8 +195,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -232,13 +202,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -250,6 +220,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -277,8 +248,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = \ + -DMAP_DIR=\""$(datadir)/gnome-panel/pixmaps"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +@@ -350,50 +324,50 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libemap_a-e-map.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libemap_a-e-map.o: e-map.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map.o -MD -MP -MF "$(DEPDIR)/libemap_a-e-map.Tpo" -c -o libemap_a-e-map.o `test -f 'e-map.c' || echo '$(srcdir)/'`e-map.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libemap_a-e-map.Tpo" "$(DEPDIR)/libemap_a-e-map.Po"; else rm -f "$(DEPDIR)/libemap_a-e-map.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map.o -MD -MP -MF $(DEPDIR)/libemap_a-e-map.Tpo -c -o libemap_a-e-map.o `test -f 'e-map.c' || echo '$(srcdir)/'`e-map.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libemap_a-e-map.Tpo $(DEPDIR)/libemap_a-e-map.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e-map.c' object='libemap_a-e-map.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -c -o libemap_a-e-map.o `test -f 'e-map.c' || echo '$(srcdir)/'`e-map.c + + libemap_a-e-map.obj: e-map.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map.obj -MD -MP -MF "$(DEPDIR)/libemap_a-e-map.Tpo" -c -o libemap_a-e-map.obj `if test -f 'e-map.c'; then $(CYGPATH_W) 'e-map.c'; else $(CYGPATH_W) '$(srcdir)/e-map.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libemap_a-e-map.Tpo" "$(DEPDIR)/libemap_a-e-map.Po"; else rm -f "$(DEPDIR)/libemap_a-e-map.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map.obj -MD -MP -MF $(DEPDIR)/libemap_a-e-map.Tpo -c -o libemap_a-e-map.obj `if test -f 'e-map.c'; then $(CYGPATH_W) 'e-map.c'; else $(CYGPATH_W) '$(srcdir)/e-map.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libemap_a-e-map.Tpo $(DEPDIR)/libemap_a-e-map.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e-map.c' object='libemap_a-e-map.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -c -o libemap_a-e-map.obj `if test -f 'e-map.c'; then $(CYGPATH_W) 'e-map.c'; else $(CYGPATH_W) '$(srcdir)/e-map.c'; fi` + + libemap_a-e-map-marshal.o: e-map-marshal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map-marshal.o -MD -MP -MF "$(DEPDIR)/libemap_a-e-map-marshal.Tpo" -c -o libemap_a-e-map-marshal.o `test -f 'e-map-marshal.c' || echo '$(srcdir)/'`e-map-marshal.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libemap_a-e-map-marshal.Tpo" "$(DEPDIR)/libemap_a-e-map-marshal.Po"; else rm -f "$(DEPDIR)/libemap_a-e-map-marshal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map-marshal.o -MD -MP -MF $(DEPDIR)/libemap_a-e-map-marshal.Tpo -c -o libemap_a-e-map-marshal.o `test -f 'e-map-marshal.c' || echo '$(srcdir)/'`e-map-marshal.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libemap_a-e-map-marshal.Tpo $(DEPDIR)/libemap_a-e-map-marshal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e-map-marshal.c' object='libemap_a-e-map-marshal.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -c -o libemap_a-e-map-marshal.o `test -f 'e-map-marshal.c' || echo '$(srcdir)/'`e-map-marshal.c + + libemap_a-e-map-marshal.obj: e-map-marshal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map-marshal.obj -MD -MP -MF "$(DEPDIR)/libemap_a-e-map-marshal.Tpo" -c -o libemap_a-e-map-marshal.obj `if test -f 'e-map-marshal.c'; then $(CYGPATH_W) 'e-map-marshal.c'; else $(CYGPATH_W) '$(srcdir)/e-map-marshal.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libemap_a-e-map-marshal.Tpo" "$(DEPDIR)/libemap_a-e-map-marshal.Po"; else rm -f "$(DEPDIR)/libemap_a-e-map-marshal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -MT libemap_a-e-map-marshal.obj -MD -MP -MF $(DEPDIR)/libemap_a-e-map-marshal.Tpo -c -o libemap_a-e-map-marshal.obj `if test -f 'e-map-marshal.c'; then $(CYGPATH_W) 'e-map-marshal.c'; else $(CYGPATH_W) '$(srcdir)/e-map-marshal.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libemap_a-e-map-marshal.Tpo $(DEPDIR)/libemap_a-e-map-marshal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e-map-marshal.c' object='libemap_a-e-map-marshal.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libemap_a_CFLAGS) $(CFLAGS) -c -o libemap_a-e-map-marshal.obj `if test -f 'e-map-marshal.c'; then $(CYGPATH_W) 'e-map-marshal.c'; else $(CYGPATH_W) '$(srcdir)/e-map-marshal.c'; fi` +@@ -404,10 +378,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -457,22 +427,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -523,7 +492,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -537,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -563,19 +540,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + + e-map-marshal.h: e-map-marshal.list +diff -Nur gnome-panel-2.20.0/applets/clock/Makefile.in gnome-panel-2.20.0.new/applets/clock/Makefile.in +--- gnome-panel-2.20.0/applets/clock/Makefile.in 2007-09-17 21:33:28.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/clock/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,15 +16,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -42,10 +38,7 @@ + subdir = applets/clock + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -89,6 +82,10 @@ + @CLOCK_INPROCESS_TRUE@am_libclock_applet_la_OBJECTS = \ + @CLOCK_INPROCESS_TRUE@ $(am__objects_3) + libclock_applet_la_OBJECTS = $(am_libclock_applet_la_OBJECTS) ++libclock_applet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libclock_applet_la_CFLAGS) $(CFLAGS) \ ++ $(libclock_applet_la_LDFLAGS) $(LDFLAGS) -o $@ + @CLOCK_INPROCESS_TRUE@am_libclock_applet_la_rpath = -rpath \ + @CLOCK_INPROCESS_TRUE@ $(clock_appletlibdir) + libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@@ -114,31 +111,38 @@ + clock_applet_OBJECTS = $(am_clock_applet_OBJECTS) + @CLOCK_INPROCESS_FALSE@clock_applet_DEPENDENCIES = \ + @CLOCK_INPROCESS_FALSE@ $(am__DEPENDENCIES_2) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++clock_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(clock_applet_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libclock_applet_la_SOURCES) $(clock_applet_SOURCES) + DIST_SOURCES = $(am__libclock_applet_la_SOURCES_DIST) \ + $(am__clock_applet_SOURCES_DIST) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + gladeDATA_INSTALL = $(INSTALL_DATA) + schemasDATA_INSTALL = $(INSTALL_DATA) + serverDATA_INSTALL = $(INSTALL_DATA) + uiDATA_INSTALL = $(INSTALL_DATA) + DATA = $(glade_DATA) $(schemas_DATA) $(server_DATA) $(ui_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -146,8 +150,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -164,8 +166,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -187,20 +187,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -208,14 +200,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -226,14 +213,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -245,7 +230,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -258,14 +242,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -288,6 +269,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -295,8 +277,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -304,13 +284,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -322,6 +302,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -349,8 +330,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = e-map + INCLUDES = \ + -I$(srcdir)/../../libpanel-applet \ +@@ -479,7 +463,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-clock_appletlibLTLIBRARIES: $(clock_appletlib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(clock_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(clock_appletlibdir)" ++ test -z "$(clock_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(clock_appletlibdir)" + @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -490,7 +474,7 @@ + + uninstall-clock_appletlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(clock_appletlibdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \ +@@ -505,10 +489,10 @@ + rm -f "$${dir}/so_locations"; \ + done + libclock-applet.la: $(libclock_applet_la_OBJECTS) $(libclock_applet_la_DEPENDENCIES) +- $(LINK) $(am_libclock_applet_la_rpath) $(libclock_applet_la_LDFLAGS) $(libclock_applet_la_OBJECTS) $(libclock_applet_la_LIBADD) $(LIBS) ++ $(libclock_applet_la_LINK) $(am_libclock_applet_la_rpath) $(libclock_applet_la_OBJECTS) $(libclock_applet_la_LIBADD) $(LIBS) + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -536,7 +520,7 @@ + done + clock-applet$(EXEEXT): $(clock_applet_OBJECTS) $(clock_applet_DEPENDENCIES) + @rm -f clock-applet$(EXEEXT) +- $(LINK) $(clock_applet_LDFLAGS) $(clock_applet_OBJECTS) $(clock_applet_LDADD) $(LIBS) ++ $(clock_applet_LINK) $(clock_applet_OBJECTS) $(clock_applet_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -568,253 +552,253 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclock_applet_la-tz.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libclock_applet_la-calendar-window.lo: calendar-window.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-window.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo" -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-window.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-window.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-window.Tpo -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-window.Tpo $(DEPDIR)/libclock_applet_la-calendar-window.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='libclock_applet_la-calendar-window.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c + + libclock_applet_la-tz-window.lo: tz-window.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-window.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-tz-window.Tpo" -c -o libclock_applet_la-tz-window.lo `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-tz-window.Tpo" "$(DEPDIR)/libclock_applet_la-tz-window.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-tz-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-window.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-tz-window.Tpo -c -o libclock_applet_la-tz-window.lo `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-tz-window.Tpo $(DEPDIR)/libclock_applet_la-tz-window.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-window.c' object='libclock_applet_la-tz-window.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-window.lo `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-window.lo `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c + + libclock_applet_la-tz-sel-dialog.lo: tz-sel-dialog.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-sel-dialog.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-tz-sel-dialog.Tpo" -c -o libclock_applet_la-tz-sel-dialog.lo `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-tz-sel-dialog.Tpo" "$(DEPDIR)/libclock_applet_la-tz-sel-dialog.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-tz-sel-dialog.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-sel-dialog.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-tz-sel-dialog.Tpo -c -o libclock_applet_la-tz-sel-dialog.lo `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-tz-sel-dialog.Tpo $(DEPDIR)/libclock_applet_la-tz-sel-dialog.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-sel-dialog.c' object='libclock_applet_la-tz-sel-dialog.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-sel-dialog.lo `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-sel-dialog.lo `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c + + libclock_applet_la-tz-list.lo: tz-list.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-list.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-tz-list.Tpo" -c -o libclock_applet_la-tz-list.lo `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-tz-list.Tpo" "$(DEPDIR)/libclock_applet_la-tz-list.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-tz-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz-list.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-tz-list.Tpo -c -o libclock_applet_la-tz-list.lo `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-tz-list.Tpo $(DEPDIR)/libclock_applet_la-tz-list.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-list.c' object='libclock_applet_la-tz-list.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-list.lo `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz-list.lo `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c + + libclock_applet_la-tz.lo: tz.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-tz.Tpo" -c -o libclock_applet_la-tz.lo `test -f 'tz.c' || echo '$(srcdir)/'`tz.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-tz.Tpo" "$(DEPDIR)/libclock_applet_la-tz.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-tz.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-tz.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-tz.Tpo -c -o libclock_applet_la-tz.lo `test -f 'tz.c' || echo '$(srcdir)/'`tz.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-tz.Tpo $(DEPDIR)/libclock_applet_la-tz.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz.c' object='libclock_applet_la-tz.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz.lo `test -f 'tz.c' || echo '$(srcdir)/'`tz.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-tz.lo `test -f 'tz.c' || echo '$(srcdir)/'`tz.c + + libclock_applet_la-obox.lo: obox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-obox.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-obox.Tpo" -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-obox.Tpo" "$(DEPDIR)/libclock_applet_la-obox.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-obox.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-obox.Tpo -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-obox.Tpo $(DEPDIR)/libclock_applet_la-obox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='libclock_applet_la-obox.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c + + libclock_applet_la-clock.lo: clock.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock.Tpo" -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock.Tpo" "$(DEPDIR)/libclock_applet_la-clock.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock.Tpo -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock.Tpo $(DEPDIR)/libclock_applet_la-clock.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='libclock_applet_la-clock.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c + + libclock_applet_la-clock-utils.lo: clock-utils.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-utils.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo" -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo" "$(DEPDIR)/libclock_applet_la-clock-utils.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-utils.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-utils.Tpo -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-utils.Tpo $(DEPDIR)/libclock_applet_la-clock-utils.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='libclock_applet_la-clock-utils.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c + + libclock_applet_la-clock-typebuiltins.lo: clock-typebuiltins.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-typebuiltins.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo" -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo" "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-typebuiltins.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='libclock_applet_la-clock-typebuiltins.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c + + libclock_applet_la-calendar-client.lo: calendar-client.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-client.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo" -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-client.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-client.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-client.Tpo -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-client.Tpo $(DEPDIR)/libclock_applet_la-calendar-client.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='libclock_applet_la-calendar-client.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c + + libclock_applet_la-calendar-sources.lo: calendar-sources.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-sources.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo" -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-sources.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-sources.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-sources.Tpo -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-sources.Tpo $(DEPDIR)/libclock_applet_la-calendar-sources.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='libclock_applet_la-calendar-sources.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c + + clock_applet-calendar-window.o: calendar-window.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-window.Tpo" -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-window.Tpo" "$(DEPDIR)/clock_applet-calendar-window.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-window.Tpo -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-window.Tpo $(DEPDIR)/clock_applet-calendar-window.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='clock_applet-calendar-window.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c + + clock_applet-calendar-window.obj: calendar-window.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-window.Tpo" -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-window.Tpo" "$(DEPDIR)/clock_applet-calendar-window.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-window.Tpo -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-window.Tpo $(DEPDIR)/clock_applet-calendar-window.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='clock_applet-calendar-window.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi` + + clock_applet-tz-window.o: tz-window.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-window.o -MD -MP -MF "$(DEPDIR)/clock_applet-tz-window.Tpo" -c -o clock_applet-tz-window.o `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-window.Tpo" "$(DEPDIR)/clock_applet-tz-window.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-window.o -MD -MP -MF $(DEPDIR)/clock_applet-tz-window.Tpo -c -o clock_applet-tz-window.o `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-window.Tpo $(DEPDIR)/clock_applet-tz-window.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-window.c' object='clock_applet-tz-window.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-window.o `test -f 'tz-window.c' || echo '$(srcdir)/'`tz-window.c + + clock_applet-tz-window.obj: tz-window.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-window.obj -MD -MP -MF "$(DEPDIR)/clock_applet-tz-window.Tpo" -c -o clock_applet-tz-window.obj `if test -f 'tz-window.c'; then $(CYGPATH_W) 'tz-window.c'; else $(CYGPATH_W) '$(srcdir)/tz-window.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-window.Tpo" "$(DEPDIR)/clock_applet-tz-window.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-window.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-window.obj -MD -MP -MF $(DEPDIR)/clock_applet-tz-window.Tpo -c -o clock_applet-tz-window.obj `if test -f 'tz-window.c'; then $(CYGPATH_W) 'tz-window.c'; else $(CYGPATH_W) '$(srcdir)/tz-window.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-window.Tpo $(DEPDIR)/clock_applet-tz-window.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-window.c' object='clock_applet-tz-window.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-window.obj `if test -f 'tz-window.c'; then $(CYGPATH_W) 'tz-window.c'; else $(CYGPATH_W) '$(srcdir)/tz-window.c'; fi` + + clock_applet-tz-sel-dialog.o: tz-sel-dialog.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-sel-dialog.o -MD -MP -MF "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo" -c -o clock_applet-tz-sel-dialog.o `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo" "$(DEPDIR)/clock_applet-tz-sel-dialog.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-sel-dialog.o -MD -MP -MF $(DEPDIR)/clock_applet-tz-sel-dialog.Tpo -c -o clock_applet-tz-sel-dialog.o `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-sel-dialog.Tpo $(DEPDIR)/clock_applet-tz-sel-dialog.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-sel-dialog.c' object='clock_applet-tz-sel-dialog.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-sel-dialog.o `test -f 'tz-sel-dialog.c' || echo '$(srcdir)/'`tz-sel-dialog.c + + clock_applet-tz-sel-dialog.obj: tz-sel-dialog.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-sel-dialog.obj -MD -MP -MF "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo" -c -o clock_applet-tz-sel-dialog.obj `if test -f 'tz-sel-dialog.c'; then $(CYGPATH_W) 'tz-sel-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tz-sel-dialog.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo" "$(DEPDIR)/clock_applet-tz-sel-dialog.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-sel-dialog.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-sel-dialog.obj -MD -MP -MF $(DEPDIR)/clock_applet-tz-sel-dialog.Tpo -c -o clock_applet-tz-sel-dialog.obj `if test -f 'tz-sel-dialog.c'; then $(CYGPATH_W) 'tz-sel-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tz-sel-dialog.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-sel-dialog.Tpo $(DEPDIR)/clock_applet-tz-sel-dialog.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-sel-dialog.c' object='clock_applet-tz-sel-dialog.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-sel-dialog.obj `if test -f 'tz-sel-dialog.c'; then $(CYGPATH_W) 'tz-sel-dialog.c'; else $(CYGPATH_W) '$(srcdir)/tz-sel-dialog.c'; fi` + + clock_applet-tz-list.o: tz-list.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-list.o -MD -MP -MF "$(DEPDIR)/clock_applet-tz-list.Tpo" -c -o clock_applet-tz-list.o `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-list.Tpo" "$(DEPDIR)/clock_applet-tz-list.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-list.o -MD -MP -MF $(DEPDIR)/clock_applet-tz-list.Tpo -c -o clock_applet-tz-list.o `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-list.Tpo $(DEPDIR)/clock_applet-tz-list.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-list.c' object='clock_applet-tz-list.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-list.o `test -f 'tz-list.c' || echo '$(srcdir)/'`tz-list.c + + clock_applet-tz-list.obj: tz-list.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-list.obj -MD -MP -MF "$(DEPDIR)/clock_applet-tz-list.Tpo" -c -o clock_applet-tz-list.obj `if test -f 'tz-list.c'; then $(CYGPATH_W) 'tz-list.c'; else $(CYGPATH_W) '$(srcdir)/tz-list.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz-list.Tpo" "$(DEPDIR)/clock_applet-tz-list.Po"; else rm -f "$(DEPDIR)/clock_applet-tz-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz-list.obj -MD -MP -MF $(DEPDIR)/clock_applet-tz-list.Tpo -c -o clock_applet-tz-list.obj `if test -f 'tz-list.c'; then $(CYGPATH_W) 'tz-list.c'; else $(CYGPATH_W) '$(srcdir)/tz-list.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz-list.Tpo $(DEPDIR)/clock_applet-tz-list.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz-list.c' object='clock_applet-tz-list.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz-list.obj `if test -f 'tz-list.c'; then $(CYGPATH_W) 'tz-list.c'; else $(CYGPATH_W) '$(srcdir)/tz-list.c'; fi` + + clock_applet-tz.o: tz.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz.o -MD -MP -MF "$(DEPDIR)/clock_applet-tz.Tpo" -c -o clock_applet-tz.o `test -f 'tz.c' || echo '$(srcdir)/'`tz.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz.Tpo" "$(DEPDIR)/clock_applet-tz.Po"; else rm -f "$(DEPDIR)/clock_applet-tz.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz.o -MD -MP -MF $(DEPDIR)/clock_applet-tz.Tpo -c -o clock_applet-tz.o `test -f 'tz.c' || echo '$(srcdir)/'`tz.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz.Tpo $(DEPDIR)/clock_applet-tz.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz.c' object='clock_applet-tz.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz.o `test -f 'tz.c' || echo '$(srcdir)/'`tz.c + + clock_applet-tz.obj: tz.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz.obj -MD -MP -MF "$(DEPDIR)/clock_applet-tz.Tpo" -c -o clock_applet-tz.obj `if test -f 'tz.c'; then $(CYGPATH_W) 'tz.c'; else $(CYGPATH_W) '$(srcdir)/tz.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-tz.Tpo" "$(DEPDIR)/clock_applet-tz.Po"; else rm -f "$(DEPDIR)/clock_applet-tz.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-tz.obj -MD -MP -MF $(DEPDIR)/clock_applet-tz.Tpo -c -o clock_applet-tz.obj `if test -f 'tz.c'; then $(CYGPATH_W) 'tz.c'; else $(CYGPATH_W) '$(srcdir)/tz.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-tz.Tpo $(DEPDIR)/clock_applet-tz.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz.c' object='clock_applet-tz.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-tz.obj `if test -f 'tz.c'; then $(CYGPATH_W) 'tz.c'; else $(CYGPATH_W) '$(srcdir)/tz.c'; fi` + + clock_applet-obox.o: obox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.o -MD -MP -MF "$(DEPDIR)/clock_applet-obox.Tpo" -c -o clock_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-obox.Tpo" "$(DEPDIR)/clock_applet-obox.Po"; else rm -f "$(DEPDIR)/clock_applet-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.o -MD -MP -MF $(DEPDIR)/clock_applet-obox.Tpo -c -o clock_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-obox.Tpo $(DEPDIR)/clock_applet-obox.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='clock_applet-obox.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c + + clock_applet-obox.obj: obox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.obj -MD -MP -MF "$(DEPDIR)/clock_applet-obox.Tpo" -c -o clock_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-obox.Tpo" "$(DEPDIR)/clock_applet-obox.Po"; else rm -f "$(DEPDIR)/clock_applet-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.obj -MD -MP -MF $(DEPDIR)/clock_applet-obox.Tpo -c -o clock_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-obox.Tpo $(DEPDIR)/clock_applet-obox.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='clock_applet-obox.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi` + + clock_applet-clock.o: clock.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock.Tpo" -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock.Tpo" "$(DEPDIR)/clock_applet-clock.Po"; else rm -f "$(DEPDIR)/clock_applet-clock.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.o -MD -MP -MF $(DEPDIR)/clock_applet-clock.Tpo -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock.Tpo $(DEPDIR)/clock_applet-clock.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='clock_applet-clock.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c + + clock_applet-clock.obj: clock.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock.Tpo" -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock.Tpo" "$(DEPDIR)/clock_applet-clock.Po"; else rm -f "$(DEPDIR)/clock_applet-clock.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock.Tpo -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock.Tpo $(DEPDIR)/clock_applet-clock.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='clock_applet-clock.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi` + + clock_applet-clock-utils.o: clock-utils.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-utils.Tpo" -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-utils.Tpo" "$(DEPDIR)/clock_applet-clock-utils.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-utils.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-utils.Tpo -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-utils.Tpo $(DEPDIR)/clock_applet-clock-utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='clock_applet-clock-utils.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c + + clock_applet-clock-utils.obj: clock-utils.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-utils.Tpo" -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-utils.Tpo" "$(DEPDIR)/clock_applet-clock-utils.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-utils.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-utils.Tpo -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-utils.Tpo $(DEPDIR)/clock_applet-clock-utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='clock_applet-clock-utils.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi` + + clock_applet-clock-typebuiltins.o: clock-typebuiltins.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" "$(DEPDIR)/clock_applet-clock-typebuiltins.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo $(DEPDIR)/clock_applet-clock-typebuiltins.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='clock_applet-clock-typebuiltins.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c + + clock_applet-clock-typebuiltins.obj: clock-typebuiltins.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" "$(DEPDIR)/clock_applet-clock-typebuiltins.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo $(DEPDIR)/clock_applet-clock-typebuiltins.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='clock_applet-clock-typebuiltins.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi` + + clock_applet-calendar-client.o: calendar-client.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-client.Tpo" -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-client.Tpo" "$(DEPDIR)/clock_applet-calendar-client.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-client.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-client.Tpo -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-client.Tpo $(DEPDIR)/clock_applet-calendar-client.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='clock_applet-calendar-client.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c + + clock_applet-calendar-client.obj: calendar-client.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-client.Tpo" -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-client.Tpo" "$(DEPDIR)/clock_applet-calendar-client.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-client.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-client.Tpo -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-client.Tpo $(DEPDIR)/clock_applet-calendar-client.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='clock_applet-calendar-client.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi` + + clock_applet-calendar-sources.o: calendar-sources.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-sources.Tpo" -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo" "$(DEPDIR)/clock_applet-calendar-sources.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-sources.Tpo -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-sources.Tpo $(DEPDIR)/clock_applet-calendar-sources.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='clock_applet-calendar-sources.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c + + clock_applet-calendar-sources.obj: calendar-sources.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-sources.Tpo" -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo" "$(DEPDIR)/clock_applet-calendar-sources.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-sources.Tpo -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-sources.Tpo $(DEPDIR)/clock_applet-calendar-sources.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='clock_applet-calendar-sources.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi` +@@ -824,13 +808,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -847,7 +827,7 @@ + done + install-schemasDATA: $(schemas_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" ++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -864,7 +844,7 @@ + done + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" ++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -881,7 +861,7 @@ + done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -928,8 +908,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -1030,22 +1009,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1059,7 +1037,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -1067,6 +1045,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1078,7 +1058,7 @@ + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(clock_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +@@ -1116,7 +1096,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + +@@ -1132,12 +1112,20 @@ + install-gladeDATA install-schemasDATA install-serverDATA \ + install-uiDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-libexecPROGRAMS + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1159,30 +1147,33 @@ + ps-am: + + uninstall-am: uninstall-clock_appletlibLTLIBRARIES uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ +- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA ++ uninstall-libexecPROGRAMS uninstall-schemasDATA \ ++ uninstall-serverDATA uninstall-uiDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-clock_appletlibLTLIBRARIES clean-generic \ +- clean-libexecPROGRAMS clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean \ ++ clean-clock_appletlibLTLIBRARIES clean-generic \ ++ clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am \ + install-clock_appletlibLTLIBRARIES install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-gladeDATA install-info install-info-am \ +- install-libexecPROGRAMS install-man install-schemasDATA \ ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-gladeDATA install-html \ ++ install-html-am install-info install-info-am \ ++ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-schemasDATA \ + install-serverDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-clock_appletlibLTLIBRARIES uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ +- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA ++ uninstall-libexecPROGRAMS uninstall-schemasDATA \ ++ uninstall-serverDATA uninstall-uiDATA + + + clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers) +diff -Nur gnome-panel-2.20.0/applets/fish/Makefile.in gnome-panel-2.20.0.new/applets/fish/Makefile.in +--- gnome-panel-2.20.0/applets/fish/Makefile.in 2007-09-17 21:33:29.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,15 +16,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -42,10 +38,7 @@ + subdir = applets/fish + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -73,6 +66,10 @@ + @FISH_INPROCESS_TRUE@am_libfish_applet_2_la_OBJECTS = \ + @FISH_INPROCESS_TRUE@ $(am__objects_1) + libfish_applet_2_la_OBJECTS = $(am_libfish_applet_2_la_OBJECTS) ++libfish_applet_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libfish_applet_2_la_CFLAGS) $(CFLAGS) \ ++ $(libfish_applet_2_la_LDFLAGS) $(LDFLAGS) -o $@ + @FISH_INPROCESS_TRUE@am_libfish_applet_2_la_rpath = -rpath \ + @FISH_INPROCESS_TRUE@ $(fish_applet_2libdir) + libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@@ -83,17 +80,21 @@ + fish_applet_2_OBJECTS = $(am_fish_applet_2_OBJECTS) + @FISH_INPROCESS_FALSE@fish_applet_2_DEPENDENCIES = \ + @FISH_INPROCESS_FALSE@ $(am__DEPENDENCIES_2) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++fish_applet_2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fish_applet_2_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libfish_applet_2_la_SOURCES) $(fish_applet_2_SOURCES) + DIST_SOURCES = $(am__libfish_applet_2_la_SOURCES_DIST) \ + $(am__fish_applet_2_SOURCES_DIST) +@@ -110,8 +111,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -128,8 +127,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -151,20 +148,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -172,14 +161,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -190,14 +174,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -209,7 +191,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -222,14 +203,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -252,6 +230,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -259,8 +238,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -268,13 +245,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -286,6 +263,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -313,8 +291,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = \ + -I$(srcdir) \ + -I$(srcdir)/../../libpanel-applet \ +@@ -408,7 +389,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-fish_applet_2libLTLIBRARIES: $(fish_applet_2lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(fish_applet_2libdir)" || $(mkdir_p) "$(DESTDIR)$(fish_applet_2libdir)" ++ test -z "$(fish_applet_2libdir)" || $(MKDIR_P) "$(DESTDIR)$(fish_applet_2libdir)" + @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -419,7 +400,7 @@ + + uninstall-fish_applet_2libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \ +@@ -434,10 +415,10 @@ + rm -f "$${dir}/so_locations"; \ + done + libfish-applet-2.la: $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_DEPENDENCIES) +- $(LINK) $(am_libfish_applet_2_la_rpath) $(libfish_applet_2_la_LDFLAGS) $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_LIBADD) $(LIBS) ++ $(libfish_applet_2_la_LINK) $(am_libfish_applet_2_la_rpath) $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_LIBADD) $(LIBS) + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -465,7 +446,7 @@ + done + fish-applet-2$(EXEEXT): $(fish_applet_2_OBJECTS) $(fish_applet_2_DEPENDENCIES) + @rm -f fish-applet-2$(EXEEXT) +- $(LINK) $(fish_applet_2_LDFLAGS) $(fish_applet_2_OBJECTS) $(fish_applet_2_LDADD) $(LIBS) ++ $(fish_applet_2_LINK) $(fish_applet_2_OBJECTS) $(fish_applet_2_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -477,43 +458,43 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfish_applet_2_la-fish.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libfish_applet_2_la-fish.lo: fish.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -MT libfish_applet_2_la-fish.lo -MD -MP -MF "$(DEPDIR)/libfish_applet_2_la-fish.Tpo" -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libfish_applet_2_la-fish.Tpo" "$(DEPDIR)/libfish_applet_2_la-fish.Plo"; else rm -f "$(DEPDIR)/libfish_applet_2_la-fish.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -MT libfish_applet_2_la-fish.lo -MD -MP -MF $(DEPDIR)/libfish_applet_2_la-fish.Tpo -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfish_applet_2_la-fish.Tpo $(DEPDIR)/libfish_applet_2_la-fish.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='libfish_applet_2_la-fish.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c + + fish_applet_2-fish.o: fish.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.o -MD -MP -MF "$(DEPDIR)/fish_applet_2-fish.Tpo" -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fish_applet_2-fish.Tpo" "$(DEPDIR)/fish_applet_2-fish.Po"; else rm -f "$(DEPDIR)/fish_applet_2-fish.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.o -MD -MP -MF $(DEPDIR)/fish_applet_2-fish.Tpo -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fish_applet_2-fish.Tpo $(DEPDIR)/fish_applet_2-fish.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='fish_applet_2-fish.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c + + fish_applet_2-fish.obj: fish.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.obj -MD -MP -MF "$(DEPDIR)/fish_applet_2-fish.Tpo" -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fish_applet_2-fish.Tpo" "$(DEPDIR)/fish_applet_2-fish.Po"; else rm -f "$(DEPDIR)/fish_applet_2-fish.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.obj -MD -MP -MF $(DEPDIR)/fish_applet_2-fish.Tpo -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fish_applet_2-fish.Tpo $(DEPDIR)/fish_applet_2-fish.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='fish_applet_2-fish.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi` +@@ -523,13 +504,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-fishbitmapsDATA: $(fishbitmaps_DATA) + @$(NORMAL_INSTALL) +- test -z "$(fishbitmapsdir)" || $(mkdir_p) "$(DESTDIR)$(fishbitmapsdir)" ++ test -z "$(fishbitmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(fishbitmapsdir)" + @list='$(fishbitmaps_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -546,7 +523,7 @@ + done + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -563,7 +540,7 @@ + done + install-schemasDATA: $(schemas_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" ++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -580,7 +557,7 @@ + done + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" ++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -597,7 +574,7 @@ + done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -662,22 +639,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -693,7 +669,7 @@ + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(fish_applet_2libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -729,7 +705,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -746,12 +722,20 @@ + install-gladeDATA install-schemasDATA install-serverDATA \ + install-uiDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libexecPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -774,8 +758,10 @@ + + uninstall-am: uninstall-fish_applet_2libLTLIBRARIES \ + uninstall-fishbitmapsDATA uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ +- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA ++ uninstall-libexecPROGRAMS uninstall-schemasDATA \ ++ uninstall-serverDATA uninstall-uiDATA ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-fish_applet_2libLTLIBRARIES clean-generic \ +@@ -783,10 +769,12 @@ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-local install-exec install-exec-am \ +- install-fish_applet_2libLTLIBRARIES install-fishbitmapsDATA \ +- install-gladeDATA install-info install-info-am \ +- install-libexecPROGRAMS install-man install-schemasDATA \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-fish_applet_2libLTLIBRARIES \ ++ install-fishbitmapsDATA install-gladeDATA install-html \ ++ install-html-am install-info install-info-am \ ++ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-schemasDATA \ + install-serverDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ +@@ -794,8 +782,8 @@ + tags uninstall uninstall-am \ + uninstall-fish_applet_2libLTLIBRARIES \ + uninstall-fishbitmapsDATA uninstall-gladeDATA \ +- uninstall-info-am uninstall-libexecPROGRAMS \ +- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA ++ uninstall-libexecPROGRAMS uninstall-schemasDATA \ ++ uninstall-serverDATA uninstall-uiDATA + + + $(server_in_files): $(server_in_files).in Makefile +diff -Nur gnome-panel-2.20.0/applets/Makefile.in gnome-panel-2.20.0.new/applets/Makefile.in +--- gnome-panel-2.20.0/applets/Makefile.in 2007-09-17 21:33:26.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = applets + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = \ + clock \ + fish \ +@@ -315,10 +291,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -350,8 +322,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -452,22 +423,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -481,7 +451,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -489,6 +459,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -528,8 +500,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -543,12 +514,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -567,22 +546,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + install-data-local: + if test -f $(DESTDIR)$(gen_util_server); then \ +diff -Nur gnome-panel-2.20.0/applets/notification_area/Makefile.in gnome-panel-2.20.0.new/applets/notification_area/Makefile.in +--- gnome-panel-2.20.0/applets/notification_area/Makefile.in 2007-09-17 21:33:30.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/notification_area/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,15 +16,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,10 +39,7 @@ + subdir = applets/notification_area + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -81,6 +74,10 @@ + @NOTIFICATION_AREA_INPROCESS_TRUE@ $(am__objects_1) + libnotification_area_applet_la_OBJECTS = \ + $(am_libnotification_area_applet_la_OBJECTS) ++libnotification_area_applet_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) \ ++ $(libnotification_area_applet_la_LDFLAGS) $(LDFLAGS) -o $@ + @NOTIFICATION_AREA_INPROCESS_TRUE@am_libnotification_area_applet_la_rpath = \ + @NOTIFICATION_AREA_INPROCESS_TRUE@ -rpath \ + @NOTIFICATION_AREA_INPROCESS_TRUE@ $(notification_area_appletlibdir) +@@ -101,22 +98,27 @@ + $(am_notification_area_applet_OBJECTS) + @NOTIFICATION_AREA_INPROCESS_FALSE@notification_area_applet_DEPENDENCIES = \ + @NOTIFICATION_AREA_INPROCESS_FALSE@ $(am__DEPENDENCIES_2) ++notification_area_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(notification_area_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am_testtray_OBJECTS = fixedtip.$(OBJEXT) na-marshal.$(OBJEXT) \ + na-tray.$(OBJEXT) na-tray-manager.$(OBJEXT) obox.$(OBJEXT) \ + testtray.$(OBJEXT) + testtray_OBJECTS = $(am_testtray_OBJECTS) + testtray_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libnotification_area_applet_la_SOURCES) \ + $(notification_area_applet_SOURCES) $(testtray_SOURCES) + DIST_SOURCES = $(am__libnotification_area_applet_la_SOURCES_DIST) \ +@@ -131,8 +133,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -149,8 +149,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -172,20 +170,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -193,14 +183,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -211,14 +196,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -230,7 +213,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -243,14 +225,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -273,6 +252,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -280,8 +260,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -289,13 +267,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -307,6 +285,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -334,8 +313,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = \ + -I$(srcdir) \ + -I$(srcdir)/../../libpanel-applet \ +@@ -451,7 +433,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-notification_area_appletlibLTLIBRARIES: $(notification_area_appletlib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(notification_area_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(notification_area_appletlibdir)" ++ test -z "$(notification_area_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(notification_area_appletlibdir)" + @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -462,7 +444,7 @@ + + uninstall-notification_area_appletlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \ +@@ -477,10 +459,10 @@ + rm -f "$${dir}/so_locations"; \ + done + libnotification-area-applet.la: $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_DEPENDENCIES) +- $(LINK) $(am_libnotification_area_applet_la_rpath) $(libnotification_area_applet_la_LDFLAGS) $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_LIBADD) $(LIBS) ++ $(libnotification_area_applet_la_LINK) $(am_libnotification_area_applet_la_rpath) $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_LIBADD) $(LIBS) + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -515,10 +497,10 @@ + done + notification-area-applet$(EXEEXT): $(notification_area_applet_OBJECTS) $(notification_area_applet_DEPENDENCIES) + @rm -f notification-area-applet$(EXEEXT) +- $(LINK) $(notification_area_applet_LDFLAGS) $(notification_area_applet_OBJECTS) $(notification_area_applet_LDADD) $(LIBS) ++ $(notification_area_applet_LINK) $(notification_area_applet_OBJECTS) $(notification_area_applet_LDADD) $(LIBS) + testtray$(EXEEXT): $(testtray_OBJECTS) $(testtray_DEPENDENCIES) + @rm -f testtray$(EXEEXT) +- $(LINK) $(testtray_LDFLAGS) $(testtray_OBJECTS) $(testtray_LDADD) $(LIBS) ++ $(LINK) $(testtray_OBJECTS) $(testtray_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -546,148 +528,148 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testtray.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libnotification_area_applet_la-fixedtip.lo: fixedtip.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-fixedtip.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo" -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo" "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-fixedtip.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo $(DEPDIR)/libnotification_area_applet_la-fixedtip.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='libnotification_area_applet_la-fixedtip.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c + + libnotification_area_applet_la-main.lo: main.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-main.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-main.Tpo" -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-main.Tpo" "$(DEPDIR)/libnotification_area_applet_la-main.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-main.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-main.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-main.Tpo -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-main.Tpo $(DEPDIR)/libnotification_area_applet_la-main.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='libnotification_area_applet_la-main.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c + + libnotification_area_applet_la-obox.lo: obox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-obox.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-obox.Tpo" -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-obox.Tpo" "$(DEPDIR)/libnotification_area_applet_la-obox.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-obox.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-obox.Tpo -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-obox.Tpo $(DEPDIR)/libnotification_area_applet_la-obox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='libnotification_area_applet_la-obox.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c + + libnotification_area_applet_la-na-tray.lo: na-tray.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo" -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-tray.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo $(DEPDIR)/libnotification_area_applet_la-na-tray.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='libnotification_area_applet_la-na-tray.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c + + libnotification_area_applet_la-na-tray-manager.lo: na-tray-manager.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray-manager.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo" -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray-manager.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='libnotification_area_applet_la-na-tray-manager.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c + + libnotification_area_applet_la-na-marshal.lo: na-marshal.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-marshal.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo" -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-marshal.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo $(DEPDIR)/libnotification_area_applet_la-na-marshal.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='libnotification_area_applet_la-na-marshal.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c + + notification_area_applet-fixedtip.o: fixedtip.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" "$(DEPDIR)/notification_area_applet-fixedtip.Po"; else rm -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.o -MD -MP -MF $(DEPDIR)/notification_area_applet-fixedtip.Tpo -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-fixedtip.Tpo $(DEPDIR)/notification_area_applet-fixedtip.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='notification_area_applet-fixedtip.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c + + notification_area_applet-fixedtip.obj: fixedtip.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" "$(DEPDIR)/notification_area_applet-fixedtip.Po"; else rm -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-fixedtip.Tpo -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-fixedtip.Tpo $(DEPDIR)/notification_area_applet-fixedtip.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='notification_area_applet-fixedtip.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi` + + notification_area_applet-main.o: main.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-main.Tpo" -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-main.Tpo" "$(DEPDIR)/notification_area_applet-main.Po"; else rm -f "$(DEPDIR)/notification_area_applet-main.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.o -MD -MP -MF $(DEPDIR)/notification_area_applet-main.Tpo -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-main.Tpo $(DEPDIR)/notification_area_applet-main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='notification_area_applet-main.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + + notification_area_applet-main.obj: main.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-main.Tpo" -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-main.Tpo" "$(DEPDIR)/notification_area_applet-main.Po"; else rm -f "$(DEPDIR)/notification_area_applet-main.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-main.Tpo -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-main.Tpo $(DEPDIR)/notification_area_applet-main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='notification_area_applet-main.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + + notification_area_applet-obox.o: obox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-obox.Tpo" -c -o notification_area_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-obox.Tpo" "$(DEPDIR)/notification_area_applet-obox.Po"; else rm -f "$(DEPDIR)/notification_area_applet-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.o -MD -MP -MF $(DEPDIR)/notification_area_applet-obox.Tpo -c -o notification_area_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-obox.Tpo $(DEPDIR)/notification_area_applet-obox.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='notification_area_applet-obox.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c + + notification_area_applet-obox.obj: obox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-obox.Tpo" -c -o notification_area_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-obox.Tpo" "$(DEPDIR)/notification_area_applet-obox.Po"; else rm -f "$(DEPDIR)/notification_area_applet-obox.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-obox.Tpo -c -o notification_area_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-obox.Tpo $(DEPDIR)/notification_area_applet-obox.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='notification_area_applet-obox.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi` + + notification_area_applet-na-tray.o: na-tray.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray.Tpo" -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo" "$(DEPDIR)/notification_area_applet-na-tray.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray.Tpo -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray.Tpo $(DEPDIR)/notification_area_applet-na-tray.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='notification_area_applet-na-tray.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c + + notification_area_applet-na-tray.obj: na-tray.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray.Tpo" -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo" "$(DEPDIR)/notification_area_applet-na-tray.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray.Tpo -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray.Tpo $(DEPDIR)/notification_area_applet-na-tray.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='notification_area_applet-na-tray.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi` + + notification_area_applet-na-tray-manager.o: na-tray-manager.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" "$(DEPDIR)/notification_area_applet-na-tray-manager.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo $(DEPDIR)/notification_area_applet-na-tray-manager.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='notification_area_applet-na-tray-manager.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c + + notification_area_applet-na-tray-manager.obj: na-tray-manager.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" "$(DEPDIR)/notification_area_applet-na-tray-manager.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo $(DEPDIR)/notification_area_applet-na-tray-manager.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='notification_area_applet-na-tray-manager.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi` + + notification_area_applet-na-marshal.o: na-marshal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" "$(DEPDIR)/notification_area_applet-na-marshal.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-marshal.Tpo -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-marshal.Tpo $(DEPDIR)/notification_area_applet-na-marshal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='notification_area_applet-na-marshal.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c + + notification_area_applet-na-marshal.obj: na-marshal.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" "$(DEPDIR)/notification_area_applet-na-marshal.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-marshal.Tpo -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-marshal.Tpo $(DEPDIR)/notification_area_applet-na-marshal.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='notification_area_applet-na-marshal.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi` +@@ -697,13 +679,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" ++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -720,7 +698,7 @@ + done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -785,22 +763,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -817,7 +794,7 @@ + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(notification_area_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -856,7 +833,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -871,12 +848,20 @@ + install-data-am: install-notification_area_appletlibLTLIBRARIES \ + install-serverDATA install-uiDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libexecPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -897,25 +882,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \ ++uninstall-am: uninstall-libexecPROGRAMS \ + uninstall-notification_area_appletlibLTLIBRARIES \ + uninstall-serverDATA uninstall-uiDATA + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ + clean-notification_area_appletlibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man \ +- install-notification_area_appletlibLTLIBRARIES \ +- install-serverDATA install-strip install-uiDATA installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ +- uninstall-libexecPROGRAMS \ ++ install-notification_area_appletlibLTLIBRARIES install-pdf \ ++ install-pdf-am install-ps install-ps-am install-serverDATA \ ++ install-strip install-uiDATA installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-libexecPROGRAMS \ + uninstall-notification_area_appletlibLTLIBRARIES \ + uninstall-serverDATA uninstall-uiDATA + +diff -Nur gnome-panel-2.20.0/applets/wncklet/Makefile.in gnome-panel-2.20.0.new/applets/wncklet/Makefile.in +--- gnome-panel-2.20.0/applets/wncklet/Makefile.in 2007-09-17 21:33:30.000000000 +0200 ++++ gnome-panel-2.20.0.new/applets/wncklet/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,15 +16,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -42,10 +38,7 @@ + subdir = applets/wncklet + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -79,6 +72,10 @@ + @WNCKLET_INPROCESS_TRUE@am_libwnck_applet_la_OBJECTS = \ + @WNCKLET_INPROCESS_TRUE@ $(am__objects_1) + libwnck_applet_la_OBJECTS = $(am_libwnck_applet_la_OBJECTS) ++libwnck_applet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libwnck_applet_la_CFLAGS) $(CFLAGS) \ ++ $(libwnck_applet_la_LDFLAGS) $(LDFLAGS) -o $@ + @WNCKLET_INPROCESS_TRUE@am_libwnck_applet_la_rpath = -rpath \ + @WNCKLET_INPROCESS_TRUE@ $(wnck_appletlibdir) + libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@@ -95,17 +92,21 @@ + wnck_applet_OBJECTS = $(am_wnck_applet_OBJECTS) + @WNCKLET_INPROCESS_FALSE@wnck_applet_DEPENDENCIES = \ + @WNCKLET_INPROCESS_FALSE@ $(am__DEPENDENCIES_2) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++wnck_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wnck_applet_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libwnck_applet_la_SOURCES) $(wnck_applet_SOURCES) + DIST_SOURCES = $(am__libwnck_applet_la_SOURCES_DIST) \ + $(am__wnck_applet_SOURCES_DIST) +@@ -120,8 +121,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -138,8 +137,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -161,20 +158,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -182,14 +171,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -200,14 +184,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -219,7 +201,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -232,14 +213,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -262,6 +240,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -269,8 +248,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -278,13 +255,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -296,6 +273,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -323,8 +301,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = \ + -I$(top_builddir) \ + -I$(top_builddir)/applets/wncklet \ +@@ -428,7 +409,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-wnck_appletlibLTLIBRARIES: $(wnck_appletlib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(wnck_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(wnck_appletlibdir)" ++ test -z "$(wnck_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(wnck_appletlibdir)" + @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -439,7 +420,7 @@ + + uninstall-wnck_appletlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \ +@@ -454,10 +435,10 @@ + rm -f "$${dir}/so_locations"; \ + done + libwnck-applet.la: $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_DEPENDENCIES) +- $(LINK) $(am_libwnck_applet_la_rpath) $(libwnck_applet_la_LDFLAGS) $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_LIBADD) $(LIBS) ++ $(libwnck_applet_la_LINK) $(am_libwnck_applet_la_rpath) $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_LIBADD) $(LIBS) + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -485,7 +466,7 @@ + done + wnck-applet$(EXEEXT): $(wnck_applet_OBJECTS) $(wnck_applet_DEPENDENCIES) + @rm -f wnck-applet$(EXEEXT) +- $(LINK) $(wnck_applet_LDFLAGS) $(wnck_applet_OBJECTS) $(wnck_applet_LDADD) $(LIBS) ++ $(wnck_applet_LINK) $(wnck_applet_OBJECTS) $(wnck_applet_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -505,127 +486,127 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wnck_applet-workspace-switcher.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libwnck_applet_la-wncklet.lo: wncklet.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-wncklet.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo" -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo" "$(DEPDIR)/libwnck_applet_la-wncklet.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-wncklet.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-wncklet.Tpo -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-wncklet.Tpo $(DEPDIR)/libwnck_applet_la-wncklet.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='libwnck_applet_la-wncklet.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c + + libwnck_applet_la-window-menu.lo: window-menu.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-menu.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo" -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo" "$(DEPDIR)/libwnck_applet_la-window-menu.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-menu.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-window-menu.Tpo -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-window-menu.Tpo $(DEPDIR)/libwnck_applet_la-window-menu.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='libwnck_applet_la-window-menu.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c + + libwnck_applet_la-window-list.lo: window-list.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-list.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-window-list.Tpo" -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-window-list.Tpo" "$(DEPDIR)/libwnck_applet_la-window-list.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-window-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-list.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-window-list.Tpo -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-window-list.Tpo $(DEPDIR)/libwnck_applet_la-window-list.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='libwnck_applet_la-window-list.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c + + libwnck_applet_la-workspace-switcher.lo: workspace-switcher.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-workspace-switcher.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo" -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo" "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-workspace-switcher.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo $(DEPDIR)/libwnck_applet_la-workspace-switcher.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='libwnck_applet_la-workspace-switcher.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c + + libwnck_applet_la-showdesktop.lo: showdesktop.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-showdesktop.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo" -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo" "$(DEPDIR)/libwnck_applet_la-showdesktop.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-showdesktop.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-showdesktop.Tpo -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-showdesktop.Tpo $(DEPDIR)/libwnck_applet_la-showdesktop.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='libwnck_applet_la-showdesktop.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c + + wnck_applet-wncklet.o: wncklet.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.o -MD -MP -MF "$(DEPDIR)/wnck_applet-wncklet.Tpo" -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-wncklet.Tpo" "$(DEPDIR)/wnck_applet-wncklet.Po"; else rm -f "$(DEPDIR)/wnck_applet-wncklet.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.o -MD -MP -MF $(DEPDIR)/wnck_applet-wncklet.Tpo -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-wncklet.Tpo $(DEPDIR)/wnck_applet-wncklet.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='wnck_applet-wncklet.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c + + wnck_applet-wncklet.obj: wncklet.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-wncklet.Tpo" -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-wncklet.Tpo" "$(DEPDIR)/wnck_applet-wncklet.Po"; else rm -f "$(DEPDIR)/wnck_applet-wncklet.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.obj -MD -MP -MF $(DEPDIR)/wnck_applet-wncklet.Tpo -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-wncklet.Tpo $(DEPDIR)/wnck_applet-wncklet.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='wnck_applet-wncklet.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi` + + wnck_applet-window-menu.o: window-menu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.o -MD -MP -MF "$(DEPDIR)/wnck_applet-window-menu.Tpo" -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-menu.Tpo" "$(DEPDIR)/wnck_applet-window-menu.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-menu.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.o -MD -MP -MF $(DEPDIR)/wnck_applet-window-menu.Tpo -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-menu.Tpo $(DEPDIR)/wnck_applet-window-menu.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='wnck_applet-window-menu.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c + + wnck_applet-window-menu.obj: window-menu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-window-menu.Tpo" -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-menu.Tpo" "$(DEPDIR)/wnck_applet-window-menu.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-menu.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.obj -MD -MP -MF $(DEPDIR)/wnck_applet-window-menu.Tpo -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-menu.Tpo $(DEPDIR)/wnck_applet-window-menu.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='wnck_applet-window-menu.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi` + + wnck_applet-window-list.o: window-list.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.o -MD -MP -MF "$(DEPDIR)/wnck_applet-window-list.Tpo" -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-list.Tpo" "$(DEPDIR)/wnck_applet-window-list.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.o -MD -MP -MF $(DEPDIR)/wnck_applet-window-list.Tpo -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-list.Tpo $(DEPDIR)/wnck_applet-window-list.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='wnck_applet-window-list.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c + + wnck_applet-window-list.obj: window-list.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-window-list.Tpo" -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-list.Tpo" "$(DEPDIR)/wnck_applet-window-list.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-list.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.obj -MD -MP -MF $(DEPDIR)/wnck_applet-window-list.Tpo -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-list.Tpo $(DEPDIR)/wnck_applet-window-list.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='wnck_applet-window-list.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi` + + wnck_applet-workspace-switcher.o: workspace-switcher.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.o -MD -MP -MF "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" "$(DEPDIR)/wnck_applet-workspace-switcher.Po"; else rm -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.o -MD -MP -MF $(DEPDIR)/wnck_applet-workspace-switcher.Tpo -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-workspace-switcher.Tpo $(DEPDIR)/wnck_applet-workspace-switcher.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='wnck_applet-workspace-switcher.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c + + wnck_applet-workspace-switcher.obj: workspace-switcher.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" "$(DEPDIR)/wnck_applet-workspace-switcher.Po"; else rm -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.obj -MD -MP -MF $(DEPDIR)/wnck_applet-workspace-switcher.Tpo -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-workspace-switcher.Tpo $(DEPDIR)/wnck_applet-workspace-switcher.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='wnck_applet-workspace-switcher.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi` + + wnck_applet-showdesktop.o: showdesktop.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.o -MD -MP -MF "$(DEPDIR)/wnck_applet-showdesktop.Tpo" -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo" "$(DEPDIR)/wnck_applet-showdesktop.Po"; else rm -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.o -MD -MP -MF $(DEPDIR)/wnck_applet-showdesktop.Tpo -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-showdesktop.Tpo $(DEPDIR)/wnck_applet-showdesktop.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='wnck_applet-showdesktop.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c + + wnck_applet-showdesktop.obj: showdesktop.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-showdesktop.Tpo" -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo" "$(DEPDIR)/wnck_applet-showdesktop.Po"; else rm -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.obj -MD -MP -MF $(DEPDIR)/wnck_applet-showdesktop.Tpo -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-showdesktop.Tpo $(DEPDIR)/wnck_applet-showdesktop.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='wnck_applet-showdesktop.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi` +@@ -635,13 +616,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -658,7 +635,7 @@ + done + install-schemasDATA: $(schemas_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" ++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -675,7 +652,7 @@ + done + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" ++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -692,7 +669,7 @@ + done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -757,22 +734,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -788,7 +764,7 @@ + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(wnck_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -824,7 +800,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -840,12 +816,20 @@ + install-schemasDATA install-serverDATA install-uiDATA \ + install-wnck_appletlibLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libexecPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -866,26 +850,28 @@ + + ps-am: + +-uninstall-am: uninstall-gladeDATA uninstall-info-am \ +- uninstall-libexecPROGRAMS uninstall-schemasDATA \ +- uninstall-serverDATA uninstall-uiDATA \ ++uninstall-am: uninstall-gladeDATA uninstall-libexecPROGRAMS \ ++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA \ + uninstall-wnck_appletlibLTLIBRARIES + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool \ + clean-wnck_appletlibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-local install-exec install-exec-am \ +- install-gladeDATA install-info install-info-am \ +- install-libexecPROGRAMS install-man install-schemasDATA \ +- install-serverDATA install-strip install-uiDATA \ +- install-wnck_appletlibLTLIBRARIES installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-gladeDATA uninstall-info-am \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-gladeDATA install-html install-html-am \ ++ install-info install-info-am install-libexecPROGRAMS \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-schemasDATA install-serverDATA \ ++ install-strip install-uiDATA install-wnck_appletlibLTLIBRARIES \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-gladeDATA \ + uninstall-libexecPROGRAMS uninstall-schemasDATA \ + uninstall-serverDATA uninstall-uiDATA \ + uninstall-wnck_appletlibLTLIBRARIES +diff -Nur gnome-panel-2.20.0/config.h.in gnome-panel-2.20.0.new/config.h.in +--- gnome-panel-2.20.0/config.h.in 2007-09-17 21:33:17.000000000 +0200 ++++ gnome-panel-2.20.0.new/config.h.in 2007-09-18 11:28:34.000000000 +0200 +@@ -21,10 +21,6 @@ + /* Define to 1 if you have the `dcgettext' function. */ + #undef HAVE_DCGETTEXT + +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_DIRENT_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H + +@@ -56,9 +52,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_MEMORY_H + +-/* Define to 1 if you have the header file, and it defines `DIR'. */ +-#undef HAVE_NDIR_H +- + /* Define to 1 if you have the `nl_langinfo' function. */ + #undef HAVE_NL_LANGINFO + +@@ -77,18 +70,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + +-/* Define if there is a member named d_type in the struct describing directory +- headers. */ +-#undef HAVE_STRUCT_DIRENT_D_TYPE +- +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_DIR_H +- +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_NDIR_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H + +diff -Nur gnome-panel-2.20.0/config.h.in~ gnome-panel-2.20.0.new/config.h.in~ +--- gnome-panel-2.20.0/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.20.0.new/config.h.in~ 2007-09-18 11:28:34.000000000 +0200 +@@ -0,0 +1,135 @@ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Defined when compiling the clock applet in-process */ ++#undef CLOCK_INPROCESS ++ ++/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS ++ ++/* Defined when compiling the fish applet in-process */ ++#undef FISH_INPROCESS ++ ++/* Define the gettext package to be used */ ++#undef GETTEXT_PACKAGE ++ ++/* Define to 1 if you have the `bind_textdomain_codeset' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_CRT_EXTERNS_H ++ ++/* Define to 1 if you have the `dcgettext' function. */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_DIRENT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LANGINFO_H ++ ++/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ ++/* Defined when evolution-data-server libecal-1.2 and libedataserverui-1.2 are ++ detected */ ++#undef HAVE_LIBECAL ++ ++/* Define to 1 if you have the `X11' library (-lX11). */ ++#undef HAVE_LIBX11 ++ ++/* Define to 1 if you have the `Xau' library (-lXau). */ ++#undef HAVE_LIBXAU ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the `nl_langinfo' function. */ ++#undef HAVE_NL_LANGINFO ++ ++/* Define to 1 */ ++#undef HAVE_SOLARIS ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define if there is a member named d_type in the struct describing directory ++ headers. */ ++#undef HAVE_STRUCT_DIRENT_D_TYPE ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_DIR_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#undef HAVE_SYS_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `_NSGetEnviron' function. */ ++#undef HAVE__NSGETENVIRON ++ ++/* Defined when compiling the notification-area applet in-process */ ++#undef NOTIFICATION_AREA_INPROCESS ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Defined when compiling the wncklet applet in-process */ ++#undef WNCKLET_INPROCESS ++ ++/* Define to 1 if the X Window System is missing or not being used. */ ++#undef X_DISPLAY_MISSING +diff -Nur gnome-panel-2.20.0/configure gnome-panel-2.20.0.new/configure +--- gnome-panel-2.20.0/configure 2007-09-17 21:33:16.000000000 +0200 ++++ gnome-panel-2.20.0.new/configure 2007-09-18 11:28:34.000000000 +0200 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.60 for gnome-panel 2.20.0.1. ++# Generated by GNU Autoconf 2.61 for gnome-panel 2.20.0.1. + # + # Report bugs to . + # +@@ -12,7 +12,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -21,10 +22,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -217,7 +221,7 @@ + else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +@@ -235,7 +239,6 @@ + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -244,10 +247,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + _ASEOF +@@ -255,7 +260,6 @@ + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +-# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -264,10 +268,12 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ + + : + (as_func_return () { +@@ -514,19 +520,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -720,36 +735,36 @@ + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include + #endif +-#if HAVE_STDINT_H ++#ifdef HAVE_STDINT_H + # include + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + # include + #endif" + +@@ -793,6 +808,7 @@ + INSTALL_PROGRAM + INSTALL_SCRIPT + INSTALL_DATA ++am__isrc + CYGPATH_W + PACKAGE + VERSION +@@ -835,14 +851,11 @@ + INTLTOOL_SCHEMAS_RULE + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE ++INTLTOOL_POLICY_RULE + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE + INTLTOOL_PERL +-INTLTOOL_ICONV +-INTLTOOL_MSGFMT +-INTLTOOL_MSGMERGE +-INTLTOOL_XGETTEXT + ALL_LINGUAS + CC + CFLAGS +@@ -872,6 +885,7 @@ + host_cpu + host_vendor + host_os ++SED + LN_S + ECHO + AR +@@ -969,6 +983,7 @@ + CC + CFLAGS + LDFLAGS ++LIBS + CPPFLAGS + CPP + CXX +@@ -1096,10 +1111,10 @@ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) +@@ -1115,10 +1130,10 @@ + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +@@ -1312,19 +1327,19 @@ + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) +@@ -1622,6 +1637,7 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor +@@ -1716,7 +1732,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-panel configure 2.20.0.1 +-generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.61 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +@@ -1730,7 +1746,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-panel $as_me 2.20.0.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2084,7 +2100,8 @@ + + ac_config_headers="$ac_config_headers config.h" + +-am__api_version="1.9" ++am__api_version='1.10' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2152,7 +2169,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2267,38 +2284,53 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to keeping the `.' as first argument, in order to +- # allow $(mkdir_p) to be used without argument. As in +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However this is wrong +- # for two reasons: +- # 1. if the package is installed by a user who cannot write `.' +- # make install will fail, +- # 2. the above comment should most certainly read +- # $(mkdir_p) $(DESTDIR)$(somedir) +- # so it does not work when $(somedir) is undefined and +- # $(DESTDIR) is not. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), +- # so the `.' trick is pointless. +- mkdir_p='mkdir -p --' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" + else +- mkdir_p='$(install_sh) -d' ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" + fi + fi ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac + + for ac_prog in gawk mawk nawk awk + do +@@ -2318,7 +2350,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2381,12 +2413,16 @@ + fi + rmdir .tst 2>/dev/null + +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi + fi + + # test whether we have cygpath +@@ -2429,7 +2465,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2453,7 +2489,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2493,7 +2529,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2533,7 +2569,7 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -2548,14 +2584,6 @@ + + + +-case m4 in +- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;; +- *) ac_macro_dir=$srcdir/m4 ;; +-esac +-test -d "$ac_macro_dir" || +- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5 +-echo "$as_me: error: cannot find macro directory \`m4'" >&2;} +- { (exit 1); exit 1; }; } + + + +@@ -2590,9 +2618,7 @@ + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } +- +- +-if test $USE_MAINTAINER_MODE = yes; then ++ if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -2667,9 +2693,7 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -2678,7 +2702,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2701,7 +2724,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2741,7 +2764,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2798,7 +2821,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2839,7 +2862,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2897,7 +2920,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2941,7 +2964,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3082,7 +3105,7 @@ + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +-for ac_file in $ac_files ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +@@ -3110,6 +3133,12 @@ + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +@@ -3121,8 +3150,6 @@ + fi + + ac_exeext=$ac_cv_exeext +-{ echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6; } + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +@@ -3300,27 +3327,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3375,27 +3385,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3430,27 +3423,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -3486,27 +3462,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -3622,27 +3581,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -3746,6 +3688,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -3775,9 +3718,7 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -3834,6 +3775,8 @@ + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ + + + +@@ -3880,7 +3823,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3925,259 +3868,78 @@ + fi + fi + +-# Extract the first word of "iconv", so it can be a program name with args. +-set dummy iconv; 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_path_INTLTOOL_ICONV+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_ICONV in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path. +- ;; +- *) +- 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++# Substitute ALL_LINGUAS so we can use it in po/Makefile + +- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv" +- ;; ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ 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 +-fi +-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV +-if test -n "$INTLTOOL_ICONV"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 +-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; } ++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 ++ DATADIRNAME=share + else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; 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_path_INTLTOOL_MSGFMT+set}" = set; then ++ case $host in ++ *-*-solaris*) ++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 ++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $INTLTOOL_MSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path. +- ;; +- *) +- 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset + +- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt" +- ;; +-esac +-fi +-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT +-if test -n "$INTLTOOL_MSGFMT"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 +-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char bind_textdomain_codeset (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ + +- +-# Extract the first word of "msgmerge", so it can be a program name with args. +-set dummy msgmerge; 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_path_INTLTOOL_MSGMERGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_MSGMERGE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path. +- ;; +- *) +- 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge" +- ;; +-esac +-fi +-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE +-if test -n "$INTLTOOL_MSGMERGE"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 +-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-# Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; 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_path_INTLTOOL_XGETTEXT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $INTLTOOL_XGETTEXT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path. +- ;; +- *) +- 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext" +- ;; +-esac +-fi +-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT +-if test -n "$INTLTOOL_XGETTEXT"; then +- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 +-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +- +-# Substitute ALL_LINGUAS so we can use it in po/Makefile +- +- +-# Set DATADIRNAME correctly if it is not set yet +-# (copied from glib-gettext.m4) +-if test -z "$DATADIRNAME"; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- DATADIRNAME=share +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- case $host in +- *-*-solaris*) +- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. +- For example, HP-UX 11i declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + + #undef bind_textdomain_codeset + +@@ -4216,27 +3978,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4245,7 +3991,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -4263,7 +4009,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + +@@ -4324,27 +4070,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_search_strerror=$ac_res + else + echo "$as_me: failed program was:" >&5 +@@ -4353,7 +4083,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break +@@ -4397,7 +4127,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4437,7 +4167,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4494,7 +4224,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4535,7 +4265,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -4593,7 +4323,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4637,7 +4367,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4757,27 +4487,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4832,27 +4545,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -4887,27 +4583,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -4943,27 +4622,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -5079,27 +4741,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg + else + echo "$as_me: failed program was:" >&5 +@@ -5203,6 +4848,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -5232,9 +4878,7 @@ + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -5297,17 +4941,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5341,17 +4978,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5416,17 +5046,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -5460,17 +5083,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -5525,7 +5141,7 @@ + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -5607,7 +5223,7 @@ + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -5703,27 +5319,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6028,12 +5627,13 @@ + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done + done ++IFS=$as_save_IFS + lt_ac_max=0 + lt_ac_count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris +@@ -6068,6 +5668,7 @@ + fi + + SED=$lt_cv_path_SED ++ + { echo "$as_me:$LINENO: result: $SED" >&5 + echo "${ECHO_T}$SED" >&6; } + +@@ -6267,8 +5868,8 @@ + echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -6309,16 +5910,22 @@ + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi + ;; + + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu | dragonfly*) ++freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) +@@ -6356,7 +5963,7 @@ + esac + ;; + +-interix3*) ++interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; +@@ -6372,11 +5979,11 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + 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 +@@ -6406,6 +6013,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +@@ -6492,7 +6103,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6495 "configure"' > conftest.$ac_ext ++ echo '#line 6106 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6527,7 +6138,8 @@ + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -6538,6 +6150,9 @@ + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; +@@ -6554,6 +6169,9 @@ + ;; + *64-bit*) + case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +@@ -6616,27 +6234,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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_cc_needs_belf=yes + else + echo "$as_me: failed program was:" >&5 +@@ -6645,7 +6247,7 @@ + lt_cv_cc_needs_belf=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -6699,7 +6301,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6739,7 +6341,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_DLLTOOL="dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6795,7 +6397,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6835,7 +6437,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_AS="as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6891,7 +6493,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6931,7 +6533,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7019,27 +6621,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -7102,27 +6687,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7158,17 +6726,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7260,7 +6821,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7304,7 +6865,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7417,27 +6978,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7492,27 +7036,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7547,27 +7074,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7603,27 +7113,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -7731,6 +7224,7 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +@@ -7760,9 +7254,7 @@ + echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -7826,17 +7318,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7870,17 +7355,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -7945,17 +7423,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + : + else + echo "$as_me: failed program was:" >&5 +@@ -7989,17 +7460,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then + # Broken: success on invalid input. + continue + else +@@ -8040,7 +7504,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -8058,7 +7522,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8084,7 +7548,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -8102,7 +7566,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8209,27 +7673,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8272,27 +7719,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes + else + echo "$as_me: failed program was:" >&5 +@@ -8419,24 +7849,27 @@ + fi + ;; + *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && +- new_result=`expr "X$teststring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- teststring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ new_result=`expr "X$teststring" : ".*" 2>&1` && ++ lt_cv_sys_max_cmd_len=$new_result && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on massive ++ # amounts of additional arguments before passing them to the linker. ++ # It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi + ;; + esac + +@@ -8453,6 +7886,7 @@ + + + ++ + # Check for command to grab the raw symbol name followed by C symbol from nm. + { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 + echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } +@@ -8490,7 +7924,7 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +-linux*) ++linux* | k*bsd*-gnu) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +@@ -8747,7 +8181,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8787,7 +8221,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8843,7 +8277,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8883,7 +8317,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8939,7 +8373,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8979,7 +8413,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ 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_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9041,7 +8475,7 @@ + test -z "$ac_objext" && ac_objext=o + + # Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' + old_postinstall_cmds='chmod 644 $oldlib' + old_postuninstall_cmds= + +@@ -9241,10 +8675,10 @@ + objext=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++lt_simple_link_test_code='int main(){return(0);}' + + + # If no C compiler was specified, use CC. +@@ -9259,13 +8693,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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* +@@ -9285,7 +8719,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -9296,11 +8730,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:9299: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8733: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9303: \$? = $ac_status" >&5 ++ echo "$as_me:8737: \$? = $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. +@@ -9351,13 +8785,15 @@ + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ 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). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + +@@ -9367,7 +8803,7 @@ + lt_prog_compiler_pic='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -9425,7 +8861,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ 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='-DDLL_EXPORT' +@@ -9458,7 +8894,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' +@@ -9477,6 +8913,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -9486,6 +8938,10 @@ + lt_prog_compiler_static='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -9553,7 +9009,7 @@ + else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -9564,11 +9020,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:9567: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9023: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9571: \$? = $ac_status" >&5 ++ echo "$as_me:9027: \$? = $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. +@@ -9617,7 +9073,7 @@ + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -9657,7 +9113,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -9668,11 +9124,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:9671: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9127: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9675: \$? = $ac_status" >&5 ++ echo "$as_me:9131: \$? = $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 +@@ -9864,7 +9320,7 @@ + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -9882,7 +9338,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +@@ -9897,7 +9353,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -9915,20 +9371,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -10080,7 +9546,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct=yes ++ : + else + # We have old collect2 + hardcode_direct=unsupported +@@ -10148,33 +9614,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (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_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -10182,7 +9639,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10223,33 +9680,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (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_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -10257,7 +9705,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -10303,7 +9751,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; +@@ -10345,10 +9793,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + 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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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}' + ;; + *) +@@ -10388,7 +9836,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -10490,7 +9938,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -10510,24 +9958,28 @@ + ;; + + openbsd*) +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs=no + fi + ;; + +@@ -10586,17 +10038,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs=yes + ;; +@@ -10653,7 +10104,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no +@@ -10730,7 +10181,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -10788,17 +10239,55 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ + if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[lt_foo]++; } ++ if (lt_freq[lt_foo] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`echo $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi +@@ -10958,12 +10447,8 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -10980,18 +10465,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -11029,7 +10502,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -11092,7 +10565,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11147,7 +10620,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11161,31 +10634,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 11168 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -11197,7 +10649,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11206,7 +10658,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -11290,6 +10742,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -11443,6 +10899,7 @@ + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" ++ old_striplib="$STRIP -S" + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -11526,27 +10983,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11555,7 +10996,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11637,27 +11078,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11666,7 +11091,7 @@ + ac_cv_func_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +@@ -11716,27 +11141,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dld_shl_load=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11745,7 +11154,7 @@ + ac_cv_lib_dld_shl_load=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11817,27 +11226,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11846,7 +11239,7 @@ + ac_cv_func_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +@@ -11896,27 +11289,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dl_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -11925,7 +11302,7 @@ + ac_cv_lib_dl_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -11976,27 +11353,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_svld_dlopen=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12005,7 +11366,7 @@ + ac_cv_lib_svld_dlopen=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12056,27 +11417,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dld_dld_link=yes + else + echo "$as_me: failed program was:" >&5 +@@ -12085,7 +11430,7 @@ + ac_cv_lib_dld_dld_link=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -12141,7 +11486,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 ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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* +@@ -13260,7 +12606,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_CXX=yes ++ : + else + # We have old collect2 + hardcode_direct_CXX=unsupported +@@ -13328,33 +12674,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -13362,7 +12699,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13404,33 +12741,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -13438,7 +12766,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -13549,10 +12877,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + 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 +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + 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}' + ;; + *) +@@ -13586,7 +12914,7 @@ + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +@@ -13635,9 +12963,7 @@ + hardcode_libdir_separator_CXX=: + + case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' +- ;; ++ hppa*64*|ia64*) ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; +@@ -13705,7 +13031,7 @@ + ;; + esac + ;; +- interix3*) ++ interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +@@ -13745,7 +13071,7 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -13825,6 +13151,29 @@ + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; + esac + ;; + lynxos*) +@@ -13847,7 +13196,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + 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= +@@ -13863,16 +13212,20 @@ + ld_shlibs_CXX=no + ;; + openbsd*) +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' +- export_dynamic_flag_spec_CXX='${wl}-E' +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ else ++ ld_shlibs_CXX=no + fi +- output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in +@@ -14034,15 +13387,10 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. We must also pass each convience library through +- # to the system linker between allextract/defaultextract. +- # The C++ compiler will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes +@@ -14089,7 +13437,13 @@ + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' +- fi ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi + ;; + esac + ;; +@@ -14280,7 +13634,7 @@ + + # PORTME: override above test on systems where it is broken + case $host_os in +-interix3*) ++interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= +@@ -14288,13 +13642,46 @@ + postdeps_CXX= + ;; + ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ # ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ + solaris*) + case $cc_basename in + CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. +- postdeps_CXX='-lCstd -lCrun' ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi + ;; + esac + ;; +@@ -14331,12 +13718,14 @@ + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32*) + # 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). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -14348,7 +13737,7 @@ + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -14414,7 +13803,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -14457,7 +13846,7 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -14484,6 +13873,14 @@ + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -14500,7 +13897,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -14598,7 +13995,7 @@ + else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -14609,11 +14006,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:14612: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14009: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14616: \$? = $ac_status" >&5 ++ echo "$as_me:14013: \$? = $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. +@@ -14662,7 +14059,7 @@ + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -14702,7 +14099,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -14713,11 +14110,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:14716: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14113: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14720: \$? = $ac_status" >&5 ++ echo "$as_me:14117: \$? = $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 +@@ -14783,7 +14180,10 @@ + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + 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' ++ 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' ++ ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +@@ -14814,7 +14214,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -14872,20 +14272,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -15042,12 +14429,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -15064,18 +14446,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -15113,7 +14483,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -15176,7 +14546,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15231,7 +14601,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15245,31 +14615,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 15252 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -15281,7 +14630,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15290,7 +14639,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -15374,6 +14723,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -15568,6 +14921,7 @@ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ ++ fix_srcfile_path_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + +@@ -15888,7 +15242,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_CXX" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_CXX +@@ -15979,10 +15333,17 @@ + objext_F77=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + + # Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" ++lt_simple_link_test_code="\ ++ program t ++ end ++" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +@@ -15998,13 +15359,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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* +@@ -16091,13 +15452,15 @@ + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ 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). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + +@@ -16107,7 +15470,7 @@ + lt_prog_compiler_pic_F77='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -16165,7 +15528,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ 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_F77='-DDLL_EXPORT' +@@ -16198,7 +15561,7 @@ + lt_prog_compiler_static_F77='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' +@@ -16217,6 +15580,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ lt_prog_compiler_wl_F77='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -16226,6 +15605,10 @@ + lt_prog_compiler_static_F77='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' +@@ -16293,7 +15676,7 @@ + else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -16304,11 +15687,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:16307: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15690: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16311: \$? = $ac_status" >&5 ++ echo "$as_me:15694: \$? = $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. +@@ -16357,7 +15740,7 @@ + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -16397,7 +15780,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -16408,11 +15791,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:16411: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15794: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16415: \$? = $ac_status" >&5 ++ echo "$as_me:15798: \$? = $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 +@@ -16604,7 +15987,7 @@ + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=no + enable_shared_with_static_runtimes_F77=yes +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -16622,7 +16005,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +@@ -16637,7 +16020,7 @@ + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -16655,20 +16038,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -16820,7 +16213,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_F77=yes ++ : + else + # We have old collect2 + hardcode_direct_F77=unsupported +@@ -16878,33 +16271,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -16912,7 +16296,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -16943,33 +16327,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (exit $ac_status); } && { ++ test -z "$ac_f77_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -16977,7 +16352,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -17023,7 +16398,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_F77='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; +@@ -17065,10 +16440,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + 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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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}' + ;; + *) +@@ -17108,7 +16483,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes +@@ -17210,7 +16585,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -17230,24 +16605,28 @@ + ;; + + openbsd*) +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- ;; +- *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_F77=no + fi + ;; + +@@ -17306,17 +16685,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_F77=yes + ;; +@@ -17373,7 +16751,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no +@@ -17450,7 +16828,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -17508,20 +16886,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -17678,12 +17043,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -17700,18 +17060,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -17749,7 +17097,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -17812,7 +17160,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17867,7 +17215,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17881,31 +17229,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 17888 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -17917,7 +17244,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -17926,7 +17253,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -18010,6 +17337,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -18204,6 +17535,7 @@ + module_cmds_F77 \ + module_expsym_cmds_F77 \ + lt_cv_prog_compiler_c_o_F77 \ ++ fix_srcfile_path_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77; do + +@@ -18524,7 +17856,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_F77" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_F77 +@@ -18582,10 +17914,10 @@ + objext_GCJ=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" ++lt_simple_compile_test_code="class foo {}" + + # Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' ++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +@@ -18601,13 +17933,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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* +@@ -18648,7 +17980,7 @@ + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -18659,11 +17991,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:18662: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17994: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18666: \$? = $ac_status" >&5 ++ echo "$as_me:17998: \$? = $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. +@@ -18714,13 +18046,15 @@ + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ 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). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + +@@ -18730,7 +18064,7 @@ + lt_prog_compiler_pic_GCJ='-fno-common' + ;; + +- interix3*) ++ interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; +@@ -18788,7 +18122,7 @@ + esac + ;; + +- mingw* | pw32* | os2*) ++ 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' +@@ -18821,7 +18155,7 @@ + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + +- linux*) ++ linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -18840,6 +18174,22 @@ + # All Alpha code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ lt_prog_compiler_wl_GCJ='' ++ ;; ++ esac ++ ;; + esac + ;; + +@@ -18849,6 +18199,10 @@ + lt_prog_compiler_static_GCJ='-non_shared' + ;; + ++ rdos*) ++ lt_prog_compiler_static_GCJ='-non_shared' ++ ;; ++ + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' +@@ -18916,7 +18270,7 @@ + else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -18927,11 +18281,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:18930: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18284: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18934: \$? = $ac_status" >&5 ++ echo "$as_me:18288: \$? = $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. +@@ -18980,7 +18334,7 @@ + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -19020,7 +18374,7 @@ + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -19031,11 +18385,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:19034: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18388: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19038: \$? = $ac_status" >&5 ++ echo "$as_me:18392: \$? = $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 +@@ -19227,7 +18581,7 @@ + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=no + enable_shared_with_static_runtimes_GCJ=yes +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -19245,7 +18599,7 @@ + fi + ;; + +- interix3*) ++ interix[3-9]*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +@@ -19260,7 +18614,7 @@ + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- linux*) ++ gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in +@@ -19278,20 +18632,30 @@ + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac +- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ *) ++ tmp_sharedflag='-shared' ;; ++ esac ++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -19443,7 +18807,7 @@ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 +- hardcode_direct_GCJ=yes ++ : + else + # We have old collect2 + hardcode_direct_GCJ=unsupported +@@ -19511,33 +18875,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (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_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -19545,7 +18900,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -19586,33 +18941,24 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ (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_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -19620,7 +18966,7 @@ + + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +@@ -19666,7 +19012,7 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_GCJ='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; +@@ -19708,10 +19054,10 @@ + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' ++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + 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 -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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}' + ;; + *) +@@ -19751,7 +19097,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu | dragonfly*) ++ freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes +@@ -19853,7 +19199,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -19873,24 +19219,28 @@ + ;; + + openbsd*) +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_GCJ='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ ;; ++ *) ++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs_GCJ=no + fi + ;; + +@@ -19949,17 +19299,16 @@ + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) +- # The compiler driver will combine linker options so we +- # cannot just pass the convience library names through +- # without $wl, iff we do not link with $LD. +- # Luckily, gcc supports the same syntax we need for Sun Studio. ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) +- case $wlarc in +- '') +- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; +- *) +- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; +- esac ;; ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs_GCJ=yes + ;; +@@ -20016,7 +19365,7 @@ + fi + ;; + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no +@@ -20093,7 +19442,7 @@ + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 +@@ -20151,20 +19500,7 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi ++ + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -20321,12 +19657,7 @@ + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -20343,18 +19674,6 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -20392,7 +19711,7 @@ + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on ++ *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +@@ -20455,7 +19774,7 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) ++interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20510,7 +19829,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20524,31 +19843,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # find out which ABI we are using +- libsuff= +- case "$host_cpu" in +- x86_64*|s390x*|powerpc64*) +- echo '#line 20531 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *64-bit*) +- libsuff=64 +- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- esac +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -20560,7 +19858,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -20569,7 +19867,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) +@@ -20653,6 +19951,10 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++rdos*) ++ dynamic_linker=no ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -20847,6 +20149,7 @@ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ ++ fix_srcfile_path_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + +@@ -21167,7 +20470,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_GCJ" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_GCJ +@@ -21224,7 +20527,7 @@ + objext_RC=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + + # Code to be used in simple link tests + lt_simple_link_test_code="$lt_simple_compile_test_code" +@@ -21243,13 +20546,13 @@ + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext + eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_compiler_boilerplate=`cat conftest.err` + $rm conftest* + + ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext ++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* +@@ -21327,6 +20630,7 @@ + module_cmds_RC \ + module_expsym_cmds_RC \ + lt_cv_prog_compiler_c_o_RC \ ++ fix_srcfile_path_RC \ + exclude_expsyms_RC \ + include_expsyms_RC; do + +@@ -21647,7 +20951,7 @@ + sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_RC" ++fix_srcfile_path=$lt_fix_srcfile_path + + # Set to yes if exported symbols are required. + always_export_symbols=$always_export_symbols_RC +@@ -21765,7 +21069,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21805,7 +21109,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -21892,27 +21196,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + has_option=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22030,27 +21317,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22086,17 +21356,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22227,27 +21490,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -22256,7 +21503,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -22314,7 +21561,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -22357,7 +21604,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -22422,12 +21669,12 @@ + pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` ++ pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22440,12 +21687,12 @@ + pkg_cv_PANEL_LIBS="$PANEL_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` ++ pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22464,14 +21711,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + else +- PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` ++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANEL_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $PANEL_PKG_ERRORS + +@@ -22482,7 +21729,7 @@ + and PANEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met: + + $PANEL_PKG_ERRORS + +@@ -22503,7 +21750,7 @@ + and PANEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -22513,7 +21760,7 @@ + and PANEL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -22617,7 +21864,7 @@ + and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -22627,7 +21874,7 @@ + and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -22650,12 +21897,12 @@ + pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22668,12 +21915,12 @@ + pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` ++ pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22692,14 +21939,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` + else +- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` ++ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$WNCKLET_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: + + $WNCKLET_PKG_ERRORS + +@@ -22710,7 +21957,7 @@ + and WNCKLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: ++echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met: + + $WNCKLET_PKG_ERRORS + +@@ -22731,7 +21978,7 @@ + and WNCKLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -22741,7 +21988,7 @@ + and WNCKLET_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -22793,27 +22040,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22849,17 +22079,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -22990,27 +22213,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -23019,7 +22226,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -23066,9 +22273,7 @@ + _ACEOF + + fi +- +- +-if test -n "$LIBECAL_REQUIREMENT"; then ++ if test -n "$LIBECAL_REQUIREMENT"; then + HAVE_LIBECAL_TRUE= + HAVE_LIBECAL_FALSE='#' + else +@@ -23169,7 +22374,7 @@ + and CLOCK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -23179,7 +22384,7 @@ + and CLOCK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -23283,7 +22488,7 @@ + and FISH_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&5 + echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full +@@ -23293,7 +22498,7 @@ + and FISH_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + +-To get pkg-config, see . ++To get pkg-config, see . + See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else +@@ -23384,9 +22589,7 @@ + fi; fi; fi; fi + done + +- +- +-if test -n "$CLOCK_COMPILE_INPROCESS"; then ++ if test -n "$CLOCK_COMPILE_INPROCESS"; then + CLOCK_INPROCESS_TRUE= + CLOCK_INPROCESS_FALSE='#' + else +@@ -23394,9 +22597,7 @@ + CLOCK_INPROCESS_FALSE= + fi + +- +- +-if test -n "$FISH_COMPILE_INPROCESS"; then ++ if test -n "$FISH_COMPILE_INPROCESS"; then + FISH_INPROCESS_TRUE= + FISH_INPROCESS_FALSE='#' + else +@@ -23404,9 +22605,7 @@ + FISH_INPROCESS_FALSE= + fi + +- +- +-if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then ++ if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then + NOTIFICATION_AREA_INPROCESS_TRUE= + NOTIFICATION_AREA_INPROCESS_FALSE='#' + else +@@ -23414,9 +22613,7 @@ + NOTIFICATION_AREA_INPROCESS_FALSE= + fi + +- +- +-if test -n "$WNCKLET_COMPILE_INPROCESS"; then ++ if test -n "$WNCKLET_COMPILE_INPROCESS"; then + WNCKLET_INPROCESS_TRUE= + WNCKLET_INPROCESS_FALSE='#' + else +@@ -23426,390 +22623,7 @@ + + + # For the run dialog +- +- +- +- +- +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-#include <$ac_hdr> +- +-int +-main () +-{ +-if ((DIR *) 0) +-return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-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_compile") 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval echo '${'$as_ac_Header'}'` +- { echo "$as_me:$LINENO: result: $ac_res" >&5 +-echo "${ECHO_T}$ac_res" >&6; } +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +-_ACEOF +- +-ac_header_dirent=$ac_hdr; break +-fi +- +-done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' dir; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir=$ac_res +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : +-else +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-else +- { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +-if test "${ac_cv_search_opendir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char opendir (); +-int +-main () +-{ +-return opendir (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' x; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_search_opendir=$ac_res +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if test "${ac_cv_search_opendir+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_opendir+set}" = set; then +- : +-else +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +-echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-fi +- +- { echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5 +-echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; } +-if test "${jm_cv_struct_dirent_d_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#ifdef HAVE_DIRENT_H +-# include +-#else /* not HAVE_DIRENT_H */ +-# define dirent direct +-# ifdef HAVE_SYS_NDIR_H +-# include +-# endif /* HAVE_SYS_NDIR_H */ +-# ifdef HAVE_SYS_DIR_H +-# include +-# endif /* HAVE_SYS_DIR_H */ +-# ifdef HAVE_NDIR_H +-# include +-# endif /* HAVE_NDIR_H */ +-#endif /* HAVE_DIRENT_H */ +- +-int +-main () +-{ +-struct dirent dp; dp.d_type = 0; +- ; +- 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- jm_cv_struct_dirent_d_type=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- jm_cv_struct_dirent_d_type=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +- +-fi +-{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5 +-echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; } +- if test $jm_cv_struct_dirent_d_type = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_DIRENT_D_TYPE 1 +-_ACEOF +- +- fi +- +- ++gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE + + + { echo "$as_me:$LINENO: checking for X" >&5 +@@ -23934,17 +22748,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + # We can compile using X headers with no special include directory. + ac_x_includes= + else +@@ -23967,7 +22774,7 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lXt $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23996,27 +22803,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= +@@ -24029,7 +22820,7 @@ + do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r "$ac_dir/libXt.$ac_extension"; then ++ if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi +@@ -24037,7 +22828,7 @@ + done + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no + +@@ -24133,6 +22924,8 @@ + # Put the nasty error message in config.log where it belongs + echo "$X_PKG_ERRORS" >&5 + ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + + # pkg-config modules not found (only present since X11R7 aka Xorg); use + # old-style detection +@@ -24154,12 +22947,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case `(uname -sr) 2>/dev/null` in +- "SunOS 5"*) +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -24187,44 +22980,20 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_nospace=yes ++ (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 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_nospace=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_nospace = yes; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +- else + LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -24252,48 +23021,30 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_space=yes ++ (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 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_space=no ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_space = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +- else +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } +- fi +- fi +- LIBS=$ac_xsave_LIBS +- esac ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. +@@ -24342,27 +23093,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + : + else + echo "$as_me: failed program was:" >&5 +@@ -24410,27 +23145,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dnet_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24439,7 +23158,7 @@ + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24492,27 +23211,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24521,7 +23224,7 @@ + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24534,7 +23237,7 @@ + fi + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + +@@ -24609,27 +23312,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24638,7 +23325,7 @@ + ac_cv_func_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +@@ -24687,27 +23374,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_nsl_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24716,7 +23387,7 @@ + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24769,27 +23440,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_bsd_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24798,7 +23453,7 @@ + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -24881,27 +23536,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24910,7 +23549,7 @@ + ac_cv_func_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +@@ -24959,27 +23598,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_socket_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -24988,7 +23611,7 @@ + ac_cv_lib_socket_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25064,27 +23687,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25093,7 +23700,7 @@ + ac_cv_func_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +@@ -25136,33 +23743,17 @@ + *) 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&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); }; }; then ++ (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 + ac_cv_lib_posix_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25171,7 +23762,7 @@ + ac_cv_lib_posix_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25247,27 +23838,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25276,7 +23851,7 @@ + ac_cv_func_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +@@ -25325,27 +23900,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_ipc_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25354,7 +23913,7 @@ + ac_cv_lib_ipc_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25418,27 +23977,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_ICE_IceConnectionNumber=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25447,7 +23990,7 @@ + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25515,27 +24058,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_X11_XFree=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25544,7 +24071,7 @@ + ac_cv_lib_X11_XFree=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25606,27 +24133,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_Xau_XauFileName=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25635,7 +24146,7 @@ + ac_cv_lib_Xau_XauFileName=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -25681,12 +24192,12 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case `(uname -sr) 2>/dev/null` in +- "SunOS 5"*) +- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 ++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ++ ac_xsave_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -25714,44 +24225,20 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_nospace=yes ++ (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 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ X_LIBS="$X_LIBS -R$x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_nospace=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_nospace = yes; then +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +- else + LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -25779,48 +24266,30 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_R_space=yes ++ (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 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_R_space=no ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- if test $ac_R_space = yes; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +- else +- { echo "$as_me:$LINENO: result: neither works" >&5 +-echo "${ECHO_T}neither works" >&6; } +- fi +- fi +- LIBS=$ac_xsave_LIBS +- esac ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ac_c_werror_flag=$ac_xsave_c_werror_flag ++ LIBS=$ac_xsave_LIBS + fi + + # Check for system-dependent libraries X programs must link with. +@@ -25869,27 +24338,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + : + else + echo "$as_me: failed program was:" >&5 +@@ -25937,27 +24390,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dnet_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -25966,7 +24403,7 @@ + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26019,27 +24456,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26048,7 +24469,7 @@ + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26061,7 +24482,7 @@ + fi + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + +@@ -26136,27 +24557,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26165,7 +24570,7 @@ + ac_cv_func_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +@@ -26214,27 +24619,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_nsl_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26243,7 +24632,7 @@ + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26290,33 +24679,17 @@ + *) 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&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); }; }; then ++ (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 + ac_cv_lib_bsd_gethostbyname=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26325,7 +24698,7 @@ + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26408,27 +24781,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26437,7 +24794,7 @@ + ac_cv_func_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +@@ -26486,27 +24843,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_socket_connect=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26515,7 +24856,7 @@ + ac_cv_lib_socket_connect=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26591,27 +24932,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26620,7 +24945,7 @@ + ac_cv_func_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +@@ -26669,27 +24994,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_posix_remove=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26698,7 +25007,7 @@ + ac_cv_lib_posix_remove=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26774,27 +25083,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26803,7 +25096,7 @@ + ac_cv_func_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +@@ -26852,27 +25145,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_ipc_shmat=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26881,7 +25158,7 @@ + ac_cv_lib_ipc_shmat=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -26945,27 +25222,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_ICE_IceConnectionNumber=yes + else + echo "$as_me: failed program was:" >&5 +@@ -26974,7 +25235,7 @@ + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -27042,27 +25303,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_X11_XFree=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27071,7 +25316,7 @@ + ac_cv_lib_X11_XFree=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -27133,27 +25378,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_Xau_XauFileName=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27162,7 +25391,7 @@ + ac_cv_lib_Xau_XauFileName=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -27255,27 +25484,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27311,17 +25523,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27419,27 +25624,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + am_cv_val_LC_MESSAGES=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27448,7 +25637,7 @@ + am_cv_val_LC_MESSAGES=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +@@ -27504,27 +25693,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27560,17 +25732,10 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27666,27 +25831,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + gt_cv_func_ngettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27695,7 +25844,7 @@ + gt_cv_func_ngettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -27725,40 +25874,24 @@ + 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); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (case "(($ac_try" in ++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_try") 2>&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); }; }; then ++ (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 + gt_cv_func_dgettext_libc=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27767,7 +25900,7 @@ + gt_cv_func_dgettext_libc=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +@@ -27843,27 +25976,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -27872,7 +25989,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -27937,27 +26054,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_bindtextdomain=yes + else + echo "$as_me: failed program was:" >&5 +@@ -27966,7 +26067,7 @@ + ac_cv_lib_intl_bindtextdomain=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28015,27 +26116,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28044,7 +26129,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28093,27 +26178,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_dgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28122,7 +26191,7 @@ + ac_cv_lib_intl_dgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28184,27 +26253,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_ngettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28213,7 +26266,7 @@ + ac_cv_lib_intl_ngettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28262,27 +26315,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_lib_intl_dcgettext=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28291,7 +26328,7 @@ + ac_cv_lib_intl_dcgettext=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +@@ -28386,27 +26423,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -28415,7 +26436,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -28562,27 +26583,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +@@ -28591,7 +26596,7 @@ + eval "$as_ac_var=no" + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + ac_res=`eval echo '${'$as_ac_var'}'` +@@ -28652,7 +26657,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -28740,27 +26745,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -28832,27 +26821,11 @@ + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (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_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ (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 + ac_cv_func_bind_textdomain_codeset=yes + else + echo "$as_me: failed program was:" >&5 +@@ -28861,7 +26834,7 @@ + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +@@ -28882,7 +26855,7 @@ + esac + fi + +-rm -f core conftest.err conftest.$ac_objext \ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo +@@ -29019,29 +26992,75 @@ + fi + + ++ have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5 +-echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ + +- { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-echo "${ECHO_T}$enable_gtk_doc" >&6; } ++ fi ++ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ++ have_gtk_doc=yes ++ fi + ++ gtk_doc_min_version=1.0 ++ if test "$have_gtk_doc" = yes; then ++ { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 ++echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ have_gtk_doc=no ++ fi ++ fi + ++ if test "$have_gtk_doc" != yes; then ++ enable_gtk_doc=no ++ fi ++ fi + +-if test x$enable_gtk_doc = xyes; then ++ if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' + else +@@ -29049,9 +27068,7 @@ + ENABLE_GTK_DOC_FALSE= + fi + +- +- +-if test -n "$LIBTOOL"; then ++ if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' + else +@@ -29125,9 +27142,7 @@ + enable_scrollkeeper=yes + fi + +- +- +-if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then ++ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then + ENABLE_SK_TRUE= + ENABLE_SK_FALSE='#' + else +@@ -29136,9 +27151,7 @@ + fi + + +- +- +-if test "$gdu_cv_have_gdu" = "yes"; then ++ if test "$gdu_cv_have_gdu" = "yes"; then + HAVE_GNOME_DOC_UTILS_TRUE= + HAVE_GNOME_DOC_UTILS_FALSE='#' + else +@@ -29168,7 +27181,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -29240,9 +27253,7 @@ + esac + fi + +- +- +-if test "$enable_schemas_install" != no; then ++ if test "$enable_schemas_install" != no; then + GCONF_SCHEMAS_INSTALL_TRUE= + GCONF_SCHEMAS_INSTALL_FALSE='#' + else +@@ -29283,7 +27294,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -29328,7 +27339,7 @@ + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -29601,7 +27612,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + +-# Be Bourne compatible ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -29610,10 +27622,13 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++ case `(set -o) 2>/dev/null` in ++ *posix*) set -o posix ;; ++esac ++ + fi +-BIN_SH=xpg4; export BIN_SH # for Tru64 +-DUALCASE=1; export DUALCASE # for MKS sh ++ ++ + + + # PATH needs CR +@@ -29837,19 +27852,28 @@ + as_mkdir_p=false + fi + +-# Find out whether ``test -x'' works. Don't use a zero-byte file, as +-# systems may use methods other than mode bits to determine executability. +-cat >conf$$.file <<_ASEOF +-#! /bin/sh +-exit 0 +-_ASEOF +-chmod +x conf$$.file +-if test -x conf$$.file >/dev/null 2>&1; then +- as_executable_p="test -x" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' + else +- as_executable_p=: ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' + fi +-rm -f conf$$.file ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -29865,7 +27889,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-panel $as_me 2.20.0.1, which was +-generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -29894,7 +27918,7 @@ + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -29918,7 +27942,7 @@ + cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gnome-panel config.status 2.20.0.1 +-configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + + Copyright (C) 2006 Free Software Foundation, Inc. +@@ -29928,6 +27952,7 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -30023,9 +28048,7 @@ + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' + prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}' ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' + + + _ACEOF +@@ -30187,6 +28210,7 @@ + INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim + INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim + INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim + CYGPATH_W!$CYGPATH_W$ac_delim + PACKAGE!$PACKAGE$ac_delim + VERSION!$VERSION$ac_delim +@@ -30229,14 +28253,11 @@ + INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim ++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim + INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim +-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim +-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim +-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim + ALL_LINGUAS!$ALL_LINGUAS$ac_delim + CC!$CC$ac_delim + CFLAGS!$CFLAGS$ac_delim +@@ -30244,6 +28265,8 @@ + CPPFLAGS!$CPPFLAGS$ac_delim + ac_ct_CC!$ac_ct_CC$ac_delim + EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -30285,8 +28308,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-OBJEXT!$OBJEXT$ac_delim +-DEPDIR!$DEPDIR$ac_delim + am__include!$am__include$ac_delim + am__quote!$am__quote$ac_delim + AMDEP_TRUE!$AMDEP_TRUE$ac_delim +@@ -30307,6 +28328,7 @@ + host_cpu!$host_cpu$ac_delim + host_vendor!$host_vendor$ac_delim + host_os!$host_os$ac_delim ++SED!$SED$ac_delim + LN_S!$LN_S$ac_delim + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim +@@ -30382,6 +28404,7 @@ + GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim + GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim + HELP_DIR!$HELP_DIR$ac_delim ++OMF_DIR!$OMF_DIR$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -30423,7 +28446,6 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-OMF_DIR!$OMF_DIR$ac_delim + DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim + ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim + ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim +@@ -30440,7 +28462,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -30667,6 +28689,11 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF +@@ -30720,6 +28747,7 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out + +@@ -30884,8 +28912,9 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +@@ -31004,10 +29033,6 @@ + for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ +- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ +- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ +- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then +diff -Nur gnome-panel-2.20.0/doc/Makefile.in gnome-panel-2.20.0.new/doc/Makefile.in +--- gnome-panel-2.20.0/doc/Makefile.in 2007-09-17 21:33:31.000000000 +0200 ++++ gnome-panel-2.20.0.new/doc/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = reference + EXTRA_DIST = \ + panel-session-handling.txt \ +@@ -311,10 +287,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -346,8 +318,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -448,22 +419,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -477,7 +447,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -485,6 +455,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -524,8 +496,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -539,12 +510,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -563,22 +542,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/doc/reference/Makefile.in gnome-panel-2.20.0.new/doc/reference/Makefile.in +--- gnome-panel-2.20.0/doc/reference/Makefile.in 2007-09-17 21:33:31.000000000 +0200 ++++ gnome-panel-2.20.0.new/doc/reference/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = doc/reference + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = panel-applet + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/doc/reference/panel-applet/Makefile.in gnome-panel-2.20.0.new/doc/reference/panel-applet/Makefile.in +--- gnome-panel-2.20.0/doc/reference/panel-applet/Makefile.in 2007-09-17 21:33:31.000000000 +0200 ++++ gnome-panel-2.20.0.new/doc/reference/panel-applet/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -19,15 +19,11 @@ + #################################### + # Everything below here is generic # + #################################### +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -45,10 +41,7 @@ + $(top_srcdir)/gtk-doc.make ChangeLog + subdir = doc/reference/panel-applet + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -60,8 +53,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -78,8 +69,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -101,20 +90,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -122,14 +103,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -140,14 +116,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -159,7 +133,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -172,14 +145,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -202,6 +172,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -209,8 +180,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -218,13 +187,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -236,6 +205,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -263,8 +233,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module, e.g. 'glib'. +@@ -391,10 +364,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -403,23 +372,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -468,7 +435,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -482,12 +449,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -507,19 +482,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp +diff -Nur gnome-panel-2.20.0/gnome-panel/Makefile.in gnome-panel-2.20.0.new/gnome-panel/Makefile.in +--- gnome-panel-2.20.0/gnome-panel/Makefile.in 2007-09-17 21:33:32.000000000 +0200 ++++ gnome-panel-2.20.0.new/gnome-panel/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,15 +15,11 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -42,10 +38,7 @@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnome-panel.desktop.in.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -65,6 +58,9 @@ + am__DEPENDENCIES_1 = + gnome_desktop_item_edit_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ++gnome_desktop_item_edit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(gnome_desktop_item_edit_LDFLAGS) $(LDFLAGS) -o $@ + am__objects_1 = + am__objects_2 = GNOME_Panel-stubs.$(OBJEXT) \ + GNOME_Panel-skels.$(OBJEXT) GNOME_Panel-common.$(OBJEXT) \ +@@ -88,7 +84,9 @@ + panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \ + panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \ + panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \ +- panel-addto.$(OBJEXT) panel-logout.$(OBJEXT) \ ++ panel-addto.$(OBJEXT) panel-addto-canvas.$(OBJEXT) \ ++ panel-addto-rounded-rect.$(OBJEXT) \ ++ panel-addto-event-box.$(OBJEXT) panel-logout.$(OBJEXT) \ + panel-gdm.$(OBJEXT) panel-power-manager.$(OBJEXT) \ + panel-ditem-editor.$(OBJEXT) $(am__objects_1) + am__objects_4 = $(am__objects_1) +@@ -96,17 +94,21 @@ + $(am__objects_4) $(am__objects_1) + gnome_panel_OBJECTS = $(am_gnome_panel_OBJECTS) + gnome_panel_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) + DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \ + $(gnome_panel_SOURCES) +@@ -131,8 +133,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -149,8 +149,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -172,20 +170,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -193,14 +183,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -211,14 +196,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -230,7 +213,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -243,14 +225,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -273,6 +252,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -280,8 +260,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -289,13 +267,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -307,6 +285,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -334,8 +313,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.3 + NULL = + INCLUDES = \ +@@ -422,6 +404,9 @@ + panel-force-quit.c \ + panel-lockdown.c \ + panel-addto.c \ ++ panel-addto-canvas.c \ ++ panel-addto-rounded-rect.c \ ++ panel-addto-event-box.c \ + panel-logout.c \ + panel-gdm.c \ + panel-power-manager.c \ +@@ -471,6 +456,10 @@ + panel-force-quit.h \ + panel-lockdown.h \ + panel-addto.h \ ++ panel-addto-canvas.h \ ++ panel-addto-rounded-rect.h \ ++ panel-addto-rounded-rect-pixbuf.h \ ++ panel-addto-event-box.h \ + panel-logout.h \ + panel-gdm.h \ + panel-power-manager.h \ +@@ -590,7 +579,7 @@ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -618,10 +607,10 @@ + done + gnome-desktop-item-edit$(EXEEXT): $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_DEPENDENCIES) + @rm -f gnome-desktop-item-edit$(EXEEXT) +- $(LINK) $(gnome_desktop_item_edit_LDFLAGS) $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_LDADD) $(LIBS) ++ $(gnome_desktop_item_edit_LINK) $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_LDADD) $(LIBS) + gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES) + @rm -f gnome-panel$(EXEEXT) +- $(LINK) $(gnome_panel_LDFLAGS) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS) ++ $(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -642,6 +631,9 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-a11y.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-action-button.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-action-protocol.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-canvas.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-event-box.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto-rounded-rect.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-addto.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-applet-frame.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-background-monitor.Po@am__quote@ +@@ -681,22 +673,22 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstuff.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -706,13 +698,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) +- test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" ++ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -729,7 +717,7 @@ + done + install-entriesDATA: $(entries_DATA) + @$(NORMAL_INSTALL) +- test -z "$(entriesdir)" || $(mkdir_p) "$(DESTDIR)$(entriesdir)" ++ test -z "$(entriesdir)" || $(MKDIR_P) "$(DESTDIR)$(entriesdir)" + @list='$(entries_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -746,7 +734,7 @@ + done + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -763,7 +751,7 @@ + done + install-rcDATA: $(rc_DATA) + @$(NORMAL_INSTALL) +- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" ++ test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" + @list='$(rc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -780,7 +768,7 @@ + done + install-schemasDATA: $(schemas_DATA) + @$(NORMAL_INSTALL) +- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)" ++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" + @list='$(schemas_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -797,7 +785,7 @@ + done + install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) +- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" ++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -814,7 +802,7 @@ + done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) +- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)" ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -879,22 +867,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -914,7 +901,7 @@ + all-am: Makefile $(PROGRAMS) $(DATA) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(entriesdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -951,7 +938,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -967,12 +954,20 @@ + install-entriesDATA install-gladeDATA install-rcDATA \ + install-schemasDATA install-serverDATA install-uiDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -994,9 +989,10 @@ + ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ +- uninstall-entriesDATA uninstall-gladeDATA uninstall-info-am \ +- uninstall-rcDATA uninstall-schemasDATA uninstall-serverDATA \ +- uninstall-uiDATA ++ uninstall-entriesDATA uninstall-gladeDATA uninstall-rcDATA \ ++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags dist-hook distclean \ +@@ -1004,17 +1000,18 @@ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-data-local install-desktopDATA \ +- install-entriesDATA install-exec install-exec-am \ +- install-gladeDATA install-info install-info-am install-man \ +- install-rcDATA install-schemasDATA install-serverDATA \ +- install-strip install-uiDATA installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \ +- uninstall-entriesDATA uninstall-gladeDATA uninstall-info-am \ +- uninstall-rcDATA uninstall-schemasDATA uninstall-serverDATA \ +- uninstall-uiDATA ++ install-dvi install-dvi-am install-entriesDATA install-exec \ ++ install-exec-am install-gladeDATA install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-rcDATA \ ++ install-schemasDATA install-serverDATA install-strip \ ++ install-uiDATA installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-desktopDATA \ ++ uninstall-entriesDATA uninstall-gladeDATA uninstall-rcDATA \ ++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA + + + $(gnome_panel_OBJECTS): $(BUILT_SOURCES) +diff -Nur gnome-panel-2.20.0/help/clock/Makefile.in gnome-panel-2.20.0.new/help/clock/Makefile.in +--- gnome-panel-2.20.0/help/clock/Makefile.in 2007-09-17 21:33:33.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/clock/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -37,15 +37,11 @@ + # the same distribution terms that you use for the rest of that program. + + ################################################################################ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -63,10 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/clock + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -78,8 +71,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -96,8 +87,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -119,20 +108,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -140,14 +121,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -158,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -177,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -190,14 +163,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -220,6 +190,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -227,8 +198,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -236,13 +205,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -254,6 +223,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -281,8 +251,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) + _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) + _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ +@@ -425,10 +398,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -437,23 +406,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -501,8 +468,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + +@@ -516,12 +482,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -542,19 +516,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.20.0/help/de/fish/Makefile.in gnome-panel-2.20.0.new/help/de/fish/Makefile.in +--- gnome-panel-2.20.0/help/de/fish/Makefile.in 2007-09-17 21:33:33.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/de/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = fish-applet-2 + lang = de +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/de/Makefile.in gnome-panel-2.20.0.new/help/de/Makefile.in +--- gnome-panel-2.20.0/help/de/Makefile.in 2007-09-17 21:33:33.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/de/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = help/de + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = fish window-list workspace-switcher + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/help/de/window-list/Makefile.in gnome-panel-2.20.0.new/help/de/window-list/Makefile.in +--- gnome-panel-2.20.0/help/de/window-list/Makefile.in 2007-09-17 21:33:34.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/de/window-list/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = window-list + lang = de +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/de/workspace-switcher/Makefile.in gnome-panel-2.20.0.new/help/de/workspace-switcher/Makefile.in +--- gnome-panel-2.20.0/help/de/workspace-switcher/Makefile.in 2007-09-17 21:33:34.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/de/workspace-switcher/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/de/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = workspace-switcher + lang = de +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/fish/Makefile.in gnome-panel-2.20.0.new/help/fish/Makefile.in +--- gnome-panel-2.20.0/help/fish/Makefile.in 2007-09-17 21:33:35.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -37,15 +37,11 @@ + # the same distribution terms that you use for the rest of that program. + + ################################################################################ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -63,10 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -78,8 +71,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -96,8 +87,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -119,20 +108,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -140,14 +121,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -158,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -177,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -190,14 +163,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -220,6 +190,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -227,8 +198,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -236,13 +205,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -254,6 +223,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -281,8 +251,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) + _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) + _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ +@@ -425,10 +398,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -437,23 +406,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -501,8 +468,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + +@@ -516,12 +482,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -542,19 +516,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.20.0/help/ja/fish/Makefile.in gnome-panel-2.20.0.new/help/ja/fish/Makefile.in +--- gnome-panel-2.20.0/help/ja/fish/Makefile.in 2007-09-17 21:33:35.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/ja/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = fish-applet-2 + lang = ja +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/ja/Makefile.in gnome-panel-2.20.0.new/help/ja/Makefile.in +--- gnome-panel-2.20.0/help/ja/Makefile.in 2007-09-17 21:33:35.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/ja/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = help/ja + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = fish window-list workspace-switcher + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/help/ja/window-list/Makefile.in gnome-panel-2.20.0.new/help/ja/window-list/Makefile.in +--- gnome-panel-2.20.0/help/ja/window-list/Makefile.in 2007-09-17 21:33:36.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/ja/window-list/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = window-list + lang = ja +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/ja/workspace-switcher/Makefile.in gnome-panel-2.20.0.new/help/ja/workspace-switcher/Makefile.in +--- gnome-panel-2.20.0/help/ja/workspace-switcher/Makefile.in 2007-09-17 21:33:36.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/ja/workspace-switcher/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/ja/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = workspace-switcher + lang = ja +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/Makefile.in gnome-panel-2.20.0.new/help/Makefile.in +--- gnome-panel-2.20.0/help/Makefile.in 2007-09-17 21:33:32.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = help + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = clock fish window-list workspace-switcher ja de zh_CN zh_TW + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/help/window-list/Makefile.in gnome-panel-2.20.0.new/help/window-list/Makefile.in +--- gnome-panel-2.20.0/help/window-list/Makefile.in 2007-09-17 21:33:36.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/window-list/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -37,15 +37,11 @@ + # the same distribution terms that you use for the rest of that program. + + ################################################################################ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -63,10 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -78,8 +71,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -96,8 +87,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -119,20 +108,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -140,14 +121,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -158,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -177,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -190,14 +163,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -220,6 +190,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -227,8 +198,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -236,13 +205,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -254,6 +223,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -281,8 +251,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) + _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) + _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ +@@ -425,10 +398,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -437,23 +406,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -501,8 +468,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + +@@ -516,12 +482,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -542,19 +516,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.20.0/help/workspace-switcher/Makefile.in gnome-panel-2.20.0.new/help/workspace-switcher/Makefile.in +--- gnome-panel-2.20.0/help/workspace-switcher/Makefile.in 2007-09-17 21:33:37.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/workspace-switcher/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -37,15 +37,11 @@ + # the same distribution terms that you use for the rest of that program. + + ################################################################################ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -63,10 +59,7 @@ + $(top_srcdir)/gnome-doc-utils.make + subdir = help/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -78,8 +71,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -96,8 +87,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -119,20 +108,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -140,14 +121,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -158,14 +134,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -177,7 +151,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -190,14 +163,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -220,6 +190,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -227,8 +198,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -236,13 +205,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -254,6 +223,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -281,8 +251,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) + _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) + _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ +@@ -425,10 +398,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -437,23 +406,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -501,8 +468,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + +@@ -516,12 +482,20 @@ + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -542,19 +516,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-local mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-local mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-local + + + DOC_H_FILE ?= +diff -Nur gnome-panel-2.20.0/help/zh_CN/fish/Makefile.in gnome-panel-2.20.0.new/help/zh_CN/fish/Makefile.in +--- gnome-panel-2.20.0/help/zh_CN/fish/Makefile.in 2007-09-17 21:33:38.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_CN/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_CN/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = fish-applet-2 + lang = zh_CN +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/zh_CN/Makefile.in gnome-panel-2.20.0.new/help/zh_CN/Makefile.in +--- gnome-panel-2.20.0/help/zh_CN/Makefile.in 2007-09-17 21:33:37.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_CN/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = help/zh_CN + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = fish workspace-switcher + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.20.0.new/help/zh_CN/workspace-switcher/Makefile.in +--- gnome-panel-2.20.0/help/zh_CN/workspace-switcher/Makefile.in 2007-09-17 21:33:38.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_CN/workspace-switcher/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_CN/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = workspace-switcher + lang = zh_CN +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/zh_TW/fish/Makefile.in gnome-panel-2.20.0.new/help/zh_TW/fish/Makefile.in +--- gnome-panel-2.20.0/help/zh_TW/fish/Makefile.in 2007-09-17 21:33:39.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_TW/fish/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/fish + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = fish-applet-2 + lang = zh_TW +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/zh_TW/Makefile.in gnome-panel-2.20.0.new/help/zh_TW/Makefile.in +--- gnome-panel-2.20.0/help/zh_TW/Makefile.in 2007-09-17 21:33:38.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_TW/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = help/zh_TW + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -51,10 +44,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -62,8 +58,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -80,8 +74,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -103,20 +95,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -124,14 +108,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -142,14 +121,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -161,7 +138,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -174,14 +150,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -204,6 +177,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -211,8 +185,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -220,13 +192,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -238,6 +210,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -265,8 +238,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = fish window-list workspace-switcher + all: all-recursive + +@@ -307,10 +283,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -342,8 +314,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -444,22 +415,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -473,7 +443,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -481,6 +451,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -520,8 +492,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -535,12 +506,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -559,22 +538,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/help/zh_TW/window-list/Makefile.in gnome-panel-2.20.0.new/help/zh_TW/window-list/Makefile.in +--- gnome-panel-2.20.0/help/zh_TW/window-list/Makefile.in 2007-09-17 21:33:39.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_TW/window-list/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/window-list + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = window-list + lang = zh_TW +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.20.0.new/help/zh_TW/workspace-switcher/Makefile.in +--- gnome-panel-2.20.0/help/zh_TW/workspace-switcher/Makefile.in 2007-09-17 21:33:39.000000000 +0200 ++++ gnome-panel-2.20.0.new/help/zh_TW/workspace-switcher/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -75,15 +75,11 @@ + # http://scrollkeeper.sourceforge.net/ + # Version: 0.1.3 (last updated: March 20, 2002) + # +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -101,10 +97,7 @@ + $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make + subdir = help/zh_TW/workspace-switcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -116,8 +109,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -134,8 +125,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -157,20 +146,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -178,14 +159,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -196,14 +172,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -215,7 +189,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -228,14 +201,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -258,6 +228,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -265,8 +236,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -274,13 +243,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -292,6 +261,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + +@@ -323,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + figdir = figures + docname = workspace-switcher + lang = zh_TW +@@ -375,10 +348,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -387,23 +356,21 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -452,7 +419,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -468,12 +435,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -492,18 +467,22 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-hook install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-data-hook install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + # At some point, it may be wise to change to something like this: +diff -Nur gnome-panel-2.20.0/icons/16x16/Makefile.in gnome-panel-2.20.0.new/icons/16x16/Makefile.in +--- gnome-panel-2.20.0/icons/16x16/Makefile.in 2007-09-17 21:33:40.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/16x16/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons/16x16 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + NULL = + size = 16x16 + iconsdir = $(datadir)/icons/hicolor/$(size)/apps +@@ -342,13 +315,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" ++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -371,22 +340,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -402,7 +370,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -434,7 +402,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -450,12 +418,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -474,20 +450,24 @@ + + ps-am: + +-uninstall-am: uninstall-iconsDATA uninstall-info-am ++uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + ++.MAKE: install-am install-data-am install-strip uninstall-am ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-exec \ +- install-exec-am install-iconsDATA install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-iconsDATA install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ +- uninstall-iconsDATA uninstall-info-am ++ uninstall-iconsDATA + + + install-data-hook: update-icon-cache +diff -Nur gnome-panel-2.20.0/icons/22x22/Makefile.in gnome-panel-2.20.0.new/icons/22x22/Makefile.in +--- gnome-panel-2.20.0/icons/22x22/Makefile.in 2007-09-17 21:33:40.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/22x22/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons/22x22 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + NULL = + size = 22x22 + iconsdir = $(datadir)/icons/hicolor/$(size)/apps +@@ -342,13 +315,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" ++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -371,22 +340,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -402,7 +370,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -434,7 +402,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -450,12 +418,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -474,20 +450,24 @@ + + ps-am: + +-uninstall-am: uninstall-iconsDATA uninstall-info-am ++uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + ++.MAKE: install-am install-data-am install-strip uninstall-am ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-exec \ +- install-exec-am install-iconsDATA install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-iconsDATA install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ +- uninstall-iconsDATA uninstall-info-am ++ uninstall-iconsDATA + + + install-data-hook: update-icon-cache +diff -Nur gnome-panel-2.20.0/icons/24x24/Makefile.in gnome-panel-2.20.0.new/icons/24x24/Makefile.in +--- gnome-panel-2.20.0/icons/24x24/Makefile.in 2007-09-17 21:33:40.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/24x24/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons/24x24 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + NULL = + size = 24x24 + iconsdir = $(datadir)/icons/hicolor/$(size)/apps +@@ -327,13 +300,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" ++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -356,22 +325,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -387,7 +355,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -419,7 +387,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -435,12 +403,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -459,20 +435,24 @@ + + ps-am: + +-uninstall-am: uninstall-iconsDATA uninstall-info-am ++uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + ++.MAKE: install-am install-data-am install-strip uninstall-am ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-exec \ +- install-exec-am install-iconsDATA install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-iconsDATA install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ +- uninstall-iconsDATA uninstall-info-am ++ uninstall-iconsDATA + + + install-data-hook: update-icon-cache +diff -Nur gnome-panel-2.20.0/icons/32x32/Makefile.in gnome-panel-2.20.0.new/icons/32x32/Makefile.in +--- gnome-panel-2.20.0/icons/32x32/Makefile.in 2007-09-17 21:33:41.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/32x32/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons/32x32 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + NULL = + size = 32x32 + iconsdir = $(datadir)/icons/hicolor/$(size)/apps +@@ -342,13 +315,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" ++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -371,22 +340,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -402,7 +370,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -434,7 +402,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -450,12 +418,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -474,20 +450,24 @@ + + ps-am: + +-uninstall-am: uninstall-iconsDATA uninstall-info-am ++uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + ++.MAKE: install-am install-data-am install-strip uninstall-am ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-exec \ +- install-exec-am install-iconsDATA install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-iconsDATA install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ +- uninstall-iconsDATA uninstall-info-am ++ uninstall-iconsDATA + + + install-data-hook: update-icon-cache +diff -Nur gnome-panel-2.20.0/icons/Makefile.in gnome-panel-2.20.0.new/icons/Makefile.in +--- gnome-panel-2.20.0/icons/Makefile.in 2007-09-17 21:33:41.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -52,10 +45,11 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -65,6 +59,8 @@ + am__installdirs = "$(DESTDIR)$(gegldir)" + geglDATA_INSTALL = $(INSTALL_DATA) + DATA = $(gegl_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -72,8 +68,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -90,8 +84,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -113,20 +105,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -134,14 +118,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -152,14 +131,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -171,7 +148,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -184,14 +160,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -214,6 +187,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -221,8 +195,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -230,13 +202,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -248,6 +220,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -275,8 +248,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = 16x16 22x22 24x24 32x32 scalable + NULL = + gegldir = $(datadir)/gnome-panel/pixmaps +@@ -325,13 +301,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-geglDATA: $(gegl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gegldir)" || $(mkdir_p) "$(DESTDIR)$(gegldir)" ++ test -z "$(gegldir)" || $(MKDIR_P) "$(DESTDIR)$(gegldir)" + @list='$(gegl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -378,8 +350,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -480,22 +451,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -509,7 +479,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -517,6 +487,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -527,7 +499,7 @@ + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(gegldir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -559,8 +531,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -574,12 +545,20 @@ + + install-data-am: install-geglDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -598,23 +577,24 @@ + + ps-am: + +-uninstall-am: uninstall-geglDATA uninstall-info-am ++uninstall-am: uninstall-geglDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-geglDATA \ +- install-info install-info-am install-man install-strip \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-geglDATA install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-geglDATA \ +- uninstall-info-am ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-geglDATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/icons/scalable/Makefile.in gnome-panel-2.20.0.new/icons/scalable/Makefile.in +--- gnome-panel-2.20.0/icons/scalable/Makefile.in 2007-09-17 21:33:41.000000000 +0200 ++++ gnome-panel-2.20.0.new/icons/scalable/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = icons/scalable + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + NULL = + size = scalable + iconsdir = $(datadir)/icons/hicolor/$(size)/apps +@@ -331,13 +304,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) +- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)" ++ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -360,22 +329,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -391,7 +359,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -423,7 +391,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -439,12 +407,20 @@ + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -463,20 +439,24 @@ + + ps-am: + +-uninstall-am: uninstall-iconsDATA uninstall-info-am ++uninstall-am: uninstall-iconsDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + ++.MAKE: install-am install-data-am install-strip uninstall-am ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-hook install-exec \ +- install-exec-am install-iconsDATA install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-iconsDATA install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-hook \ +- uninstall-iconsDATA uninstall-info-am ++ uninstall-iconsDATA + + + install-data-hook: update-icon-cache +diff -Nur gnome-panel-2.20.0/idl/Makefile.in gnome-panel-2.20.0.new/idl/Makefile.in +--- gnome-panel-2.20.0/idl/Makefile.in 2007-09-17 21:33:42.000000000 +0200 ++++ gnome-panel-2.20.0.new/idl/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,15 +14,11 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,10 +35,7 @@ + subdir = idl + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -63,8 +56,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -81,8 +72,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -104,20 +93,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -125,14 +106,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -143,14 +119,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -162,7 +136,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -175,14 +148,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -205,6 +175,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -212,8 +183,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -221,13 +190,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -239,6 +208,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -266,8 +236,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + idldir = $(datadir)/idl/gnome-panel-2.0 + idl_DATA = GNOME_Panel.idl + EXTRA_DIST = $(idl_DATA) +@@ -309,13 +282,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-idlDATA: $(idl_DATA) + @$(NORMAL_INSTALL) +- test -z "$(idldir)" || $(mkdir_p) "$(DESTDIR)$(idldir)" ++ test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)" + @list='$(idl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -338,22 +307,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -369,7 +337,7 @@ + all-am: Makefile $(DATA) + installdirs: + for dir in "$(DESTDIR)$(idldir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -401,7 +369,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -415,12 +383,20 @@ + + install-data-am: install-idlDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -439,17 +415,21 @@ + + ps-am: + +-uninstall-am: uninstall-idlDATA uninstall-info-am ++uninstall-am: uninstall-idlDATA ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ + install-idlDATA install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-idlDATA uninstall-info-am ++ uninstall uninstall-am uninstall-idlDATA + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/intltool-extract.in gnome-panel-2.20.0.new/intltool-extract.in +--- gnome-panel-2.20.0/intltool-extract.in 2007-09-17 21:33:02.000000000 +0200 ++++ gnome-panel-2.20.0.new/intltool-extract.in 2007-09-18 11:28:37.000000000 +0200 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + + ## Loaded modules + use strict; +@@ -237,9 +237,9 @@ + + s/'/'/g; # ' + s/"/"/g; # " +- s/&/&/g; + s/<//g; ++ s/&/&/g; + + return $_; + } +diff -Nur gnome-panel-2.20.0/intltool-merge.in gnome-panel-2.20.0.new/intltool-merge.in +--- gnome-panel-2.20.0/intltool-merge.in 2007-09-17 21:33:02.000000000 +0200 ++++ gnome-panel-2.20.0.new/intltool-merge.in 2007-09-18 11:28:37.000000000 +0200 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + + ## Loaded modules + use strict; +@@ -93,9 +93,24 @@ + + my %po_files_by_lang = (); + my %translations = (); +-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; ++my $iconv = $ENV{"ICONV"} || "iconv"; + my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); + ++sub isProgramInPath ++{ ++ my ($file) = @_; ++ # If either a file exists, or when run it returns 0 exit status ++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); ++ return 0; ++} ++ ++if (! isProgramInPath ("$iconv")) ++{ ++ print STDERR " *** iconv is not found on this system!\n". ++ " *** Without it, intltool-merge can not convert encodings.\n"; ++ exit; ++} ++ + # Use this instead of \w for XML files to handle more possible characters. + my $w = "[-A-Za-z0-9._:]"; + +@@ -260,8 +275,42 @@ + + sub gather_po_files + { +- for my $po_file (glob "$PO_DIR/*.po") { +- $po_files_by_lang{po_file2lang($po_file)} = $po_file; ++ if (my $linguas = $ENV{"LINGUAS"}) ++ { ++ for my $lang (split / /, $linguas) { ++ my $po_file = $PO_DIR . "/" . $lang . ".po"; ++ if (-e $po_file) { ++ $po_files_by_lang{$lang} = $po_file; ++ } ++ } ++ } ++ else ++ { ++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") ++ { ++ while () ++ { ++ next if /^#/; ++ ++ if (/([-a-zA-Z_@.]+)\n/) ++ { ++ my $lang = $1; ++ ++ my $po_file = $PO_DIR . "/" . $lang . ".po"; ++ if (-e $po_file) { ++ $po_files_by_lang{$lang} = $po_file; ++ } ++ } ++ } ++ ++ close LINGUAS_FILE; ++ } ++ else ++ { ++ for my $po_file (glob "$PO_DIR/*.po") { ++ $po_files_by_lang{po_file2lang($po_file)} = $po_file; ++ } ++ } + } + } + +@@ -494,16 +543,15 @@ + return $string; + } + +-## NOTE: deal with < - < but not > - > because it seems its ok to have +-## > in the entity. For further info please look at #84738. + sub entity_decode + { + local ($_) = @_; + + s/'/'/g; # ' + s/"/"/g; # " +- s/&/&/g; + s/<//g; ++ s/&/&/g; + + return $_; + } +diff -Nur gnome-panel-2.20.0/intltool-update.in gnome-panel-2.20.0.new/intltool-update.in +--- gnome-panel-2.20.0/intltool-update.in 2007-09-17 21:33:02.000000000 +0200 ++++ gnome-panel-2.20.0.new/intltool-update.in 2007-09-18 11:28:37.000000000 +0200 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.35.5"; ++my $VERSION = "0.36.2"; + my $PACKAGE = "intltool"; + + ## Loaded modules +@@ -71,7 +71,8 @@ + "sheet(?:\\.in)+|". # ? + "schemas(?:\\.in)+|". # GConf specific + "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. +-"kbd(?:\\.in)+"; # GOK specific. ++"kbd(?:\\.in)+|". # GOK specific. ++"policy(?:\\.in)+"; # PolicyKit files + + my $ini_support = + "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec +@@ -328,7 +329,12 @@ + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; + }, ".."; +- ++ find sub { ++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; ++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; ++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; ++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; ++ }, "$SRCDIR/.."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; +@@ -489,11 +495,15 @@ + my %in2; + foreach (@buf_potfiles_sorted) + { ++ s#^$SRCDIR/../##; ++ s#^$SRCDIR/##; + $in2{$_} = 1; + } + + foreach (@buf_potfiles_ignore_sorted) + { ++ s#^$SRCDIR/../##; ++ s#^$SRCDIR/##; + $in2{$_} = 1; + } + +@@ -501,9 +511,16 @@ + + foreach (@buf_allfiles_sorted) + { +- if (!exists($in2{$_})) ++ my $dummy = $_; ++ my $srcdir = $SRCDIR; ++ ++ $srcdir =~ s#^../##; ++ $dummy =~ s#^$srcdir/../##; ++ $dummy =~ s#^$srcdir/##; ++ $dummy =~ s#_build/##; ++ if (!exists($in2{$dummy})) + { +- push @result, $_ ++ push @result, $dummy + } + } + +@@ -563,11 +580,23 @@ + exit 1; + } + +-sub isIntltoolExtractInPath ++sub isProgramInPath + { + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status +- return 1 if ((-x $file) or (system("$file >/dev/null") == 0)); ++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); ++ return 0; ++} ++ ++sub isGNUGettextTool ++{ ++ my ($file) = @_; ++ # Check that we are using GNU gettext tools ++ if (isProgramInPath ($file)) ++ { ++ my $version = `$file --version`; ++ return 1 if ($version =~ m/.*\(GNU .*\).*/); ++ } + return 0; + } + +@@ -577,7 +606,7 @@ + + ## Generate the .h header files, so we can allow glade and + ## xml translation support +- if (! isIntltoolExtractInPath("$EXTRACT")) ++ if (! isProgramInPath ("$EXTRACT")) + { + print STDERR "\n *** The intltool-extract script wasn't found!" + ."\n *** Without it, intltool-update can not generate files.\n"; +@@ -624,13 +653,13 @@ + # + sub GeneratePOTemplate + { +- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; ++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; + my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; + chomp $XGETTEXT; + +- if (! -x $XGETTEXT) ++ if (! isGNUGettextTool ("$XGETTEXT")) + { +- print STDERR " *** xgettext is not found on this system!\n". ++ print STDERR " *** GNU xgettext is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } +@@ -726,7 +755,23 @@ + unlink "$MODULE.pot"; + my @xgettext_argument=("$XGETTEXT", + "--add-comments", +- "--directory\=\.", ++ "--directory\=.", ++ "--default-domain\=$MODULE", ++ "--flag\=g_strdup_printf:1:c-format", ++ "--flag\=g_string_printf:2:c-format", ++ "--flag\=g_string_append_printf:2:c-format", ++ "--flag\=g_error_new:3:c-format", ++ "--flag\=g_set_error:4:c-format", ++ "--flag\=g_markup_printf_escaped:1:c-format", ++ "--flag\=g_log:3:c-format", ++ "--flag\=g_print:1:c-format", ++ "--flag\=g_printerr:1:c-format", ++ "--flag\=g_printf:1:c-format", ++ "--flag\=g_fprintf:2:c-format", ++ "--flag\=g_sprintf:2:c-format", ++ "--flag\=g_snprintf:3:c-format", ++ "--flag\=g_scanner_error:2:c-format", ++ "--flag\=g_scanner_warn:2:c-format", + "--output\=$MODULE\.pot", + "--files-from\=\.\/POTFILES\.in\.temp"); + my $XGETTEXT_KEYWORDS = &FindPOTKeywords; +@@ -793,9 +838,16 @@ + { + -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; + +- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; ++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; + my ($lang, $outfile) = @_; + ++ if (! isGNUGettextTool ("$MSGMERGE")) ++ { ++ print STDERR " *** GNU msgmerge is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } ++ + print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; + + my $infile = "$SRCDIR/$lang.po"; +@@ -836,7 +888,14 @@ + sub Console_Write_TranslationStatus + { + my ($lang, $output_file) = @_; +- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; ++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; ++ ++ if (! isGNUGettextTool ("$MSGFMT")) ++ { ++ print STDERR " *** GNU msgfmt is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } + + $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); + +@@ -845,21 +904,28 @@ + + sub Console_Write_CoverageReport + { +- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; ++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; ++ ++ if (! isGNUGettextTool ("$MSGFMT")) ++ { ++ print STDERR " *** GNU msgfmt is not found on this system!\n". ++ " *** Without it, intltool-update can not extract strings.\n"; ++ exit; ++ } + + &GatherPOFiles; + + foreach my $lang (@languages) + { +- print "$lang: "; ++ print STDERR "$lang: "; + &POFile_Update ($lang, ""); + } + +- print "\n\n * Current translation support in $MODULE \n\n"; ++ print STDERR "\n\n * Current translation support in $MODULE \n\n"; + + foreach my $lang (@languages) + { +- print "$lang: "; ++ print STDERR "$lang: "; + system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); + } + } +@@ -933,13 +999,13 @@ + + $conf_in || die "Cannot find top_builddir in Makevars."; + } +- elsif (-f "../configure.ac") ++ elsif (-f "$SRCDIR/../configure.ac") + { +- $conf_in = "../configure.ac"; ++ $conf_in = "$SRCDIR/../configure.ac"; + } +- elsif (-f "../configure.in") ++ elsif (-f "$SRCDIR/../configure.in") + { +- $conf_in = "../configure.in"; ++ $conf_in = "$SRCDIR/../configure.in"; + } + else + { +diff -Nur gnome-panel-2.20.0/libpanel-applet/Makefile.in gnome-panel-2.20.0.new/libpanel-applet/Makefile.in +--- gnome-panel-2.20.0/libpanel-applet/Makefile.in 2007-09-17 21:33:42.000000000 +0200 ++++ gnome-panel-2.20.0.new/libpanel-applet/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,15 +17,11 @@ + + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -47,10 +43,7 @@ + $(srcdir)/libpanelapplet-2.0-uninstalled.pc.in \ + $(srcdir)/libpanelapplet-2.0.pc.in ChangeLog TODO + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -77,27 +70,34 @@ + panel-applet-gconf.lo panel-applet-shell.lo \ + panel-applet-marshal.lo panel-applet-enums.lo $(am__objects_1) + libpanel_applet_2_la_OBJECTS = $(am_libpanel_applet_2_la_OBJECTS) ++libpanel_applet_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpanel_applet_2_la_LDFLAGS) $(LDFLAGS) -o $@ + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) + panel_test_applets_SOURCES = panel-test-applets.c + panel_test_applets_OBJECTS = panel-test-applets.$(OBJEXT) + panel_test_applets_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + libpanel-applet-2.la ++panel_test_applets_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(panel_test_applets_LDFLAGS) $(LDFLAGS) -o $@ + test_bonobo_applet_SOURCES = test-bonobo-applet.c + test_bonobo_applet_OBJECTS = test-bonobo-applet.$(OBJEXT) + test_bonobo_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + libpanel-applet-2.la +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c \ + test-bonobo-applet.c + DIST_SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c \ +@@ -113,8 +113,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -131,8 +129,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -154,20 +150,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -175,14 +163,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -193,14 +176,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -212,7 +193,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -225,14 +205,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -255,6 +232,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -262,8 +240,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -271,13 +247,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -289,6 +265,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -316,8 +293,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + INCLUDES = \ + -I$(top_builddir)/libpanel-applet \ + -DPANEL_APPLET_DATADIR=\""$(datadir)"\" \ +@@ -435,7 +415,7 @@ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -446,7 +426,7 @@ + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +@@ -461,10 +441,10 @@ + rm -f "$${dir}/so_locations"; \ + done + libpanel-applet-2.la: $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libpanel_applet_2_la_LDFLAGS) $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_LIBADD) $(LIBS) ++ $(libpanel_applet_2_la_LINK) -rpath $(libdir) $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ +@@ -499,10 +479,10 @@ + done + panel-test-applets$(EXEEXT): $(panel_test_applets_OBJECTS) $(panel_test_applets_DEPENDENCIES) + @rm -f panel-test-applets$(EXEEXT) +- $(LINK) $(panel_test_applets_LDFLAGS) $(panel_test_applets_OBJECTS) $(panel_test_applets_LDADD) $(LIBS) ++ $(panel_test_applets_LINK) $(panel_test_applets_OBJECTS) $(panel_test_applets_LDADD) $(LIBS) + test-bonobo-applet$(EXEEXT): $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_DEPENDENCIES) + @rm -f test-bonobo-applet$(EXEEXT) +- $(LINK) $(test_bonobo_applet_LDFLAGS) $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_LDADD) $(LIBS) ++ $(LINK) $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -522,22 +502,22 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bonobo-applet.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -547,13 +527,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-gladeDATA: $(glade_DATA) + @$(NORMAL_INSTALL) +- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)" ++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" + @list='$(glade_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -570,7 +546,7 @@ + done + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -587,7 +563,7 @@ + done + install-libpanel_appletincludeHEADERS: $(libpanel_appletinclude_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(libpanel_appletincludedir)" || $(mkdir_p) "$(DESTDIR)$(libpanel_appletincludedir)" ++ test -z "$(libpanel_appletincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libpanel_appletincludedir)" + @list='$(libpanel_appletinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -652,22 +628,21 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -689,7 +664,7 @@ + + installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libpanel_appletincludedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -727,7 +702,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -742,12 +717,20 @@ + install-data-am: install-gladeDATA \ + install-libpanel_appletincludeHEADERS install-pkgconfigDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -769,25 +752,29 @@ + ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \ +- uninstall-info-am uninstall-libLTLIBRARIES \ ++ uninstall-libLTLIBRARIES \ + uninstall-libpanel_appletincludeHEADERS \ + uninstall-pkgconfigDATA + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstPROGRAMS ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ +- install-data-am install-exec install-exec-am install-gladeDATA \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-gladeDATA install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ +- install-libpanel_appletincludeHEADERS install-man \ +- install-pkgconfigDATA install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-gladeDATA uninstall-info-am uninstall-libLTLIBRARIES \ ++ install-libpanel_appletincludeHEADERS install-man install-pdf \ ++ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-gladeDATA \ ++ uninstall-libLTLIBRARIES \ + uninstall-libpanel_appletincludeHEADERS \ + uninstall-pkgconfigDATA + +diff -Nur gnome-panel-2.20.0/m4/intltool.m4 gnome-panel-2.20.0.new/m4/intltool.m4 +--- gnome-panel-2.20.0/m4/intltool.m4 2007-09-17 21:33:02.000000000 +0200 ++++ gnome-panel-2.20.0.new/m4/intltool.m4 2007-09-18 11:28:37.000000000 +0200 +@@ -23,7 +23,7 @@ + ## the same distribution terms that you use for the rest of that program. + + dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +-# serial 35 IT_PROG_INTLTOOL ++# serial 36 IT_PROG_INTLTOOL + AC_DEFUN([IT_PROG_INTLTOOL], + [AC_PREREQ([2.50])dnl + +@@ -36,7 +36,7 @@ + esac + + if test -n "$1"; then +- AC_MSG_CHECKING(for intltool >= $1) ++ AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +@@ -65,6 +65,7 @@ + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + + AC_SUBST(INTLTOOL_DESKTOP_RULE) + AC_SUBST(INTLTOOL_DIRECTORY_RULE) +@@ -84,6 +85,7 @@ + AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) + AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) + + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +@@ -106,19 +108,16 @@ + fi + fi + +-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) +-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) +-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) +-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) +- + # Substitute ALL_LINGUAS so we can use it in po/Makefile + AC_SUBST(ALL_LINGUAS) + + # Set DATADIRNAME correctly if it is not set yet + # (copied from glib-gettext.m4) + if test -z "$DATADIRNAME"; then +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) +@@ -159,10 +158,6 @@ + for file in intltool-extract intltool-merge intltool-update; do + sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ + -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ +- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ +- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ +- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ + -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ + < ${ac_aux_dir}/${file}.in > ${file}.out + if cmp -s ${file} ${file}.out 2>/dev/null; then +@@ -177,9 +172,7 @@ + ], + [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' + prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) ++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) + + ]) + +diff -Nur gnome-panel-2.20.0/Makefile.in gnome-panel-2.20.0.new/Makefile.in +--- gnome-panel-2.20.0/Makefile.in 2007-09-17 21:33:43.000000000 +0200 ++++ gnome-panel-2.20.0.new/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -35,21 +31,18 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ ++subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \ + INSTALL NEWS compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing mkinstalldirs +-subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = +@@ -57,10 +50,13 @@ + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -77,8 +73,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -95,8 +89,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -118,20 +110,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -139,14 +123,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -157,14 +136,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -176,7 +153,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -189,14 +165,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -219,6 +192,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -226,8 +200,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -235,13 +207,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -253,6 +225,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -280,8 +253,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out' | grep -v 'legal.xml' + SUBDIRS = \ + po \ +@@ -352,7 +328,7 @@ + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +@@ -374,7 +350,6 @@ + + distclean-libtool: + -rm -f libtool +-uninstall-info-am: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -407,8 +382,7 @@ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -510,24 +484,22 @@ + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkdir_p) $(distdir)/gnome-panel $(distdir)/libpanel-applet $(distdir)/m4 $(distdir)/po +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -541,7 +513,7 @@ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -549,6 +521,8 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -556,7 +530,7 @@ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +@@ -631,7 +605,7 @@ + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ +@@ -693,12 +667,20 @@ + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -719,24 +701,26 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ +- dist-shar dist-tarZ dist-zip distcheck distclean \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ +- distclean-recursive distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am ++ distclean-tags distcleancheck distdir distuninstallcheck dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + + # +diff -Nur gnome-panel-2.20.0/man/Makefile.in gnome-panel-2.20.0.new/man/Makefile.in +--- gnome-panel-2.20.0/man/Makefile.in 2007-09-17 21:33:43.000000000 +0200 ++++ gnome-panel-2.20.0.new/man/Makefile.in 2007-09-18 11:28:34.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,15 +13,11 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -38,10 +34,7 @@ + subdir = man + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ +- $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -57,8 +50,6 @@ + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_LINGUAS = @ALL_LINGUAS@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -75,8 +66,6 @@ + CFLAGS = @CFLAGS@ + CLOCK_CFLAGS = @CLOCK_CFLAGS@ + CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@ +-CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@ +-CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@ + CLOCK_LIBS = @CLOCK_LIBS@ + CLOCK_TIME_UTILITY = @CLOCK_TIME_UTILITY@ + CPP = @CPP@ +@@ -98,20 +87,12 @@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@ +-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FISH_CFLAGS = @FISH_CFLAGS@ +-FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@ +-FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@ + FISH_LIBS = @FISH_LIBS@ + GCONFTOOL = @GCONFTOOL@ +-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ +-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +@@ -119,14 +100,9 @@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GREP = @GREP@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@ +-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@ +-HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@ +-HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -137,14 +113,12 @@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ + INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ + INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +-INTLTOOL_ICONV = @INTLTOOL_ICONV@ + INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ + INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ + INTLTOOL_MERGE = @INTLTOOL_MERGE@ +-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ +-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ + INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ + INTLTOOL_PERL = @INTLTOOL_PERL@ ++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ + INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ + INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ + INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +@@ -156,7 +130,6 @@ + INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ + INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ + INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ + LDFLAGS = @LDFLAGS@ +@@ -169,14 +142,11 @@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@ +-NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -199,6 +169,7 @@ + RANLIB = @RANLIB@ + REBUILD = @REBUILD@ + SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +@@ -206,8 +177,6 @@ + VERSION = @VERSION@ + WARN_CFLAGS = @WARN_CFLAGS@ + WNCKLET_CFLAGS = @WNCKLET_CFLAGS@ +-WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@ +-WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@ + WNCKLET_LIBS = @WNCKLET_LIBS@ + XGETTEXT = @XGETTEXT@ + XMKMF = @XMKMF@ +@@ -215,13 +184,13 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -233,6 +202,7 @@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -260,8 +230,11 @@ + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + man_MANS = \ + gnome-panel.1 + +@@ -304,13 +277,9 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -361,22 +330,21 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -392,7 +360,7 @@ + all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -424,7 +392,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -438,12 +406,20 @@ + + install-data-am: install-man + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -462,20 +438,23 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-man ++uninstall-am: uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-man \ +- uninstall-man1 ++ uninstall uninstall-am uninstall-man uninstall-man1 + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -Nur gnome-panel-2.20.0/po/Makefile.in.in gnome-panel-2.20.0.new/po/Makefile.in.in +--- gnome-panel-2.20.0/po/Makefile.in.in 2007-09-17 21:33:02.000000000 +0200 ++++ gnome-panel-2.20.0.new/po/Makefile.in.in 2007-09-18 11:28:37.000000000 +0200 +@@ -133,7 +133,7 @@ + dvi info tags TAGS ID: + + # Define this as empty until I found a useful application. +-installcheck: ++install-exec installcheck: + + uninstall: + linguas="$(USE_LINGUAS)"; \ --- gnome-panel-2.20.0.1.orig/debian/patches/09_lpi.patch +++ gnome-panel-2.20.0.1/debian/patches/09_lpi.patch @@ -0,0 +1,153 @@ +diff -Nur gnome-panel-2.20.0.1/applets/notification_area/GNOME_NotificationAreaApplet.xml gnome-panel-2.20.0.1.new/applets/notification_area/GNOME_NotificationAreaApplet.xml +--- gnome-panel-2.20.0.1/applets/notification_area/GNOME_NotificationAreaApplet.xml 2007-09-18 15:56:53.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/notification_area/GNOME_NotificationAreaApplet.xml 2007-09-21 17:28:47.000000000 +0200 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.20.0.1/applets/notification_area/main.c gnome-panel-2.20.0.1.new/applets/notification_area/main.c +--- gnome-panel-2.20.0.1/applets/notification_area/main.c 2007-09-18 15:56:53.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/notification_area/main.c 2007-09-21 17:28:47.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "na-tray-manager.h" + #include "na-tray.h" +@@ -202,6 +203,7 @@ + NaTray *tray; + AppletData *data; + AtkObject *atko; ++ BonoboUIComponent* popup_component; + + if (!(strcmp (iid, "OAFIID:GNOME_NotificationAreaApplet") == 0 || + strcmp (iid, "OAFIID:GNOME_SystemTrayApplet") == 0)) +@@ -248,7 +250,11 @@ + NULL, + menu_verbs, + data); +- ++ ++ popup_component = panel_applet_get_popup_component (applet); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ + return TRUE; + } + +diff -Nur gnome-panel-2.20.0.1/applets/wncklet/GNOME_ShowDesktopApplet.xml gnome-panel-2.20.0.1.new/applets/wncklet/GNOME_ShowDesktopApplet.xml +--- gnome-panel-2.20.0.1/applets/wncklet/GNOME_ShowDesktopApplet.xml 2007-09-18 15:56:52.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/wncklet/GNOME_ShowDesktopApplet.xml 2007-09-21 17:28:47.000000000 +0200 +@@ -3,6 +3,9 @@ + + ++ ++ ++ + + +diff -Nur gnome-panel-2.20.0.1/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml gnome-panel-2.20.0.1.new/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml +--- gnome-panel-2.20.0.1/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2007-09-18 15:56:52.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml 2007-09-21 17:28:47.000000000 +0200 +@@ -5,6 +5,9 @@ + pixtype="stock" pixname="gtk-properties"/> + ++ ++ ++ + + +diff -Nur gnome-panel-2.20.0.1/applets/wncklet/showdesktop.c gnome-panel-2.20.0.1.new/applets/wncklet/showdesktop.c +--- gnome-panel-2.20.0.1/applets/wncklet/showdesktop.c 2007-09-18 15:56:52.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/wncklet/showdesktop.c 2007-09-21 17:28:47.000000000 +0200 +@@ -43,6 +43,7 @@ + #include + + #define TIMEOUT_ACTIVATE 1000 ++#include + + + typedef struct { +@@ -412,6 +413,7 @@ + { + ShowDesktopData *sdd; + AtkObject *atk_obj; ++ BonoboUIComponent* popup_component; + + panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); + +@@ -501,6 +503,10 @@ + G_CALLBACK (button_drag_leave), + sdd); + ++ popup_component = panel_applet_get_popup_component (sdd->applet); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ + gtk_widget_show_all (sdd->applet); + + return TRUE; +diff -Nur gnome-panel-2.20.0.1/applets/wncklet/workspace-switcher.c gnome-panel-2.20.0.1.new/applets/wncklet/workspace-switcher.c +--- gnome-panel-2.20.0.1/applets/wncklet/workspace-switcher.c 2007-09-18 15:56:52.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/applets/wncklet/workspace-switcher.c 2007-09-21 17:28:47.000000000 +0200 +@@ -38,6 +38,7 @@ + #define NEVER_SENSITIVE "never_sensitive" + #define NUM_WORKSPACES "/apps/metacity/general/num_workspaces" + #define WORKSPACE_NAME "/apps/metacity/workspace_names/name_1" ++#include + + typedef enum { + PAGER_WM_METACITY, +@@ -470,6 +471,7 @@ + PagerData *pager; + GError *error; + gboolean display_names; ++ BonoboUIComponent* popup_component; + + panel_applet_add_preferences (applet, "/schemas/apps/workspace_switcher_applet/prefs", NULL); + +@@ -586,6 +588,11 @@ + NULL); + } + ++ popup_component = panel_applet_get_popup_component (PANEL_APPLET (pager->applet)); ++ ++ launchpad_integration_add_bonobo_ui(popup_component, "/popups/button3/LaunchpadItems"); ++ ++ + return TRUE; + } + +diff -Nur gnome-panel-2.20.0.1/configure.in gnome-panel-2.20.0.1.new/configure.in +--- gnome-panel-2.20.0.1/configure.in 2007-09-18 15:58:02.000000000 +0200 ++++ gnome-panel-2.20.0.1.new/configure.in 2007-09-21 17:28:47.000000000 +0200 +@@ -68,7 +68,7 @@ + + dnl pkg-config dependency checks + +-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) ++PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED lpint-bonobo launchpad-integration gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) + AC_SUBST(PANEL_CFLAGS) + AC_SUBST(PANEL_LIBS) + +@@ -76,7 +76,7 @@ + AC_SUBST(LIBPANEL_APPLET_CFLAGS) + AC_SUBST(LIBPANEL_APPLET_LIBS) + +-PKG_CHECK_MODULES(WNCKLET, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) ++PKG_CHECK_MODULES(WNCKLET, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED lpint-bonobo launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) + AC_SUBST(WNCKLET_CFLAGS) + AC_SUBST(WNCKLET_LIBS) + --- gnome-panel-2.20.0.1.orig/debian/patches/08_clock_applet_event.patch +++ gnome-panel-2.20.0.1/debian/patches/08_clock_applet_event.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-panel-2.19.3/applets/clock/calendar-client.c gnome-panel-2.19.3.new/applets/clock/calendar-client.c +--- gnome-panel-2.19.3/applets/clock/calendar-client.c 2007-06-03 18:05:28.000000000 -0300 ++++ gnome-panel-2.19.3.new/applets/clock/calendar-client.c 2007-06-04 12:32:48.000000000 -0300 +@@ -1963,6 +1963,8 @@ + { + GTime day_time = appointment->start_time + day_offset * 86400; + ++ if (duration == day_offset * 86400) ++ continue; + if (day_time > month_end) + break; + if (day_time >= month_begin) --- gnome-panel-2.20.0.1.orig/debian/patches/05_missing_includes.patch +++ gnome-panel-2.20.0.1/debian/patches/05_missing_includes.patch @@ -0,0 +1,21 @@ +diff -urN gnome-panel-2.10.1.orig/applets/clock/clock.c gnome-panel-2.10.1/applets/clock/clock.c +--- gnome-panel-2.10.1.orig/applets/clock/clock.c 2005-03-07 07:15:15.000000000 -0700 ++++ gnome-panel-2.10.1/applets/clock/clock.c 2005-06-17 13:44:44.149885607 -0600 +@@ -41,6 +41,7 @@ + + #include "config.h" + ++#include + #include + #include + #include +diff -urN gnome-panel-2.10.1.orig/gnome-panel/panel.c gnome-panel-2.10.1/gnome-panel/panel.c +--- gnome-panel-2.10.1.orig/gnome-panel/panel.c 2005-03-31 13:05:04.000000000 -0700 ++++ gnome-panel-2.10.1/gnome-panel/panel.c 2005-06-17 13:43:21.107894436 -0600 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "panel.h" --- gnome-panel-2.20.0.1.orig/debian/patches/99_about-ubuntu-translation.patch +++ gnome-panel-2.20.0.1/debian/patches/99_about-ubuntu-translation.patch @@ -0,0 +1,8 @@ +diff -Nur gnome-panel-2.14.0/po/POTFILES.in gnome-panel-2.14.0.new/po/POTFILES.in +--- gnome-panel-2.14.0/po/POTFILES.in 2006-01-16 18:42:56.000000000 +0100 ++++ gnome-panel-2.14.0.new/po/POTFILES.in 2006-03-14 12:44:27.000000000 +0100 +@@ -73,3 +73,4 @@ + libpanel-applet/panel-applet.c + libpanel-applet/panel-test-applets.c + libpanel-applet/panel-test-applets.glade ++debian/ubuntu-about.desktop.in --- gnome-panel-2.20.0.1.orig/debian/patches/09_default_icons.patch +++ gnome-panel-2.20.0.1/debian/patches/09_default_icons.patch @@ -0,0 +1,24 @@ +diff -Nur gnome-panel-2.11.1.orig/gnome-panel/menu.c gnome-panel-2.11.1/gnome-panel/menu.c +--- gnome-panel-2.11.1.orig/gnome-panel/menu.c 2005-04-27 11:56:04.000000000 +0200 ++++ gnome-panel-2.11.1/gnome-panel/menu.c 2005-05-19 19:59:02.220319600 +0200 +@@ -1360,7 +1360,7 @@ + NULL, + alias_directory ? gmenu_tree_directory_get_icon (alias_directory) : + gmenu_tree_entry_get_icon (entry), +- NULL); ++ PANEL_STOCK_DEFAULT_ICON); + + setup_menuitem (menuitem, + panel_menu_icon_get_size (), +diff -Nur gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h +--- gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h 2005-02-02 08:49:08.000000000 +0100 ++++ gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h 2005-05-19 19:56:16.416525608 +0200 +@@ -43,6 +43,8 @@ + #define PANEL_STOCK_EXECUTE "panel-execute" + #define PANEL_STOCK_CLEAR "panel-clear" + #define PANEL_STOCK_DONT_DELETE "panel-dont-delete" ++/* FIXME: put a more representative icon here */ ++#define PANEL_STOCK_DEFAULT_ICON "application-default-icon" + + void panel_init_stock_icons_and_items (void); + GtkIconSize panel_menu_icon_get_size (void); --- gnome-panel-2.20.0.1.orig/debian/patches/01_layout.patch +++ gnome-panel-2.20.0.1/debian/patches/01_layout.patch @@ -0,0 +1,1164 @@ +diff -Nur gnome-panel-2.19.5/gnome-panel/panel-menu-items.c gnome-panel-2.19.5.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.19.5/gnome-panel/panel-menu-items.c 2007-07-08 22:25:49.000000000 +0200 ++++ gnome-panel-2.19.5.new/gnome-panel/panel-menu-items.c 2007-07-09 18:43:05.000000000 +0200 +@@ -566,6 +566,7 @@ + GtkWidget *places_menu; + GtkWidget *item; + char *gconf_name; ++ char *path; + char *uri; + + places_menu = panel_create_menu (); +@@ -587,6 +588,16 @@ + if (gconf_name) + g_free (gconf_name); + ++ path = g_build_filename (g_get_home_dir (), "Documents", NULL); ++ if (g_file_test (path, G_FILE_TEST_IS_DIR)) ++ panel_menu_items_append_place_item ("gnome-fs-directory", ++ _("Documents"), ++ _("Documents directory"), ++ places_menu, ++ G_CALLBACK (activate_uri), ++ "Documents"); ++ g_free (path); ++ + if (!gconf_client_get_bool (panel_gconf_get_client (), + DESKTOP_IS_HOME_DIR_KEY, + NULL)) { +@@ -717,9 +728,25 @@ + if (add_separator) + add_menu_separator (menu); + +- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); ++ panel_menu_items_append_from_desktop (menu, "yelp.desktop", _("Help and Support")); ++ ++ if (g_file_test (DATADIR"/applications/apport-gtk.desktop", ++ G_FILE_TEST_IS_REGULAR)) { ++ panel_menu_items_append_from_desktop (menu, "apport-gtk.desktop", NULL); ++ ++ add_menu_separator (menu); ++ } ++ + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); + ++ if (g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "ubuntu-about.desktop", NULL); ++ ++ if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "edubuntu-about.desktop", NULL); ++ + if (parent->priv->append_lock_logout) + panel_menu_items_append_lock_logout (menu); + } +diff -Nur gnome-panel-2.19.5/gnome-panel/panel-menu-items.c~ gnome-panel-2.19.5.new/gnome-panel/panel-menu-items.c~ +--- gnome-panel-2.19.5/gnome-panel/panel-menu-items.c~ 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.5.new/gnome-panel/panel-menu-items.c~ 2007-07-09 18:42:30.000000000 +0200 +@@ -0,0 +1,1105 @@ ++/* ++ * Copyright (C) 2005 Vincent Untz ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ * Authors: ++ * Vincent Untz ++ * ++ * Based on code from panel-menu-bar.c ++ */ ++ ++/* ++ * TODO: ++ * + drag and drop loses icon for URIs ++ * + drag and drop of bookmarks/network places/removable media should create ++ * a menu button ++ * + if a menu is open and gets updated, it should reappear and not just ++ * disappear ++ */ ++ ++#include ++ ++#include "panel-menu-items.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include "menu.h" ++#include "panel-action-button.h" ++#include "panel-globals.h" ++#include "panel-icon-names.h" ++#include "panel-lockdown.h" ++#include "panel-recent.h" ++#include "panel-stock-icons.h" ++#include "panel-util.h" ++ ++#define BOOKMARKS_FILENAME ".gtk-bookmarks" ++#define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences" ++#define DESKTOP_IS_HOME_DIR_KEY "/apps/nautilus/preferences/desktop_is_home_dir" ++#define NAMES_DIR "/apps/nautilus/desktop" ++#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name" ++#define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name" ++#define MAX_ITEMS_OR_SUBMENU 5 ++ ++G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM); ++G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM); ++ ++#define PANEL_PLACE_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_PLACE_MENU_ITEM, PanelPlaceMenuItemPrivate)) ++#define PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_DESKTOP_MENU_ITEM, PanelDesktopMenuItemPrivate)) ++ ++struct _PanelPlaceMenuItemPrivate { ++ GtkWidget *menu; ++ PanelWidget *panel; ++ ++ GtkRecentManager *recent_manager; ++ ++ GnomeVFSMonitorHandle *bookmarks_monitor; ++ ++ gulong volume_mounted_id; ++ gulong volume_unmounted_id; ++ ++ guint use_image : 1; ++}; ++ ++struct _PanelDesktopMenuItemPrivate { ++ GtkWidget *menu; ++ PanelWidget *panel; ++ ++ guint use_image : 1; ++ guint append_lock_logout : 1; ++}; ++ ++static GnomeVFSVolumeMonitor *volume_monitor = NULL; ++ ++static void ++activate_uri (GtkWidget *menuitem, ++ const char *path) ++{ ++ GError *error = NULL; ++ GdkScreen *screen; ++ char *url; ++ char *escaped; ++ ++ screen = menuitem_to_screen (menuitem); ++ ++ url = gnome_vfs_make_uri_from_input_with_dirs (path, ++ GNOME_VFS_MAKE_URI_DIR_HOMEDIR); ++ if (g_str_has_prefix (url, "x-nautilus-search:")) { ++ //FIXME: this is ugly... ++ char *command; ++ ++ command = g_strdup_printf ("nautilus --no-desktop %s", url); ++ gdk_spawn_command_line_on_screen (screen, command, &error); ++ } else ++ gnome_url_show_on_screen (url, screen, &error); ++ ++ if (error != NULL) { ++ if (error->code != GNOME_URL_ERROR_CANCELLED) { ++ char *primary; ++ escaped = g_markup_escape_text (url, -1); ++ primary = g_strdup_printf (_("Could not open location '%s'"), ++ escaped); ++ g_free (escaped); ++ panel_error_dialog (NULL, screen, ++ "cannot_show_url", TRUE, ++ primary, error->message); ++ g_free (primary); ++ } ++ g_error_free (error); ++ } ++ g_free (url); ++} ++ ++static void ++activate_home_uri (GtkWidget *menuitem, ++ gpointer data) ++{ ++ activate_uri (menuitem, g_get_home_dir ()); ++} ++ ++static void ++activate_desktop_uri (GtkWidget *menuitem, ++ gpointer data) ++{ ++ activate_uri (menuitem, ++ g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); ++} ++ ++static void ++panel_menu_items_append_from_desktop (GtkWidget *menu, ++ char *path, ++ char *force_name) ++{ ++ GKeyFile *key_file; ++ gboolean loaded; ++ GtkWidget *item; ++ char *path_freeme; ++ char *full_path; ++ char *uri; ++ char *icon; ++ char *name; ++ char *comment; ++ ++ path_freeme = NULL; ++ ++ key_file = g_key_file_new (); ++ ++ if (g_path_is_absolute (path)) { ++ loaded = g_key_file_load_from_file (key_file, path, ++ G_KEY_FILE_NONE, NULL); ++ full_path = path; ++ } else { ++ char *lookup_file; ++ char *desktop_path; ++ ++ if (!g_str_has_suffix (path, ".desktop")) { ++ desktop_path = g_strconcat (path, ".desktop", NULL); ++ } else { ++ desktop_path = path; ++ } ++ ++ lookup_file = g_strconcat ("applications", G_DIR_SEPARATOR_S, ++ desktop_path, NULL); ++ loaded = g_key_file_load_from_data_dirs (key_file, lookup_file, ++ &path_freeme, ++ G_KEY_FILE_NONE, ++ NULL); ++ full_path = path_freeme; ++ g_free (lookup_file); ++ ++ if (desktop_path != path) ++ g_free (desktop_path); ++ } ++ ++ if (!loaded) { ++ g_key_file_free (key_file); ++ if (path_freeme) ++ g_free (path_freeme); ++ return; ++ } ++ ++ icon = panel_util_key_file_get_locale_string (key_file, "Icon"); ++ comment = panel_util_key_file_get_locale_string (key_file, "Comment"); ++ ++ if (string_empty (force_name)) ++ name = panel_util_key_file_get_locale_string (key_file, "Name"); ++ else ++ name = g_strdup (force_name); ++ ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, panel_menu_icon_get_size (), ++ icon, NULL, name); ++ ++ panel_util_set_tooltip_text (item, comment); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ g_signal_connect_data (item, "activate", ++ G_CALLBACK (panel_menu_item_activate_desktop_file), ++ g_strdup (full_path), ++ (GClosureNotify) g_free, 0); ++ g_signal_connect (G_OBJECT (item), "button_press_event", ++ G_CALLBACK (menu_dummy_button_press_event), NULL); ++ ++ uri = gnome_vfs_get_uri_from_local_path (full_path); ++ setup_uri_drag (item, uri, icon); ++ g_free (uri); ++ ++ g_key_file_free (key_file); ++ ++ if (icon) ++ g_free (icon); ++ ++ if (name) ++ g_free (name); ++ ++ if (comment) ++ g_free (comment); ++ ++ if (path_freeme) ++ g_free (path_freeme); ++} ++ ++static void ++panel_menu_items_append_place_item (const char *icon_name, ++ const char *title, ++ const char *tooltip, ++ GtkWidget *menu, ++ GCallback callback, ++ const char *uri) ++{ ++ GtkWidget *item; ++ char *user_data; ++ ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, ++ panel_menu_icon_get_size (), ++ icon_name, ++ NULL, ++ title); ++ ++ panel_util_set_tooltip_text (item, tooltip); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ ++ user_data = g_strdup (uri); ++ g_signal_connect_data (item, "activate", callback, user_data, ++ (GClosureNotify) g_free, 0); ++ ++ g_signal_connect (G_OBJECT (item), "button_press_event", ++ G_CALLBACK (menu_dummy_button_press_event), NULL); ++ ++ setup_uri_drag (item, uri, icon_name); ++} ++ ++static GtkWidget * ++panel_menu_items_create_action_item_full (PanelActionButtonType action_type, ++ const char *label, ++ const char *tooltip) ++{ ++ GtkWidget *item; ++ ++ if (panel_action_get_is_disabled (action_type)) ++ return NULL; ++ ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, ++ panel_menu_icon_get_size (), ++ panel_action_get_icon_name (action_type), ++ NULL, ++ label ? label : panel_action_get_text (action_type)); ++ ++ panel_util_set_tooltip_text (item, ++ tooltip ? ++ tooltip : ++ panel_action_get_tooltip (action_type)); ++ ++ g_signal_connect (item, "activate", ++ panel_action_get_invoke (action_type), NULL); ++ g_signal_connect (G_OBJECT (item), "button_press_event", ++ G_CALLBACK (menu_dummy_button_press_event), NULL); ++ setup_internal_applet_drag (item, action_type); ++ ++ return item; ++} ++ ++static GtkWidget * ++panel_menu_items_create_action_item (PanelActionButtonType action_type) ++{ ++ return panel_menu_items_create_action_item_full (action_type, ++ NULL, NULL); ++} ++ ++static void ++panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu) ++{ ++ typedef struct { ++ char *full_uri; ++ char *label; ++ } PanelBookmark; ++ ++ GtkWidget *add_menu; ++ char *filename; ++ char *contents; ++ gchar **lines; ++ GHashTable *table; ++ int i; ++ GSList *add_bookmarks, *l; ++ PanelBookmark *bookmark; ++ ++ filename = g_build_filename (g_get_home_dir (), ++ BOOKMARKS_FILENAME, NULL); ++ ++ if (!g_file_get_contents (filename, &contents, NULL, NULL)) { ++ g_free (filename); ++ return; ++ } ++ ++ g_free (filename); ++ ++ lines = g_strsplit (contents, "\n", -1); ++ g_free (contents); ++ ++ table = g_hash_table_new (g_str_hash, g_str_equal); ++ add_bookmarks = NULL; ++ ++ for (i = 0; lines[i]; i++) { ++ if (lines[i][0] && !g_hash_table_lookup (table, lines[i])) { ++ GnomeVFSURI *uri; ++ char *space; ++ char *label; ++ gboolean keep; ++ ++ g_hash_table_insert (table, lines[i], lines[i]); ++ ++ space = strchr (lines[i], ' '); ++ if (space) { ++ *space = '\0'; ++ label = g_strdup (space + 1); ++ } else { ++ label = NULL; ++ } ++ ++ keep = FALSE; ++ uri = NULL; ++ ++ if (g_str_has_prefix (lines[i], "x-nautilus-search:") || ++ g_str_has_prefix (lines[i], "trash:")) ++ keep = TRUE; ++ ++ if (!keep) { ++ uri = gnome_vfs_uri_new (lines[i]); ++ if (uri) { ++ const char *scheme; ++ ++ scheme = gnome_vfs_uri_get_scheme (uri); ++ keep = strcmp (scheme, "file") != 0 || ++ gnome_vfs_uri_exists (uri); ++ gnome_vfs_uri_unref (uri); ++ } ++ } ++ ++ if (!keep) { ++ if (label) ++ g_free (label); ++ continue; ++ } ++ ++ bookmark = g_malloc (sizeof (PanelBookmark)); ++ bookmark->full_uri = g_strdup (lines[i]); ++ bookmark->label = label; ++ add_bookmarks = g_slist_prepend (add_bookmarks, bookmark); ++ } ++ } ++ ++ g_hash_table_destroy (table); ++ g_strfreev (lines); ++ ++ add_bookmarks = g_slist_reverse (add_bookmarks); ++ ++ if (g_slist_length (add_bookmarks) <= MAX_ITEMS_OR_SUBMENU) { ++ add_menu = menu; ++ } else { ++ GtkWidget *item; ++ ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, panel_menu_icon_get_size (), ++ PANEL_ICON_BOOKMARKS, NULL, ++ _("Bookmarks")); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ gtk_widget_show (item); ++ ++ add_menu = create_empty_menu (); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), add_menu); ++ } ++ ++ for (l = add_bookmarks; l; l = l->next) { ++ char *display_uri; ++ char *tooltip; ++ char *label; ++ char *icon; ++ ++ bookmark = l->data; ++ ++ display_uri = gnome_vfs_format_uri_for_display (bookmark->full_uri); ++ /* Translators: %s is a URI */ ++ tooltip = g_strdup_printf (_("Open '%s'"), display_uri); ++ g_free (display_uri); ++ ++ label = NULL; ++ if (bookmark->label) { ++ label = g_strdup (g_strstrip (bookmark->label)); ++ if (!label [0]) { ++ g_free (label); ++ label = NULL; ++ } ++ } ++ ++ if (!label) { ++ label = panel_util_get_label_for_uri (bookmark->full_uri); ++ ++ if (!label) { ++ g_free (tooltip); ++ g_free (bookmark->full_uri); ++ if (bookmark->label) ++ g_free (bookmark->label); ++ g_free (bookmark); ++ continue; ++ } ++ } ++ ++ icon = panel_util_get_icon_for_uri (bookmark->full_uri); ++ if (!icon) ++ icon = g_strdup (PANEL_ICON_FOLDER); ++ ++ //FIXME: drag and drop will be broken for x-nautilus-search uris ++ panel_menu_items_append_place_item (icon, ++ label, ++ tooltip, ++ add_menu, ++ G_CALLBACK (activate_uri), ++ bookmark->full_uri); ++ ++ g_free (icon); ++ g_free (tooltip); ++ g_free (label); ++ g_free (bookmark->full_uri); ++ if (bookmark->label) ++ g_free (bookmark->label); ++ g_free (bookmark); ++ } ++ ++ g_slist_free (add_bookmarks); ++} ++ ++static void ++panel_place_menu_item_append_volumes (GtkWidget *menu, ++ gboolean connected_volumes) ++{ ++ GtkWidget *add_menu; ++ GList *volumes, *l; ++ GSList *add_volumes, *sl; ++ ++ volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor); ++ add_volumes = NULL; ++ ++ for (l = volumes; l; l = l->next) { ++ GnomeVFSVolume *volume = l->data; ++ ++ if (!gnome_vfs_volume_is_user_visible (volume) || ++ !gnome_vfs_volume_is_mounted (volume)) ++ continue; ++ ++ switch (gnome_vfs_volume_get_volume_type (volume)) { ++ case GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER: ++ if (connected_volumes) ++ add_volumes = g_slist_prepend (add_volumes, ++ volume); ++ break; ++ default: ++ if (!connected_volumes) ++ add_volumes = g_slist_prepend (add_volumes, ++ volume); ++ break; ++ } ++ } ++ ++ add_volumes = g_slist_sort (add_volumes, ++ (GCompareFunc) gnome_vfs_volume_compare); ++ ++ if (g_slist_length (add_volumes) <= MAX_ITEMS_OR_SUBMENU) { ++ add_menu = menu; ++ } else { ++ GtkWidget *item; ++ const char *title; ++ const char *icon; ++ ++ if (connected_volumes) { ++ title = _("Network Places"); ++ icon = PANEL_ICON_NETWORK_SERVER; ++ } else { ++ title = _("Removable Media"); ++ icon = PANEL_ICON_REMOVABLE_MEDIA; ++ } ++ ++ item = gtk_image_menu_item_new (); ++ setup_menu_item_with_icon (item, panel_menu_icon_get_size (), ++ icon, NULL, title); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ gtk_widget_show (item); ++ ++ add_menu = create_empty_menu (); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), add_menu); ++ } ++ ++ for (sl = add_volumes; sl; sl = sl->next) { ++ GnomeVFSVolume *volume = sl->data; ++ char *icon; ++ char *display_name; ++ char *activation_uri; ++ ++ icon = gnome_vfs_volume_get_icon (volume); ++ display_name = gnome_vfs_volume_get_display_name (volume); ++ activation_uri = gnome_vfs_volume_get_activation_uri (volume); ++ ++ panel_menu_items_append_place_item (icon, ++ display_name, ++ display_name, //FIXME tooltip ++ add_menu, ++ G_CALLBACK (activate_uri), ++ activation_uri); ++ ++ g_free (icon); ++ g_free (display_name); ++ g_free (activation_uri); ++ } ++ ++ g_slist_free (add_volumes); ++ ++ g_list_foreach (volumes, (GFunc) gnome_vfs_volume_unref, NULL); ++ g_list_free (volumes); ++} ++ ++ ++static GtkWidget * ++panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item) ++{ ++ GtkWidget *places_menu; ++ GtkWidget *item; ++ char *gconf_name; ++ char *uri; ++ ++ places_menu = panel_create_menu (); ++ ++ gconf_name = gconf_client_get_string (panel_gconf_get_client (), ++ HOME_NAME_KEY, ++ NULL); ++ ++ uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ()); ++ panel_menu_items_append_place_item (PANEL_ICON_HOME, ++ string_empty (gconf_name) ? ++ _("Home Folder") : gconf_name, ++ _("Open your personal folder"), ++ places_menu, ++ G_CALLBACK (activate_home_uri), ++ uri); ++ g_free (uri); ++ ++ if (gconf_name) ++ g_free (gconf_name); ++ ++ path = g_build_filename (g_get_home_dir (), "Documents", NULL); ++ if (g_file_test (path, G_FILE_TEST_IS_DIR)) ++ panel_menu_items_append_place_item ("gnome-fs-directory", ++ _("Documents"), ++ _("Documents directory"), ++ places_menu, ++ G_CALLBACK (activate_uri), ++ "Documents"); ++ g_free (path); ++ ++ if (!gconf_client_get_bool (panel_gconf_get_client (), ++ DESKTOP_IS_HOME_DIR_KEY, ++ NULL)) { ++ uri = gnome_vfs_get_uri_from_local_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); ++ panel_menu_items_append_place_item ( ++ PANEL_ICON_DESKTOP, ++ /* Translators: Desktop is used here as in ++ * "Desktop Folder" (this is not the Desktop ++ * environment). Do not keep "Desktop Folder|" ++ * in the translation */ ++ Q_("Desktop Folder|Desktop"), ++ _("Open the contents of your desktop in a folder"), ++ places_menu, ++ G_CALLBACK (activate_desktop_uri), ++ /* FIXME: if the dir changes, we'd need to update the drag data since the uri is not the same */ ++ uri); ++ g_free (uri); ++ } ++ ++ panel_place_menu_item_append_gtk_bookmarks (places_menu); ++ add_menu_separator (places_menu); ++ ++ gconf_name = gconf_client_get_string (panel_gconf_get_client (), ++ COMPUTER_NAME_KEY, ++ NULL); ++ panel_menu_items_append_from_desktop (places_menu, ++ "nautilus-computer.desktop", ++ gconf_name); ++ if (gconf_name) ++ g_free (gconf_name); ++ ++ panel_menu_items_append_from_desktop (places_menu, ++ "nautilus-cd-burner.desktop", ++ NULL); ++ ++ panel_place_menu_item_append_volumes (places_menu, FALSE); ++ add_menu_separator (places_menu); ++ ++ panel_menu_items_append_from_desktop (places_menu, ++ "network-scheme.desktop", ++ NULL); ++ panel_place_menu_item_append_volumes (places_menu, TRUE); ++ ++ if (panel_is_program_in_path ("nautilus-connect-server")) { ++ item = panel_menu_items_create_action_item (PANEL_ACTION_CONNECT_SERVER); ++ if (item != NULL) ++ gtk_menu_shell_append (GTK_MENU_SHELL (places_menu), ++ item); ++ } ++ ++ add_menu_separator (places_menu); ++ ++ panel_menu_items_append_from_desktop (places_menu, ++ "gnome-search-tool.desktop", ++ NULL); ++ ++ panel_recent_append_documents_menu (places_menu, ++ place_item->priv->recent_manager); ++ ++ return places_menu; ++} ++ ++static void ++panel_place_menu_item_recreate_menu (GtkWidget *widget) ++{ ++ PanelPlaceMenuItem *place_item; ++ ++ place_item = PANEL_PLACE_MENU_ITEM (widget); ++ ++ if (place_item->priv->menu) { ++ gtk_widget_destroy (place_item->priv->menu); ++ place_item->priv->menu = panel_place_menu_item_create_menu (place_item); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (place_item), ++ place_item->priv->menu); ++ panel_applet_menu_set_recurse (GTK_MENU (place_item->priv->menu), ++ "menu_panel", ++ place_item->priv->panel); ++ } ++} ++ ++static void ++panel_place_menu_item_key_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ GtkWidget *place_item) ++{ ++ panel_place_menu_item_recreate_menu (place_item); ++} ++ ++static void ++panel_place_menu_item_gtk_bookmarks_changed (GnomeVFSMonitorHandle *handle, ++ const gchar *monitor_uri, ++ const gchar *info_uri, ++ GnomeVFSMonitorEventType event_type, ++ gpointer user_data) ++{ ++ panel_place_menu_item_recreate_menu (GTK_WIDGET (user_data)); ++} ++ ++static void ++panel_place_menu_item_volume_changed (GnomeVFSVolumeMonitor *monitor, ++ GnomeVFSVolume *volume, ++ GtkWidget *place_menu) ++{ ++ panel_place_menu_item_recreate_menu (place_menu); ++} ++ ++static void ++panel_desktop_menu_item_append_menu (GtkWidget *menu, ++ gpointer data) ++{ ++ PanelDesktopMenuItem *parent; ++ gboolean add_separator; ++ GList *children; ++ GList *last; ++ ++ parent = PANEL_DESKTOP_MENU_ITEM (data); ++ ++ add_separator = FALSE; ++ children = gtk_container_get_children (GTK_CONTAINER (menu)); ++ last = g_list_last (children); ++ ++ if (last != NULL) ++ add_separator = !GTK_IS_SEPARATOR (GTK_WIDGET (last->data)); ++ ++ g_list_free (children); ++ ++ if (add_separator) ++ add_menu_separator (menu); ++ ++ panel_menu_items_append_from_desktop (menu, "yelp.desktop", _("Help and Support")); ++ ++ if (g_file_test (DATADIR"/applications/apport-gtk.desktop", ++ G_FILE_TEST_IS_REGULAR)) { ++ panel_menu_items_append_from_desktop (menu, "apport-gtk.desktop", NULL); ++ ++ add_menu_separator (menu); ++ } ++ ++ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); ++ ++ if (g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "ubuntu-about.desktop", NULL); ++ ++ if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) ++ panel_menu_items_append_from_desktop (menu, "edubuntu-about.desktop", NULL); ++ ++ if (parent->priv->append_lock_logout) ++ panel_menu_items_append_lock_logout (menu); ++} ++ ++static GtkWidget * ++panel_desktop_menu_item_create_menu (PanelDesktopMenuItem *desktop_item) ++{ ++ GtkWidget *desktop_menu; ++ ++ desktop_menu = create_applications_menu ("settings.menu", NULL); ++ ++ g_object_set_data (G_OBJECT (desktop_menu), ++ "panel-menu-append-callback", ++ panel_desktop_menu_item_append_menu); ++ g_object_set_data (G_OBJECT (desktop_menu), ++ "panel-menu-append-callback-data", ++ desktop_item); ++ ++ return desktop_menu; ++} ++ ++static void ++panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item) ++{ ++ if (desktop_item->priv->menu) { ++ gtk_widget_destroy (desktop_item->priv->menu); ++ desktop_item->priv->menu = panel_desktop_menu_item_create_menu (desktop_item); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (desktop_item), ++ desktop_item->priv->menu); ++ panel_applet_menu_set_recurse (GTK_MENU (desktop_item->priv->menu), ++ "menu_panel", ++ desktop_item->priv->panel); ++ } ++} ++ ++static void ++panel_place_menu_item_finalize (GObject *object) ++{ ++ PanelPlaceMenuItem *menuitem = (PanelPlaceMenuItem *) object; ++ ++ gconf_client_remove_dir (panel_gconf_get_client (), ++ DESKTOP_IS_HOME_DIR_DIR, ++ NULL); ++ gconf_client_remove_dir (panel_gconf_get_client (), ++ NAMES_DIR, ++ NULL); ++ ++ if (menuitem->priv->bookmarks_monitor != NULL) ++ gnome_vfs_monitor_cancel (menuitem->priv->bookmarks_monitor); ++ menuitem->priv->bookmarks_monitor = NULL; ++ ++ if (menuitem->priv->volume_mounted_id) ++ g_signal_handler_disconnect (volume_monitor, ++ menuitem->priv->volume_mounted_id); ++ menuitem->priv->volume_mounted_id = 0; ++ ++ if (menuitem->priv->volume_unmounted_id) ++ g_signal_handler_disconnect (volume_monitor, ++ menuitem->priv->volume_unmounted_id); ++ menuitem->priv->volume_unmounted_id = 0; ++ ++ G_OBJECT_CLASS (panel_place_menu_item_parent_class)->finalize (object); ++} ++ ++static void ++panel_desktop_menu_item_finalize (GObject *object) ++{ ++ PanelDesktopMenuItem *menuitem = (PanelDesktopMenuItem *) object; ++ ++ if (menuitem->priv->append_lock_logout) ++ panel_lockdown_notify_remove (G_CALLBACK (panel_desktop_menu_item_recreate_menu), ++ menuitem); ++ G_OBJECT_CLASS (panel_desktop_menu_item_parent_class)->finalize (object); ++} ++ ++static void ++panel_place_menu_item_init (PanelPlaceMenuItem *menuitem) ++{ ++ char *bookmarks_filename; ++ char *bookmarks_uri; ++ ++ menuitem->priv = PANEL_PLACE_MENU_ITEM_GET_PRIVATE (menuitem); ++ ++ gconf_client_add_dir (panel_gconf_get_client (), ++ DESKTOP_IS_HOME_DIR_DIR, ++ GCONF_CLIENT_PRELOAD_NONE, ++ NULL); ++ gconf_client_add_dir (panel_gconf_get_client (), ++ NAMES_DIR, ++ GCONF_CLIENT_PRELOAD_NONE, ++ NULL); ++ ++ panel_gconf_notify_add_while_alive (HOME_NAME_KEY, ++ (GConfClientNotifyFunc) panel_place_menu_item_key_changed, ++ G_OBJECT (menuitem)); ++ panel_gconf_notify_add_while_alive (DESKTOP_IS_HOME_DIR_KEY, ++ (GConfClientNotifyFunc) panel_place_menu_item_key_changed, ++ G_OBJECT (menuitem)); ++ panel_gconf_notify_add_while_alive (COMPUTER_NAME_KEY, ++ (GConfClientNotifyFunc) panel_place_menu_item_key_changed, ++ G_OBJECT (menuitem)); ++ ++ menuitem->priv->recent_manager = gtk_recent_manager_get_default (); ++ ++ bookmarks_filename = g_build_filename (g_get_home_dir (), ++ BOOKMARKS_FILENAME, NULL); ++ bookmarks_uri = gnome_vfs_get_uri_from_local_path (bookmarks_filename); ++ ++ if (bookmarks_uri) { ++ GnomeVFSResult result; ++ ++ result = gnome_vfs_monitor_add (&menuitem->priv->bookmarks_monitor, ++ bookmarks_uri, ++ GNOME_VFS_MONITOR_FILE, ++ panel_place_menu_item_gtk_bookmarks_changed, ++ menuitem); ++ ++ if (result == GNOME_VFS_ERROR_NOT_SUPPORTED) ++ g_message ("File monitoring not supported in the compiled version of gnome-vfs: bookmarks won't be monitored."); ++ else if (result != GNOME_VFS_OK) ++ g_warning ("Failed to add file monitor for %s: %s\n", ++ bookmarks_uri, ++ gnome_vfs_result_to_string (result)); ++ ++ g_free (bookmarks_uri); ++ } else { ++ g_warning ("Could not make URI of ~/"BOOKMARKS_FILENAME); ++ } ++ ++ g_free (bookmarks_filename); ++ ++ if (!volume_monitor) ++ volume_monitor = gnome_vfs_get_volume_monitor (); ++ ++ menuitem->priv->volume_mounted_id = g_signal_connect (volume_monitor, ++ "volume_mounted", ++ G_CALLBACK (panel_place_menu_item_volume_changed), ++ menuitem); ++ menuitem->priv->volume_unmounted_id = g_signal_connect (volume_monitor, ++ "volume_unmounted", ++ G_CALLBACK (panel_place_menu_item_volume_changed), ++ menuitem); ++ ++} ++ ++static void ++panel_desktop_menu_item_init (PanelDesktopMenuItem *menuitem) ++{ ++ menuitem->priv = PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE (menuitem); ++} ++ ++static void ++panel_place_menu_item_class_init (PanelPlaceMenuItemClass *klass) ++{ ++ GObjectClass *gobject_class = (GObjectClass *) klass; ++ ++ gobject_class->finalize = panel_place_menu_item_finalize; ++ ++ g_type_class_add_private (klass, sizeof (PanelPlaceMenuItemPrivate)); ++} ++ ++static void ++panel_desktop_menu_item_class_init (PanelDesktopMenuItemClass *klass) ++{ ++ GObjectClass *gobject_class = (GObjectClass *) klass; ++ ++ gobject_class->finalize = panel_desktop_menu_item_finalize; ++ ++ g_type_class_add_private (klass, sizeof (PanelDesktopMenuItemPrivate)); ++} ++ ++GtkWidget * ++panel_place_menu_item_new (gboolean use_image) ++{ ++ PanelPlaceMenuItem *menuitem; ++ GtkWidget *image; ++ ++ menuitem = g_object_new (PANEL_TYPE_PLACE_MENU_ITEM, NULL); ++ ++ if (use_image) ++ image = gtk_image_new_from_icon_name (PANEL_ICON_FOLDER, ++ panel_menu_icon_get_size ()); ++ else ++ image = NULL; ++ ++ setup_menuitem (GTK_WIDGET (menuitem), ++ image ? panel_menu_icon_get_size () : GTK_ICON_SIZE_INVALID, ++ image, ++ _("Places")); ++ ++ menuitem->priv->use_image = use_image; ++ ++ menuitem->priv->menu = panel_place_menu_item_create_menu (menuitem); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), ++ menuitem->priv->menu); ++ ++ return GTK_WIDGET (menuitem); ++} ++ ++GtkWidget * ++panel_desktop_menu_item_new (gboolean use_image, ++ gboolean append_lock_logout) ++{ ++ PanelDesktopMenuItem *menuitem; ++ GtkWidget *image; ++ ++ menuitem = g_object_new (PANEL_TYPE_DESKTOP_MENU_ITEM, NULL); ++ ++ if (use_image) ++ image = gtk_image_new_from_icon_name ("computer", ++ panel_menu_icon_get_size ()); ++ else ++ image = NULL; ++ ++ setup_menuitem (GTK_WIDGET (menuitem), ++ image ? panel_menu_icon_get_size () : GTK_ICON_SIZE_INVALID, ++ image, ++ _("System")); ++ ++ menuitem->priv->use_image = use_image; ++ ++ menuitem->priv->append_lock_logout = append_lock_logout; ++ if (append_lock_logout) ++ panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu), ++ menuitem); ++ ++ menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem); ++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), ++ menuitem->priv->menu); ++ ++ return GTK_WIDGET (menuitem); ++} ++ ++void ++panel_place_menu_item_set_panel (GtkWidget *item, ++ PanelWidget *panel) ++{ ++ PanelPlaceMenuItem *place_item; ++ ++ place_item = PANEL_PLACE_MENU_ITEM (item); ++ ++ place_item->priv->panel = panel; ++ panel_applet_menu_set_recurse (GTK_MENU (place_item->priv->menu), ++ "menu_panel", panel); ++} ++ ++void ++panel_desktop_menu_item_set_panel (GtkWidget *item, ++ PanelWidget *panel) ++{ ++ PanelDesktopMenuItem *desktop_item; ++ ++ desktop_item = PANEL_DESKTOP_MENU_ITEM (item); ++ ++ desktop_item->priv->panel = panel; ++ panel_applet_menu_set_recurse (GTK_MENU (desktop_item->priv->menu), ++ "menu_panel", panel); ++} ++ ++void ++panel_menu_items_append_lock_logout (GtkWidget *menu) ++{ ++ gboolean separator_inserted; ++ GList *children; ++ GList *last; ++ GtkWidget *item; ++ const char *translate; ++ char *label; ++ char *tooltip; ++ ++ separator_inserted = FALSE; ++ children = gtk_container_get_children (GTK_CONTAINER (menu)); ++ last = g_list_last (children); ++ if (last != NULL) { ++ separator_inserted = GTK_IS_SEPARATOR (GTK_WIDGET (last->data)); ++ } ++ g_list_free (children); ++ ++ if (panel_lock_screen_action_available ("lock")) { ++ item = panel_menu_items_create_action_item (PANEL_ACTION_LOCK); ++ if (item != NULL) { ++ if (!separator_inserted) { ++ add_menu_separator (menu); ++ separator_inserted = TRUE; ++ } ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ } ++ } ++ ++ /* Translators: translate "panel:showusername|1" to anything ++ * but "1" if "Log Out %s" doesn't make any sense in your ++ * language (where %s is a username). ++ */ ++ translate = Q_("panel:showusername|1"); ++ if (strcmp (translate, "1") == 0) { ++ const char *user_name; ++ ++ user_name = g_get_real_name (); ++ if (!user_name || !user_name [0]) ++ user_name = g_get_user_name (); ++ ++ /* keep those strings in sync with the ones in ++ * panel-action-button.c */ ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ label = g_strdup_printf (_("Log Out %s..."), ++ g_get_user_name ()); ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ tooltip = g_strdup_printf (_("Log out %s of this session to " ++ "log in as a different user"), ++ user_name); ++ } else { ++ label = NULL; ++ tooltip = NULL; ++ } ++ ++ item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT, ++ label, tooltip); ++ g_free (label); ++ g_free (tooltip); ++ ++ if (item != NULL) { ++ if (!separator_inserted) ++ add_menu_separator (menu); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ } ++ ++ item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); ++ if (item != NULL) { ++ if (!separator_inserted) ++ add_menu_separator (menu); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ } ++} ++ ++void ++panel_menu_item_activate_desktop_file (GtkWidget *menuitem, ++ const char *path) ++{ ++ GError *error; ++ ++ error = NULL; ++ panel_launch_desktop_file (path, NULL, ++ menuitem_to_screen (menuitem), &error); ++ if (error) { ++ panel_error_dialog (NULL, menuitem_to_screen (menuitem), ++ "cannot_launch_entry", TRUE, ++ _("Could not launch menu item"), ++ error->message); ++ ++ g_error_free (error); ++ } ++} --- gnome-panel-2.20.0.1.orig/debian/patches/11_applet_use_session_dialog.patch +++ gnome-panel-2.20.0.1/debian/patches/11_applet_use_session_dialog.patch @@ -0,0 +1,151 @@ +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-action-button.c gnome-panel-2.19.2.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.19.2/gnome-panel/panel-action-button.c 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-action-button.c 2007-05-15 12:47:20.000000000 +0200 +@@ -165,11 +165,15 @@ + + if (not_prompt) + panel_session_request_logout (); +- else +- panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT, +- gtk_widget_get_screen (widget), +- gtk_get_current_event_time ()); +-} ++ else { ++ if (!gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL)) ++ panel_session_request_logout (); ++ else { ++ panel_logout_new (PANEL_LOGOUT_DIALOG_LOGOUT, ++ gtk_widget_get_screen (widget), ++ gtk_get_current_event_time ()); ++ } ++ } + + static void + panel_action_shutdown (GtkWidget *widget) +@@ -182,7 +186,8 @@ + static gboolean + panel_action_shutdown_reboot_is_disabled (void) + { +- return (panel_lockdown_get_disable_log_out() || ++ return (!gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL) || ++ panel_lockdown_get_disable_log_out() || + (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) && + !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))); + } +@@ -295,8 +300,8 @@ + /* when changing one of those two strings, don't forget to + * update the ones in panel-menu-items.c (look for + * panel:showusername|1) */ +- N_("Log Out..."), +- N_("Log out of this session to log in as a different user"), ++ N_("Quit..."), ++ N_("Log off, switch user, lock screen or power down the computer"), + "gospanel-20", + "ACTION:logout:NEW", + panel_action_logout, NULL, NULL, +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-global.schemas.in gnome-panel-2.19.2.new/gnome-panel/panel-global.schemas.in +--- gnome-panel-2.19.2/gnome-panel/panel-global.schemas.in 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-global.schemas.in 2007-05-15 12:45:46.000000000 +0200 +@@ -195,6 +195,19 @@ + + + ++ /schemas/apps/panel/global/upstream_session ++ /apps/panel/global/upstream_session ++ panel ++ bool ++ false ++ ++ Use the upstream session dialogs instead of the Ubuntu one ++ If true, the panel will use the upstream dialogs instead of the Ubuntu one. The panel must be restarted for this to take effect. ++ ++ ++ ++ ++ + /schemas/apps/panel/global/locked_down + /apps/panel/global/locked_down + panel +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-menu-items.c gnome-panel-2.19.2.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.19.2/gnome-panel/panel-menu-items.c 2007-05-15 12:45:45.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-menu-items.c 2007-05-15 12:45:46.000000000 +0200 +@@ -1026,7 +1026,7 @@ + } + g_list_free (children); + +- if (panel_lock_screen_action_available ("lock")) { ++ if (gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL) && panel_lock_screen_action_available ("lock")) { + item = panel_menu_items_create_action_item (PANEL_ACTION_LOCK); + if (item != NULL) { + if (!separator_inserted) { +@@ -1042,30 +1042,38 @@ + * but "1" if "Log Out %s" doesn't make any sense in your + * language (where %s is a username). + */ ++ + translate = Q_("panel:showusername|1"); +- if (strcmp (translate, "1") == 0) { +- const char *user_name; + +- user_name = g_get_real_name (); +- if (!user_name || !user_name [0]) +- user_name = g_get_user_name (); +- +- /* keep those strings in sync with the ones in +- * panel-action-button.c */ +- /* Translators: this string is used ONLY if you translated +- * "panel:showusername|1" to "1" */ +- label = g_strdup_printf (_("Log Out %s..."), +- g_get_user_name ()); +- /* Translators: this string is used ONLY if you translated +- * "panel:showusername|1" to "1" */ +- tooltip = g_strdup_printf (_("Log out %s of this session to " +- "log in as a different user"), +- user_name); +- } else { +- label = NULL; ++ if (gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL)) { ++ if (strcmp (translate, "1") == 0) { ++ const char *user_name; ++ ++ user_name = g_get_real_name (); ++ if (!user_name || !user_name [0]) ++ user_name = g_get_user_name (); ++ ++ /* keep those strings in sync with the ones in ++ * panel-action-button.c */ ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ label = g_strdup_printf (_("Log Out %s..."), ++ g_get_user_name ()); ++ /* Translators: this string is used ONLY if you translated ++ * "panel:showusername|1" to "1" */ ++ tooltip = g_strdup_printf (_("Log out %s of this session to " ++ "log in as a different user"), ++ user_name); ++ } else { ++ label = g_strdup_printf (_("Log Out...")); ++ tooltip = g_strdup_printf (_("Log out of this session to log in as a different user")); ++ } ++ } ++ else { ++ label = NULL; + tooltip = NULL; + } +- ++ + item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT, + label, tooltip); + g_free (label); +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-session.c gnome-panel-2.19.2.new/gnome-panel/panel-session.c +--- gnome-panel-2.19.2/gnome-panel/panel-session.c 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-session.c 2007-05-15 12:45:46.000000000 +0200 +@@ -54,7 +54,7 @@ + GNOME_SAVE_GLOBAL, + TRUE, + GNOME_INTERACT_ANY, +- TRUE, /* do not use the gnome-session gui */ ++ gconf_client_get_bool (panel_gconf_get_client (), "/apps/panel/global/upstream_session", NULL), /* use the gnome-session gui */ + TRUE); + + recursion_guard--; --- gnome-panel-2.20.0.1.orig/debian/patches/14_remove_separators.patch +++ gnome-panel-2.20.0.1/debian/patches/14_remove_separators.patch @@ -0,0 +1,55 @@ +--- gnome-panel-2.14.1.orig/gnome-panel/menu.c ++++ gnome-panel-2.14.1/gnome-panel/menu.c +@@ -1681,6 +1681,7 @@ + GSList *l; + GSList *items; + gboolean add_separator; ++ gboolean pending_separator = FALSE; + + add_separator = (GTK_MENU_SHELL (menu)->children != NULL); + +@@ -1691,16 +1692,24 @@ + + if (add_separator || + gmenu_tree_item_get_type (item) == GMENU_TREE_ITEM_SEPARATOR) { +- add_menu_separator (menu); ++ pending_separator = TRUE; + add_separator = FALSE; + } + + switch (gmenu_tree_item_get_type (item)) { + case GMENU_TREE_ITEM_DIRECTORY: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_submenu (menu, GMENU_TREE_DIRECTORY (item), NULL); + break; + + case GMENU_TREE_ITEM_ENTRY: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_menuitem (menu, GMENU_TREE_ENTRY (item), NULL); + break; + +@@ -1709,10 +1718,18 @@ + break; + + case GMENU_TREE_ITEM_ALIAS: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_menuitem_from_alias (menu, GMENU_TREE_ALIAS (item)); + break; + + case GMENU_TREE_ITEM_HEADER: ++ if (pending_separator) { ++ add_menu_separator (menu); ++ pending_separator = FALSE; ++ } + create_header (menu, GMENU_TREE_HEADER (item)); + break; + --- gnome-panel-2.20.0.1.orig/debian/patches/06_applets_category.patch +++ gnome-panel-2.20.0.1/debian/patches/06_applets_category.patch @@ -0,0 +1,68 @@ +diff -Nur gnome-panel-2.15.91/applets/clock/GNOME_ClockApplet_Factory.server.in.in gnome-panel-2.15.91.new/applets/clock/GNOME_ClockApplet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2006-08-08 01:55:52.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/clock/GNOME_ClockApplet_Factory.server.in.in 2006-08-08 09:55:36.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/fish/GNOME_FishApplet_Factory.server.in.in gnome-panel-2.15.91.new/applets/fish/GNOME_FishApplet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-08-08 01:55:52.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/fish/GNOME_FishApplet_Factory.server.in.in 2006-08-08 09:56:07.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in gnome-panel-2.15.91.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in +--- gnome-panel-2.15.91/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-08-08 01:55:53.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in 2006-08-08 09:56:36.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + +diff -Nur gnome-panel-2.15.91/applets/wncklet/GNOME_Wncklet_Factory.server.in.in gnome-panel-2.15.91.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in +--- gnome-panel-2.15.91/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-08-08 01:55:53.000000000 +0200 ++++ gnome-panel-2.15.91.new/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2006-08-08 09:58:27.000000000 +0200 +@@ -25,6 +25,7 @@ + + + ++ + + + +@@ -64,6 +65,7 @@ + + + ++ + + + +@@ -102,6 +104,7 @@ + + + ++ + + + +@@ -122,6 +125,7 @@ + + + ++ + + + --- gnome-panel-2.20.0.1.orig/debian/patches/11_panel_addto_dialog.patch +++ gnome-panel-2.20.0.1/debian/patches/11_panel_addto_dialog.patch @@ -0,0 +1,9452 @@ +diff -Nur gnome-panel-2.19.2/gnome-panel/Makefile.am gnome-panel-2.19.2.new/gnome-panel/Makefile.am +--- gnome-panel-2.19.2/gnome-panel/Makefile.am 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/Makefile.am 2007-05-15 12:42:45.000000000 +0200 +@@ -95,6 +95,9 @@ + panel-force-quit.c \ + panel-lockdown.c \ + panel-addto.c \ ++ panel-addto-canvas.c \ ++ panel-addto-rounded-rect.c \ ++ panel-addto-event-box.c \ + panel-logout.c \ + panel-gdm.c \ + panel-power-manager.c \ +@@ -144,6 +147,10 @@ + panel-force-quit.h \ + panel-lockdown.h \ + panel-addto.h \ ++ panel-addto-canvas.h \ ++ panel-addto-rounded-rect.h \ ++ panel-addto-rounded-rect-pixbuf.h \ ++ panel-addto-event-box.h \ + panel-logout.h \ + panel-gdm.h \ + panel-power-manager.h \ +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-action-button.c gnome-panel-2.19.2.new/gnome-panel/panel-action-button.c +--- gnome-panel-2.19.2/gnome-panel/panel-action-button.c 2007-05-15 12:42:45.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-action-button.c 2007-05-15 12:42:45.000000000 +0200 +@@ -174,6 +174,7 @@ + gtk_get_current_event_time ()); + } + } ++} + + static void + panel_action_shutdown (GtkWidget *widget) +@@ -264,6 +265,8 @@ + PanelActionButtonType type; + char *icon_name; + char *text; ++ char *category; ++ char *english_category; + char *tooltip; + char *help_index; + char *drag_id; +@@ -286,6 +289,8 @@ + PANEL_ACTION_LOCK, + PANEL_ICON_LOCKSCREEN, + N_("Lock Screen"), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Protect your computer from unauthorized use"), + "gospanel-21", + "ACTION:lock:NEW", +@@ -301,6 +306,8 @@ + * update the ones in panel-menu-items.c (look for + * panel:showusername|1) */ + N_("Quit..."), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Log off, switch user, lock screen or power down the computer"), + "gospanel-20", + "ACTION:logout:NEW", +@@ -311,6 +318,8 @@ + PANEL_ACTION_RUN, + PANEL_ICON_RUN, + N_("Run Application..."), ++ N_("Utilities"), ++ "Utilities", + N_("Run an application by typing a command or choosing from a list"), + "gospanel-555", + "ACTION:run:NEW", +@@ -321,6 +330,8 @@ + PANEL_ACTION_SEARCH, + PANEL_ICON_SEARCHTOOL, + N_("Search for Files..."), ++ N_("Utilities"), ++ "Utilities", + N_("Locate documents and folders on this computer by name or content"), + "gospanel-554", + "ACTION:search:NEW", +@@ -330,6 +341,8 @@ + PANEL_ACTION_FORCE_QUIT, + PANEL_ICON_FORCE_QUIT, + N_("Force Quit"), ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Force a misbehaving application to quit"), + "gospanel-563", + "ACTION:force-quit:NEW", +@@ -340,6 +353,8 @@ + PANEL_ACTION_CONNECT_SERVER, + PANEL_ICON_REMOTE, //FIXME icon + N_("Connect to Server..."), ++ N_("Utilities"), ++ "Utilities", + N_("Connect to a remote computer or shared disk"), + "gospanel-563", //FIXME + "ACTION:connect-server:NEW", +@@ -349,6 +364,8 @@ + PANEL_ACTION_SHUTDOWN, + PANEL_ICON_SHUTDOWN, + N_("Shut Down..."), ++ N_("Utilities"), ++ "Utilities", + N_("Shut down the computer"), + "gospanel-20", + "ACTION:shutdown:NEW", +@@ -412,6 +429,22 @@ + } + + G_CONST_RETURN char* ++panel_action_get_category (PanelActionButtonType type) ++{ ++ g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); ++ ++ return _(actions[type].category); ++} ++ ++G_CONST_RETURN char* ++panel_action_get_english_category (PanelActionButtonType type) ++{ ++ g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); ++ ++ return actions[type].english_category; ++} ++ ++G_CONST_RETURN char* + panel_action_get_tooltip (PanelActionButtonType type) + { + g_return_val_if_fail (type > PANEL_ACTION_NONE && type < PANEL_ACTION_LAST, NULL); +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-action-button.h gnome-panel-2.19.2.new/gnome-panel/panel-action-button.h +--- gnome-panel-2.19.2/gnome-panel/panel-action-button.h 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-action-button.h 2007-05-15 12:42:45.000000000 +0200 +@@ -87,12 +87,14 @@ + const char *drag_string, + int *old_applet_idx); + +-gboolean panel_action_get_is_disabled (PanelActionButtonType type); +-GCallback panel_action_get_invoke (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_icon_name (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_text (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_tooltip (PanelActionButtonType type); +-G_CONST_RETURN char *panel_action_get_drag_id (PanelActionButtonType type); ++gboolean panel_action_get_is_disabled (PanelActionButtonType type); ++GCallback panel_action_get_invoke (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_icon_name (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_text (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_category (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_english_category (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_tooltip (PanelActionButtonType type); ++G_CONST_RETURN char *panel_action_get_drag_id (PanelActionButtonType type); + + G_END_DECLS + +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto.c gnome-panel-2.19.2.new/gnome-panel/panel-addto.c +--- gnome-panel-2.19.2/gnome-panel/panel-addto.c 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto.c 2007-05-15 12:42:45.000000000 +0200 +@@ -25,119 +25,56 @@ + #include + #include + +-#include +- + #include + +-#include "launcher.h" +-#include "panel.h" +-#include "drawer.h" +-#include "panel-applet-frame.h" +-#include "panel-action-button.h" +-#include "panel-menu-bar.h" +-#include "panel-separator.h" +-#include "panel-toplevel.h" +-#include "panel-menu-button.h" +-#include "panel-globals.h" +-#include "panel-lockdown.h" +-#include "panel-util.h" +-#include "panel-profile.h" ++#include ++#include ++ + #include "panel-addto.h" + #include "panel-icon-names.h" ++#include "panel-addto-canvas.h" + +-typedef struct { +- PanelWidget *panel_widget; +- +- GtkWidget *addto_dialog; +- GtkWidget *label; +- GtkWidget *search_entry; +- GtkWidget *back_button; +- GtkWidget *add_button; +- GtkWidget *tree_view; +- GtkTreeModel *applet_model; +- GtkTreeModel *filter_applet_model; +- GtkTreeModel *application_model; +- GtkTreeModel *filter_application_model; +- +- GMenuTree *menu_tree; +- +- GSList *applet_list; +- GSList *application_list; +- GSList *settings_list; +- +- gchar *search_text; +- gchar *applet_search_text; +- +- guint name_notify; +- +- int insertion_position; +-} PanelAddtoDialog; ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) + + static GQuark panel_addto_dialog_quark = 0; + +-typedef enum { +- PANEL_ADDTO_APPLET, +- PANEL_ADDTO_ACTION, +- PANEL_ADDTO_LAUNCHER_MENU, +- PANEL_ADDTO_LAUNCHER, +- PANEL_ADDTO_LAUNCHER_NEW, +- PANEL_ADDTO_MENU, +- PANEL_ADDTO_MENUBAR, +- PANEL_ADDTO_SEPARATOR, +- PANEL_ADDTO_DRAWER +-} PanelAddtoItemType; +- +-typedef struct { +- PanelAddtoItemType type; +- char *name; +- char *description; +- char *icon; +- PanelActionButtonType action_type; +- char *launcher_path; +- char *menu_filename; +- char *menu_path; +- char *iid; +- gboolean static_data; +-} PanelAddtoItemInfo; +- +-typedef struct { +- GSList *children; +- PanelAddtoItemInfo item_info; +-} PanelAddtoAppList; +- +-static PanelAddtoItemInfo special_addto_items [] = { +- +- { PANEL_ADDTO_LAUNCHER_NEW, +- N_("Custom Application Launcher"), +- N_("Create a new launcher"), +- PANEL_ICON_LAUNCHER, +- PANEL_ACTION_NONE, +- NULL, +- NULL, +- NULL, +- "LAUNCHER:ASK", +- TRUE }, +- +- { PANEL_ADDTO_LAUNCHER_MENU, +- N_("Application Launcher..."), +- N_("Copy a launcher from the applications menu"), +- PANEL_ICON_LAUNCHER, +- PANEL_ACTION_NONE, +- NULL, +- NULL, +- NULL, +- "LAUNCHER:MENU", +- TRUE } +- +-}; ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++ typedef struct CategoryInfo { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ } CategoryInfo; + + static PanelAddtoItemInfo internal_addto_items [] = { + + { PANEL_ADDTO_MENU, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Main Menu"), + N_("The main GNOME menu"), + PANEL_ICON_MAIN_MENU, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -145,10 +82,12 @@ + TRUE }, + + { PANEL_ADDTO_MENUBAR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Menu Bar"), + N_("A custom menu bar"), + PANEL_ICON_MAIN_MENU, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -156,10 +95,12 @@ + TRUE }, + + { PANEL_ADDTO_SEPARATOR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", + N_("Separator"), + N_("A separator to organize the panel items"), + PANEL_ICON_SEPARATOR, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -167,10 +108,12 @@ + TRUE }, + + { PANEL_ADDTO_DRAWER, ++ PANEL_ACTION_NONE, ++ N_("Desktop & Windows"), ++ "Desktop & Windows", + N_("Drawer"), + N_("A pop out drawer to store other items in"), + PANEL_ICON_DRAWER, +- PANEL_ACTION_NONE, + NULL, + NULL, + NULL, +@@ -203,9 +146,7 @@ + + static void panel_addto_present_applications (PanelAddtoDialog *dialog); + static void panel_addto_present_applets (PanelAddtoDialog *dialog); +-static gboolean panel_addto_filter_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data); ++static void panel_addto_init_categories (PanelAddtoDialog *dialog); + + static int + panel_addto_applet_info_sort_func (PanelAddtoItemInfo *a, +@@ -224,6 +165,7 @@ + if (!translated) { + internal_addto_items [i].name = _(internal_addto_items [i].name); + internal_addto_items [i].description = _(internal_addto_items [i].description); ++ internal_addto_items [i].category = _(internal_addto_items [i].category); + } + + list = g_slist_prepend (list, &internal_addto_items [i]); +@@ -237,14 +179,16 @@ + if (panel_action_get_is_disabled (i)) + continue; + +- info = g_new0 (PanelAddtoItemInfo, 1); +- info->type = PANEL_ADDTO_ACTION; +- info->action_type = i; +- info->name = g_strdup (panel_action_get_text (i)); +- info->description = g_strdup (panel_action_get_tooltip (i)); +- info->icon = g_strdup (panel_action_get_icon_name (i)); +- info->iid = g_strdup (panel_action_get_drag_id (i)); +- info->static_data = FALSE; ++ info = g_new0 (PanelAddtoItemInfo, 1); ++ info->type = PANEL_ADDTO_ACTION; ++ info->action_type = i; ++ info->name = g_strdup (panel_action_get_text (i)); ++ info->description = g_strdup (panel_action_get_tooltip (i)); ++ info->category = g_strdup (panel_action_get_category (i)); ++ info->english_category = g_strdup (panel_action_get_english_category (i)); ++ info->icon = g_strdup (panel_action_get_icon_name (i)); ++ info->iid = g_strdup (panel_action_get_drag_id (i)); ++ info->static_data = FALSE; + + list = g_slist_prepend (list, info); + } +@@ -273,6 +217,7 @@ + } + + #define ICON_SIZE 32 ++#define LAUNCHER_ICON_SIZE 20 + + static GdkPixbuf * + panel_addto_make_pixbuf (const char *filename) +@@ -284,8 +229,18 @@ + NULL); + } + ++static GdkPixbuf * ++panel_addto_make_pixbuf_for_launcher (const char *filename) ++{ ++ //FIXME: size shouldn't be fixed but should depend on the font size ++ return panel_load_icon (gtk_icon_theme_get_default (), ++ filename, ++ LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, ++ NULL); ++} ++ + static void +-panel_addto_drag_data_get_cb (GtkWidget *widget, ++panel_addto_applications_drag_data_get_cb (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, +@@ -298,27 +253,22 @@ + } + + static void +-panel_addto_drag_begin_cb (GtkWidget *widget, ++panel_addto_applications_drag_begin_cb (GtkWidget *widget, + GdkDragContext *context, + gpointer data) + { +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; ++ GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; +- GtkTreeIter filter_iter; + GdkPixbuf *pixbuf; + +- filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + + gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL); +- gtk_tree_model_get_iter (filter_model, &filter_iter, path); ++ gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_path_free (path); +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, &filter_iter); + +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, ++ gtk_tree_model_get (model, &iter, + COLUMN_ICON, &pixbuf, + -1); + +@@ -327,7 +277,7 @@ + } + + static void +-panel_addto_setup_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_drag (GtkTreeView *tree_view, + const GtkTargetEntry *target, + const char *text) + { +@@ -339,17 +289,17 @@ + target, 1, GDK_ACTION_COPY); + + g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get", +- G_CALLBACK (panel_addto_drag_data_get_cb), ++ G_CALLBACK (panel_addto_applications_drag_data_get_cb), + g_strdup (text), + (GClosureNotify) g_free, + 0 /* connect_flags */); + g_signal_connect_after (G_OBJECT (tree_view), "drag-begin", +- G_CALLBACK (panel_addto_drag_begin_cb), ++ G_CALLBACK (panel_addto_applications_drag_begin_cb), + NULL); + } + + static void +-panel_addto_setup_launcher_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_launcher_drag (GtkTreeView *tree_view, + const char *uri) + { + static GtkTargetEntry target[] = { +@@ -358,30 +308,19 @@ + char *uri_list; + + uri_list = g_strconcat (uri, "\r\n", NULL); +- panel_addto_setup_drag (tree_view, target, uri_list); ++ panel_addto_applications_setup_drag (tree_view, target, uri_list); + g_free (uri_list); + } + + static void +-panel_addto_setup_applet_drag (GtkTreeView *tree_view, +- const char *iid) +-{ +- static GtkTargetEntry target[] = { +- { "application/x-panel-applet-iid", 0, 0 } +- }; +- +- panel_addto_setup_drag (tree_view, target, iid); +-} +- +-static void +-panel_addto_setup_internal_applet_drag (GtkTreeView *tree_view, ++panel_addto_applications_setup_internal_applet_drag (GtkTreeView *tree_view, + const char *applet_type) + { + static GtkTargetEntry target[] = { + { "application/x-panel-applet-internal", 0, 0 } + }; + +- panel_addto_setup_drag (tree_view, target, applet_type); ++ panel_addto_applications_setup_drag (tree_view, target, applet_type); + } + + static GSList * +@@ -420,20 +359,26 @@ + + for (i = 0; i < applet_list->_length; i++) { + Bonobo_ServerInfo *info; +- const char *name, *description, *icon; ++ const char *name, *description, *category, *english_category, *icon; + PanelAddtoItemInfo *applet; + + info = &applet_list->_buffer[i]; + +- name = bonobo_server_info_prop_lookup (info, +- "name", +- langs_gslist); +- description = bonobo_server_info_prop_lookup (info, +- "description", +- langs_gslist); +- icon = bonobo_server_info_prop_lookup (info, +- "panel:icon", +- NULL); ++ name = bonobo_server_info_prop_lookup (info, ++ "name", ++ langs_gslist); ++ description = bonobo_server_info_prop_lookup (info, ++ "description", ++ langs_gslist); ++ category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ langs_gslist); ++ english_category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ NULL); ++ icon = bonobo_server_info_prop_lookup (info, ++ "panel:icon", ++ NULL); + + if (!name || + panel_lockdown_is_applet_disabled (info->iid)) { +@@ -447,7 +392,13 @@ + applet->icon = g_strdup (icon); + applet->iid = g_strdup (info->iid); + applet->static_data = FALSE; +- ++ if (!category) { ++ applet->category = g_strdup_printf (_("Miscellaneous")); ++ applet->english_category = g_strdup_printf ("Miscellaneous"); ++ } else { ++ applet->category = g_markup_escape_text (category, -1); ++ applet->english_category = g_markup_escape_text (english_category, -1); ++ } + list = g_slist_prepend (list, applet); + } + +@@ -500,38 +451,12 @@ + } + } + +-static void +-panel_addto_append_special_applets (PanelAddtoDialog *dialog, +- GtkListStore *model) +-{ +- static gboolean translated = FALSE; +- int i; +- +- for (i = 0; i < G_N_ELEMENTS (special_addto_items); i++) { +- if (!translated) { +- special_addto_items [i].name = _(special_addto_items [i].name); +- special_addto_items [i].description = _(special_addto_items [i].description); +- } +- +- if (special_addto_items [i].type == PANEL_ADDTO_LAUNCHER_NEW +- && panel_lockdown_get_disable_command_line ()) +- continue; +- +- panel_addto_append_item (dialog, model, &special_addto_items [i]); +- } +- +- translated = TRUE; +-} +- +-static void ++static GtkTreeModel * + panel_addto_make_applet_model (PanelAddtoDialog *dialog) + { + GtkListStore *model; + GSList *l; + +- if (dialog->filter_applet_model != NULL) +- return; +- + if (panel_profile_id_lists_are_writable ()) { + dialog->applet_list = panel_addto_query_applets (dialog->applet_list); + dialog->applet_list = panel_addto_prepend_internal_applets (dialog->applet_list); +@@ -546,21 +471,14 @@ + G_TYPE_POINTER, + G_TYPE_STRING); + +- if (panel_profile_id_lists_are_writable ()) { +- panel_addto_append_special_applets (dialog, model); +- if (dialog->applet_list) ++ if (panel_profile_id_lists_are_writable () && dialog->applet_list) { + panel_addto_append_item (dialog, model, NULL); + } + + for (l = dialog->applet_list; l; l = l->next) + panel_addto_append_item (dialog, model, l->data); + +- dialog->applet_model = GTK_TREE_MODEL (model); +- dialog->filter_applet_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->applet_model), +- NULL); +- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_applet_model), +- panel_addto_filter_func, +- dialog, NULL); ++ return (GtkTreeModel *) model; + } + + static void panel_addto_make_application_list (GSList **parent_list, +@@ -718,16 +636,13 @@ + } + } + +-static void ++static GtkTreeModel * + panel_addto_make_application_model (PanelAddtoDialog *dialog) + { + GtkTreeStore *store; + GMenuTree *tree; + GMenuTreeDirectory *root; + +- if (dialog->filter_application_model != NULL) +- return; +- + store = gtk_tree_store_new (NUMBER_COLUMNS, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, +@@ -769,20 +684,19 @@ + + gmenu_tree_unref (tree); + +- dialog->application_model = GTK_TREE_MODEL (store); +- dialog->filter_application_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->application_model), +- NULL); +- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_application_model), +- panel_addto_filter_func, +- dialog, NULL); ++ return GTK_TREE_MODEL (store); + } + +-static void ++gboolean + panel_addto_add_item (PanelAddtoDialog *dialog, + PanelAddtoItemInfo *item_info) + { ++ gboolean destroy; ++ + g_assert (item_info != NULL); + ++ destroy = TRUE; ++ + switch (item_info->type) { + case PANEL_ADDTO_APPLET: + panel_applet_frame_create (dialog->panel_widget->toplevel, +@@ -796,6 +710,7 @@ + break; + case PANEL_ADDTO_LAUNCHER_MENU: + panel_addto_present_applications (dialog); ++ destroy = FALSE; + break; + case PANEL_ADDTO_LAUNCHER: + panel_launcher_create (dialog->panel_widget->toplevel, +@@ -828,18 +743,21 @@ + NULL, FALSE, NULL); + break; + } ++ ++ return destroy; + } + +-static void ++void + panel_addto_dialog_response (GtkWidget *widget_dialog, + guint response_id, + PanelAddtoDialog *dialog) + { +- GtkTreeSelection *selection; +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; +- GtkTreeIter iter; +- GtkTreeIter filter_iter; ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoEntry *selected_applet; ++ GtkTreeSelection *selected_application; ++ GtkTreeModel *model; ++ GtkTreeIter iter; + + switch (response_id) { + case GTK_RESPONSE_HELP: +@@ -848,28 +766,44 @@ + break; + + case PANEL_ADDTO_RESPONSE_ADD: +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- if (gtk_tree_selection_get_selected (selection, &filter_model, +- &filter_iter)) { +- PanelAddtoItemInfo *data; +- +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, +- &filter_iter); +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, +- COLUMN_DATA, &data, -1); + +- if (data != NULL) ++ if (dialog->status == APPLETS) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ selected_applet = priv->selected; ++ data = selected_applet->item_info; ++ if (data) { + panel_addto_add_item (dialog, data); +- } ++ } ++ } else if (dialog->status == APPLICATIONS) { ++ selected_application = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ if (gtk_tree_selection_get_selected (selected_application, ++ &model, &iter)) { ++ gtk_tree_model_get (model, &iter, ++ COLUMN_DATA, &data, -1); ++ ++ if (data != NULL) { ++ panel_addto_add_item (dialog, data); ++ } ++ } ++ } ++ + break; + ++ + case PANEL_ADDTO_RESPONSE_BACK: + /* This response only happens when we're showing the + * application list and the user wants to go back to the + * applet list. */ +- panel_addto_present_applets (dialog); ++ gtk_widget_hide (dialog->applications_sw); ++ dialog->status = APPLETS; ++ panel_addto_present_applets (dialog); ++ gtk_widget_show_all (dialog->applets_sw); ++ gtk_widget_show (dialog->statuslabel); ++ gtk_widget_show (dialog->search_entry); ++ gtk_widget_show (dialog->search_label); ++ gtk_widget_set_sensitive (dialog->launcher_button, TRUE); ++ if (!panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, TRUE); + break; + + case GTK_RESPONSE_CLOSE: +@@ -882,6 +816,40 @@ + } + + static void ++panel_addto_add_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_MENU; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void ++panel_addto_add_custom_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_NEW; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void + panel_addto_dialog_destroy (GtkWidget *widget_dialog, + PanelAddtoDialog *dialog) + { +@@ -891,45 +859,268 @@ + NULL); + } + ++ ++static PanelAddtoCategory * ++panel_addto_category_new (const gchar *title, ++ const gchar *english_title, ++ gboolean real_category) ++{ ++ PanelAddtoCategory *retval; ++ retval = g_new0 (PanelAddtoCategory, 1); ++ ++ retval->title = g_strdup (title); ++ retval->english_title = g_strdup (english_title); ++ retval->real_category = real_category != FALSE; ++ retval->entries = NULL; /* We will populate it in init_categories */ ++ ++ return retval; ++} ++ ++static int ++compare_categories (PanelAddtoCategory *a, ++ PanelAddtoCategory *b) ++{ ++ return g_utf8_collate (a->title, b->title); ++} ++ ++static void ++panel_addto_init_categories (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoInformation *info; ++ PanelAddtoItemInfo *applet; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *current_category; ++ GSList *categories = NULL; ++ GSList *l, *m; ++ gchar *category_title, *category_english_title; ++ gboolean found; ++ ++ info = g_new0 (PanelAddtoInformation, 1); ++ ++ for (l = dialog->applet_list; l; l = l->next) { ++ applet = l->data; ++ category_title = g_strdup (applet->category); ++ category_english_title = g_strdup (applet->english_category); ++ found = FALSE; ++ for (m = categories; m; m = m->next) { ++ current_category = m->data; ++ if (!g_utf8_collate (current_category->english_title, category_english_title)) { ++ found = TRUE; ++ current_category->n_entries++; ++ if (!current_category->translated && strcmp (category_title, category_english_title)) { ++ current_category->title = category_title; ++ current_category->translated = TRUE; ++ } ++ break; ++ } ++ } ++ if (!found) { ++ categories = g_slist_prepend (categories, ++ panel_addto_category_new (category_title, category_english_title, TRUE)); ++ current_category = categories->data; ++ current_category->translated = strcmp (category_title, category_english_title) ? TRUE : FALSE; ++ current_category->n_entries = 1; ++ } ++ ++ entry = g_new0 (PanelAddtoEntry, 1); ++ entry->title = g_strdup (applet->name); ++ entry->comment = g_strdup (applet->description); ++ entry->item_info = applet; ++ entry->category = current_category; ++ entry->dialog = dialog; ++ entry->icon_pixbuf = panel_addto_make_pixbuf (applet->icon); ++ current_category->entries = g_slist_append (current_category->entries, entry); ++ } ++ ++ categories = g_slist_sort (categories, ++ (GCompareFunc) compare_categories); ++ ++ info->n_categories = g_slist_length (categories); ++ info->categories = categories; ++ ++ dialog->info = info; ++} ++ ++static gboolean ++panel_addto_separator_func (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ gpointer data) ++{ ++ int column = GPOINTER_TO_INT (data); ++ char *text; ++ ++ gtk_tree_model_get (model, iter, column, &text, -1); ++ ++ if (!text) ++ return TRUE; ++ ++ g_free(text); ++ return FALSE; ++} ++ ++static void ++panel_addto_applications_selection_changed (GtkTreeSelection *selection, ++ PanelAddtoDialog *dialog) ++{ ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ PanelAddtoItemInfo *data; ++ char *iid; ++ ++ ++ if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_tree_model_get (model, &iter, COLUMN_DATA, &data, -1); ++ ++ if (!data) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++ /* only allow dragging applets if we can add applets */ ++ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_applications_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_MENU: ++ ++ /* build the iid for menus other than the main menu */ ++ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_applications_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ break; ++ } ++ } ++} ++ ++ ++static void ++panel_addto_applications_selection_activated (GtkTreeView *view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ PanelAddtoDialog *dialog) ++{ ++ gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), ++ PANEL_ADDTO_RESPONSE_ADD); ++} ++ + static void + panel_addto_present_applications (PanelAddtoDialog *dialog) + { +- if (dialog->filter_application_model == NULL) +- panel_addto_make_application_model (dialog); +- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), +- dialog->filter_application_model); +- gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), +- dialog->search_entry); +- gtk_widget_set_sensitive (dialog->back_button, TRUE); ++ GtkTreeSelection *selection; ++ GtkTreeViewColumn *column; ++ ++ if (dialog->application_model == NULL) { ++ dialog->application_model = panel_addto_make_application_model (dialog); ++ } ++ gtk_widget_hide (dialog->applets_sw); ++ gtk_widget_hide (dialog->statuslabel); ++ gtk_widget_hide (dialog->search_entry); ++ gtk_widget_hide (dialog->search_label); + +- if (dialog->applet_search_text) +- g_free (dialog->applet_search_text); ++ gtk_widget_set_sensitive (dialog->launcher_button, FALSE); ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); + +- dialog->applet_search_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); +- /* show everything */ +- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), ""); ++ dialog->status = APPLICATIONS; ++ ++ dialog->applications_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_SHADOW_IN); ++ dialog->tree_view = gtk_tree_view_new (); ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), ++ FALSE); ++ gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->tree_view)); ++ ++ dialog->renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, ++ "xpad", 4, ++ "ypad", 4, ++ NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "pixbuf", COLUMN_ICON, ++ NULL); ++ ++ dialog->renderer = gtk_cell_renderer_text_new (); ++ g_object_set (dialog->renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "markup", COLUMN_TEXT, ++ NULL); ++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_SEARCH); ++ ++ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view), ++ panel_addto_separator_func, ++ GINT_TO_POINTER (COLUMN_TEXT), ++ NULL); ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ ++ column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_TEXT); ++ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); ++ ++ g_signal_connect (selection, "changed", ++ G_CALLBACK (panel_addto_applications_selection_changed), ++ dialog); ++ ++ g_signal_connect (dialog->tree_view, "row-activated", ++ G_CALLBACK (panel_addto_applications_selection_activated), ++ dialog); ++ ++ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), ++ dialog->application_model); ++ gtk_container_add (GTK_CONTAINER (dialog->applications_sw), ++ GTK_WIDGET (dialog->tree_view)); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), ++ GTK_WIDGET (dialog->applications_sw), TRUE, TRUE, 0); ++ ++ ++ gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), ++ dialog->tree_view); ++ gtk_widget_set_sensitive (dialog->back_button, TRUE); ++ gtk_widget_show_all (GTK_WIDGET (dialog->applications_sw)); + } + + static void + panel_addto_present_applets (PanelAddtoDialog *dialog) + { +- if (dialog->filter_applet_model == NULL) +- panel_addto_make_applet_model (dialog); +- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), +- dialog->filter_applet_model); +- gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), +- dialog->search_entry); +- gtk_widget_set_sensitive (dialog->back_button, FALSE); + +- if (dialog->applet_search_text) { +- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), +- dialog->applet_search_text); +- gtk_editable_set_position (GTK_EDITABLE (dialog->search_entry), +- -1); ++ if (dialog->applet_model == NULL) ++ dialog->applet_model = panel_addto_make_applet_model (dialog); + +- g_free (dialog->applet_search_text); +- dialog->applet_search_text = NULL; +- } ++ gtk_widget_set_sensitive (dialog->back_button, FALSE); ++ + } + + static void +@@ -990,8 +1181,10 @@ + static void + panel_addto_dialog_free (PanelAddtoDialog *dialog) + { +- GConfClient *client; +- GSList *item; ++ GConfClient *client; ++ GSList *item, *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; + + client = panel_gconf_get_client (); + +@@ -999,18 +1192,14 @@ + gconf_client_notify_remove (client, dialog->name_notify); + dialog->name_notify = 0; + +- if (dialog->search_text) +- g_free (dialog->search_text); +- dialog->search_text = NULL; +- +- if (dialog->applet_search_text) +- g_free (dialog->applet_search_text); +- dialog->applet_search_text = NULL; +- + if (dialog->addto_dialog) +- gtk_widget_destroy (dialog->addto_dialog); ++ gtk_widget_destroy (dialog->addto_dialog); + dialog->addto_dialog = NULL; +- ++ ++ if (dialog->label) { ++ dialog->label = NULL; ++ } ++ + for (item = dialog->applet_list; item != NULL; item = item->next) { + PanelAddtoItemInfo *applet; + +@@ -1024,19 +1213,33 @@ + + panel_addto_dialog_free_application_list (dialog->application_list); + panel_addto_dialog_free_application_list (dialog->settings_list); ++ ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv) { ++ if (priv && priv->info && priv->info->categories) { ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ g_free (m->data); ++ } ++ if (current_category->user_data) ++ g_free (current_category->user_data); ++ g_slist_free (current_category->entries); ++ g_free (current_category); ++ } ++ g_slist_free (priv->info->categories); ++ } ++ g_free (priv->search_text); ++ } ++ } + +- if (dialog->filter_applet_model) +- g_object_unref (dialog->filter_applet_model); +- dialog->filter_applet_model = NULL; ++ + + if (dialog->applet_model) +- g_object_unref (dialog->applet_model); ++ g_object_unref (dialog->applet_model); + dialog->applet_model = NULL; + +- if (dialog->filter_application_model) +- g_object_unref (dialog->filter_application_model); +- dialog->filter_application_model = NULL; +- + if (dialog->application_model) + g_object_unref (dialog->application_model); + dialog->application_model = NULL; +@@ -1058,17 +1261,18 @@ + label = NULL; + + if (!string_empty (name)) +- label = g_strdup_printf (_("Find an _item to add to \"%s\":"), ++ label = g_strdup_printf (_("Select an item to add to \"%s\":"), + name); + + if (panel_toplevel_get_is_attached (dialog->panel_widget->toplevel)) { + title = g_strdup_printf (_("Add to Drawer")); + if (label == NULL) +- label = g_strdup (_("Find an _item to add to the drawer:")); ++ label = g_strdup (_("Select an item to add to the drawer:")); + } else { + title = g_strdup_printf (_("Add to Panel")); + if (label == NULL) +- label = g_strdup (_("Find an _item to add to the panel:")); ++ label = g_strdup (_("Select an item to add to the panel \n\ ++(you can also directly drag and drop items onto the panel):")); + } + + gtk_window_set_title (GTK_WINDOW (dialog->addto_dialog), title); +@@ -1102,199 +1306,24 @@ + panel_addto_name_change (dialog, text); + } + +-static gboolean +-panel_addto_filter_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer userdata) +-{ +- PanelAddtoDialog *dialog; +- PanelAddtoItemInfo *data; +- +- dialog = (PanelAddtoDialog *) userdata; +- +- if (!dialog->search_text || !dialog->search_text[0]) +- return TRUE; +- +- gtk_tree_model_get (model, iter, COLUMN_DATA, &data, -1); +- +- if (data == NULL) +- return FALSE; +- +- /* This is more a workaround than anything else: show all the root +- * items in a tree store */ +- if (GTK_IS_TREE_STORE (model) && +- gtk_tree_store_iter_depth (GTK_TREE_STORE (model), iter) == 0) +- return TRUE; +- +- return (panel_util_utf8_strstrcase (data->name, +- dialog->search_text) != NULL || +- panel_util_utf8_strstrcase (data->description, +- dialog->search_text) != NULL); +-} +- +-static void +-panel_addto_search_entry_changed (GtkWidget *entry, +- PanelAddtoDialog *dialog) +-{ +- GtkTreeModel *model; +- char *new_text; +- GtkTreeIter iter; +- GtkTreePath *path; +- +- new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); +- g_strchomp (new_text); +- +- if (dialog->search_text && +- g_utf8_collate (new_text, dialog->search_text) == 0) { +- g_free (new_text); +- return; +- } +- +- if (dialog->search_text) +- g_free (dialog->search_text); +- dialog->search_text = new_text; +- +- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); +- +- path = gtk_tree_path_new_first (); +- if (gtk_tree_model_get_iter (model, &iter, path)) { +- GtkTreeSelection *selection; +- +- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (dialog->tree_view), +- path, NULL, FALSE, 0, 0); +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_selection_select_path (selection, path); +- } +- gtk_tree_path_free (path); +-} +- +-static void +-panel_addto_search_entry_activated (GtkWidget *entry, +- PanelAddtoDialog *dialog) +-{ +- gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), +- PANEL_ADDTO_RESPONSE_ADD); +-} +- +-static void +-panel_addto_selection_changed (GtkTreeSelection *selection, +- PanelAddtoDialog *dialog) +-{ +- GtkTreeModel *filter_model; +- GtkTreeModel *child_model; +- GtkTreeIter iter; +- GtkTreeIter filter_iter; +- PanelAddtoItemInfo *data; +- char *iid; +- +- if (!gtk_tree_selection_get_selected (selection, +- &filter_model, +- &filter_iter)) { +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), +- FALSE); +- return; +- } +- +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), +- &iter, &filter_iter); +- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); +- gtk_tree_model_get (child_model, &iter, COLUMN_DATA, &data, -1); +- +- if (!data) { +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), +- FALSE); +- return; +- } +- +- gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); +- +- if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { +- gtk_button_set_label (GTK_BUTTON (dialog->add_button), +- GTK_STOCK_GO_FORWARD); +- } else { +- gtk_button_set_label (GTK_BUTTON (dialog->add_button), +- GTK_STOCK_ADD); +- } +- gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), +- TRUE); +- +- /* only allow dragging applets if we can add applets */ +- if (panel_profile_id_lists_are_writable ()) { +- switch (data->type) { +- case PANEL_ADDTO_LAUNCHER: +- panel_addto_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->launcher_path); +- break; +- case PANEL_ADDTO_APPLET: +- panel_addto_setup_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->iid); +- break; +- case PANEL_ADDTO_LAUNCHER_MENU: +- gtk_tree_view_unset_rows_drag_source (GTK_TREE_VIEW (dialog->tree_view)); +- break; +- case PANEL_ADDTO_MENU: +- /* build the iid for menus other than the main menu */ +- if (data->iid == NULL) { +- iid = g_strdup_printf ("MENU:%s/%s", +- data->menu_filename, +- data->menu_path); +- } else { +- iid = g_strdup (data->iid); +- } +- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- iid); +- g_free (iid); +- break; +- default: +- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), +- data->iid); +- break; +- } +- } +-} +- +-static void +-panel_addto_selection_activated (GtkTreeView *view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- PanelAddtoDialog *dialog) +-{ +- gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), +- PANEL_ADDTO_RESPONSE_ADD); +-} +- +-static gboolean +-panel_addto_separator_func (GtkTreeModel *model, +- GtkTreeIter *iter, +- gpointer data) +-{ +- int column = GPOINTER_TO_INT (data); +- char *text; +- +- gtk_tree_model_get (model, iter, column, &text, -1); +- +- if (!text) +- return TRUE; +- +- g_free(text); +- return FALSE; +-} + + static PanelAddtoDialog * + panel_addto_dialog_new (PanelWidget *panel_widget) + { + PanelAddtoDialog *dialog; +- GtkWidget *vbox; +- GtkWidget *inner_vbox; +- GtkWidget *find_hbox; +- GtkWidget *sw; +- GtkCellRenderer *renderer; +- GtkTreeSelection *selection; +- GtkTreeViewColumn *column; ++ GtkWidget *vbox; ++ GtkWidget *top_hbox; ++ GtkWidget *launchers_hbox; ++ GdkPixbuf *launcher_pixbuf; ++ GtkWidget *launcher_image; ++ GtkWidget *bottom_hbox; ++ GtkTooltips *launchers_tooltips; ++ GtkImage *label_image; + + dialog = g_new0 (PanelAddtoDialog, 1); + ++ dialog->status = APPLETS; ++ + g_object_set_qdata_full (G_OBJECT (panel_widget->toplevel), + panel_addto_dialog_quark, + dialog, +@@ -1302,14 +1331,14 @@ + + dialog->panel_widget = panel_widget; + dialog->name_notify = +- panel_profile_toplevel_notify_add ( +- dialog->panel_widget->toplevel, +- "name", +- (GConfClientNotifyFunc) panel_addto_name_notify, +- dialog); +- +- ++ panel_profile_toplevel_notify_add (dialog->panel_widget->toplevel, ++ "name", ++ (GConfClientNotifyFunc) panel_addto_name_notify, ++ dialog); + dialog->addto_dialog = gtk_dialog_new (); ++ ++ dialog->statuslabel = gtk_label_new (""); ++ + gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), + GTK_STOCK_HELP, GTK_RESPONSE_HELP); + dialog->back_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), +@@ -1337,104 +1366,103 @@ + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->addto_dialog)->vbox), +- vbox); +- +- inner_vbox = gtk_vbox_new (FALSE, 6); +- gtk_box_pack_start (GTK_BOX (vbox), inner_vbox, TRUE, TRUE, 0); ++ GTK_WIDGET (vbox)); + +- find_hbox = gtk_hbox_new (FALSE, 6); +- gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0); ++ dialog->inner_vbox = gtk_vbox_new (FALSE, 6); ++ gtk_box_pack_start (GTK_BOX (vbox), dialog->inner_vbox, TRUE, TRUE, 0); + ++ top_hbox = gtk_hbox_new (FALSE, 6); ++ launchers_hbox = gtk_hbox_new (FALSE, 6); ++ bottom_hbox = gtk_hbox_new (FALSE, 0); + dialog->label = gtk_label_new_with_mnemonic (""); + gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.5); + gtk_label_set_use_markup (GTK_LABEL (dialog->label), TRUE); + +- gtk_box_pack_start (GTK_BOX (find_hbox), dialog->label, +- FALSE, FALSE, 0); ++ label_image = g_object_new (GTK_TYPE_IMAGE, ++ "stock", GTK_STOCK_DIALOG_INFO, ++ "icon-size", GTK_ICON_SIZE_DND, ++ NULL); ++ dialog->search_label = gtk_label_new_with_mnemonic (_("_Search: ")); ++ dialog->search_entry = gtk_entry_new (); ++ g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->search_label), GTK_WIDGET (dialog->search_entry)); + +- dialog->search_entry = gtk_entry_new (); + g_signal_connect (G_OBJECT (dialog->search_entry), "changed", +- G_CALLBACK (panel_addto_search_entry_changed), dialog); ++ G_CALLBACK (panel_addto_relayout_for_search), dialog); + g_signal_connect (G_OBJECT (dialog->search_entry), "activate", +- G_CALLBACK (panel_addto_search_entry_activated), dialog); +- +- gtk_box_pack_end (GTK_BOX (find_hbox), dialog->search_entry, +- TRUE, TRUE, 0); +- +- gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->label), +- dialog->search_entry); +- +- sw = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), +- GTK_POLICY_AUTOMATIC, +- GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), +- GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (inner_vbox), sw, TRUE, TRUE, 0); +- +- dialog->tree_view = gtk_tree_view_new (); +- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), +- FALSE); +- gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->tree_view)); ++ G_CALLBACK (panel_addto_activate_from_searchbar), dialog); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET(label_image), ++ FALSE, FALSE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), dialog->label, ++ TRUE, TRUE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_label), ++ FALSE, FALSE, 0); + +- renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, +- "xpad", 4, +- "ypad", 4, +- NULL); ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_entry), ++ TRUE, TRUE, 0); + +- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), +- -1, NULL, +- renderer, +- "pixbuf", COLUMN_ICON, +- NULL); +- renderer = gtk_cell_renderer_text_new (); +- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); +- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), +- -1, NULL, +- renderer, +- "markup", COLUMN_TEXT, +- NULL); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), top_hbox, ++ FALSE, FALSE, 0); + +- //FIXME use the same search than the one for the search entry? +- gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), +- COLUMN_SEARCH); ++ /* Launcher button */ ++ launchers_tooltips = gtk_tooltips_new (); ++ dialog->launcher_button = gtk_button_new_with_mnemonic (_("A_pplication Launcher...")); ++ launcher_pixbuf = panel_addto_make_pixbuf_for_launcher (PANEL_ICON_LAUNCHER); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->launcher_button, _("Launch a program that is already in the GNOME menu"), NULL); ++ g_signal_connect_swapped (dialog->launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->launcher_button, ++ FALSE, FALSE, 0); + +- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view), +- panel_addto_separator_func, +- GINT_TO_POINTER (COLUMN_TEXT), +- NULL); +- ++ /* Custom launcher button*/ ++ dialog->custom_launcher_button = gtk_button_new_with_mnemonic (_("Custom Application _Launcher")); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->custom_launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->custom_launcher_button, _("Create a new launcher"), NULL); ++ g_signal_connect_swapped (dialog->custom_launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_custom_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->custom_launcher_button, ++ FALSE, FALSE, 0); + +- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); +- gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ if (panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); + +- column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->tree_view), +- COLUMN_TEXT); +- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), launchers_hbox, ++ FALSE, FALSE, 0); + +- g_signal_connect (selection, "changed", +- G_CALLBACK (panel_addto_selection_changed), +- dialog); ++ dialog->applets_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_SHADOW_IN); + +- g_signal_connect (dialog->tree_view, "row-activated", +- G_CALLBACK (panel_addto_selection_activated), +- dialog); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), dialog->applets_sw, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (bottom_hbox), dialog->statuslabel, FALSE, FALSE, 0); + +- gtk_container_add (GTK_CONTAINER (sw), dialog->tree_view); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), bottom_hbox, ++ FALSE, FALSE, 0); + + gtk_widget_show_all (vbox); + ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->label), ++ dialog->canvas); ++ + panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel); + panel_widget_register_open_dialog (panel_widget, + dialog->addto_dialog); +- + panel_addto_name_change (dialog, + panel_toplevel_get_name (dialog->panel_widget->toplevel)); + + return dialog; + } + +-#define MAX_ADDTOPANEL_HEIGHT 490 ++#define MAX_ADDTOPANEL_HEIGHT 540 + + void + panel_addto_present (GtkMenuItem *item, +@@ -1443,6 +1471,7 @@ + PanelAddtoDialog *dialog; + PanelToplevel *toplevel; + PanelData *pd; ++ GtkAdjustment *sw_adjustment = NULL; + GdkScreen *screen; + gint screen_height; + gint height; +@@ -1463,12 +1492,24 @@ + + if (!dialog) { + dialog = panel_addto_dialog_new (panel_widget); ++ + panel_addto_present_applets (dialog); ++ panel_addto_init_categories (dialog); ++ ++ dialog->canvas = panel_addto_canvas_new (dialog->info); ++ gtk_container_add (GTK_CONTAINER (dialog->applets_sw), ++ GTK_WIDGET (dialog->canvas)); + } + ++ sw_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw)); + dialog->insertion_position = pd ? pd->insertion_pos : -1; + gtk_window_set_screen (GTK_WINDOW (dialog->addto_dialog), screen); + gtk_window_set_default_size (GTK_WINDOW (dialog->addto_dialog), +- height * 8 / 7, height); ++ height * 1.35, height); + gtk_window_present (GTK_WINDOW (dialog->addto_dialog)); ++ ++ sw_adjustment->value = sw_adjustment->lower; ++ sw_adjustment->step_increment = 55; ++ gtk_adjustment_clamp_page (sw_adjustment, sw_adjustment->lower, sw_adjustment->upper); ++ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw), sw_adjustment); + } +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-canvas.c gnome-panel-2.19.2.new/gnome-panel/panel-addto-canvas.c +--- gnome-panel-2.19.2/gnome-panel/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-canvas.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,2309 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto.h" ++#include "panel-profile.h" ++ ++#define PAD 5 /*when scrolling keep a few pixels above or below if possible */ ++#define ABOVE_LINE_SPACING 0 ++#define UNDER_LINE_SPACING 0 ++#define UNDER_TITLE_SPACING 0 /* manually insert 1 blank line of text */ ++#define LINE_HEIGHT 1 ++#define BORDERS 7 ++#define MAX_ITEM_WIDTH 125 ++#define ITEMS_SEPARATION 7 ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) ++ ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ gboolean visible; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++typedef struct { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ gboolean visible; ++} CategoryInfo; ++ ++enum { ++ SELECTION_CHANGED, ++ LAST_SIGNAL ++}; ++ ++enum { ++ PROP_0, ++ PROP_INFO ++}; ++ ++ ++static guint panel_addto_canvas_signals [LAST_SIGNAL] = { 0 }; ++ ++ ++static void panel_addto_canvas_class_init (PanelAddtoCanvasClass *class); ++static void panel_addto_canvas_init (PanelAddtoCanvas *canvas); ++static void panel_addto_canvas_finalize (GObject *object); ++static void panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height); ++static void panel_addto_canvas_size_allocate (GtkWidget *canvas, ++ GtkAllocation *allocation); ++static void panel_addto_canvas_style_set (GtkWidget *canvas, ++ GtkStyle *previous_style); ++static void panel_addto_canvas_realize (GtkWidget *canvas); ++ ++static void panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas); ++static void build_canvas (PanelAddtoCanvas *canvas); ++static void relayout_canvas (PanelAddtoCanvas *canvas); ++static void set_style (PanelAddtoCanvas *canvas, gboolean font_changed); ++ ++G_DEFINE_TYPE (PanelAddtoCanvas, panel_addto_canvas, GNOME_TYPE_CANVAS); ++ ++ ++static AtkObject* panel_addto_canvas_get_accessible (GtkWidget *widget); ++ ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++#include "panel-profile.h" ++ ++static void ++panel_addto_canvas_class_init (PanelAddtoCanvasClass *class) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (class); ++ GnomeCanvasClass *canvas_class = GNOME_CANVAS_CLASS (class); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); ++ ++ object_class->set_property = panel_addto_canvas_set_property; ++ object_class->get_property = panel_addto_canvas_get_property; ++ object_class->finalize = panel_addto_canvas_finalize; ++ canvas_class->draw_background = panel_addto_canvas_draw_background; ++ ++ widget_class->style_set = panel_addto_canvas_style_set; ++ widget_class->size_allocate = panel_addto_canvas_size_allocate; ++ widget_class->realize = panel_addto_canvas_realize; ++ widget_class->get_accessible = panel_addto_canvas_get_accessible; ++ ++ class->changed = NULL; ++ ++ g_object_class_install_property (object_class, ++ PROP_INFO, ++ g_param_spec_pointer ("info", ++ "information for the canvas", ++ "information for the canvas", ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ++ panel_addto_canvas_signals [SELECTION_CHANGED] = ++ g_signal_new ("selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (PanelAddtoCanvasClass, changed), ++ NULL, NULL, ++ g_cclosure_marshal_VOID__STRING, ++ G_TYPE_NONE, 1, ++ G_TYPE_STRING); ++ ++ g_type_class_add_private (object_class, ++ sizeof (PanelAddtoCanvasPrivate)); ++} ++ ++ ++static void ++panel_addto_canvas_init (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ g_return_if_fail (PANEL_ADDTO_IS_CANVAS (canvas)); ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ priv->max_width = 300; ++ priv->min_height = 0; ++ priv->info = NULL; ++ priv->selected = NULL; ++ ++ priv->max_item_width = 0; ++ priv->max_item_height = 0; ++ priv->items_per_row = 0; ++ priv->rtl = (gtk_widget_get_direction (GTK_WIDGET (canvas)) == GTK_TEXT_DIR_RTL); ++ priv->accessible_children = g_hash_table_new (g_int_hash, g_int_equal); ++ ++ gtk_widget_show_all (GTK_WIDGET (canvas)); ++} ++ ++static void ++panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ priv->info = g_value_get_pointer (value); ++ build_canvas (PANEL_ADDTO_CANVAS (object)); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ g_value_set_pointer (value, priv->info); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) ++ (* G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) (object); ++} ++ ++ ++static void ++panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ /* By default, we use the style base color. */ ++ gdk_gc_set_foreground (canvas->pixmap_gc, ++ >K_WIDGET (canvas)->style->base[GTK_STATE_NORMAL]); ++ gdk_draw_rectangle (drawable, ++ canvas->pixmap_gc, ++ TRUE, ++ 0, 0, ++ width, height); ++} ++ ++static void ++panel_addto_canvas_size_allocate(GtkWidget *canvas, GtkAllocation *allocation) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) (canvas, allocation); ++ ++ if (allocation->height == 1 || allocation->width == 1) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_width = allocation->width; ++ priv->min_height = allocation->height; ++ ++ relayout_canvas (PANEL_ADDTO_CANVAS (canvas)); ++ ++ gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, priv->width - 1, priv->height - 1); ++ g_object_set (priv->under_cover, ++ "x2", priv->width, ++ "y2", priv->height, ++ NULL); ++} ++ ++static void ++panel_addto_canvas_realize (GtkWidget *canvas) ++{ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) (canvas); ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), FALSE); ++} ++ ++static void ++panel_addto_canvas_style_set (GtkWidget *canvas, GtkStyle *previous_style) ++{ ++ if (!GTK_WIDGET_REALIZED (canvas)) ++ return; ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), (previous_style && ++ canvas->style && ++ !pango_font_description_equal (canvas->style->font_desc, ++ previous_style->font_desc))); ++} ++ ++static void ++gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) ++{ ++ if (show) ++ gnome_canvas_item_show (item); ++ else ++ gnome_canvas_item_hide (item); ++} ++ ++static void ++setup_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ GtkWidget *widget; ++ GtkStateType state; ++ ++ if (!entry) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ widget = GTK_WIDGET (canvas); ++ ei = entry->user_data; ++ ++ if (ei->pixbuf) { ++ gnome_canvas_item_show_hide (ei->highlight_pixbuf, ei->highlighted); ++ gnome_canvas_item_show_hide (ei->pixbuf, !ei->highlighted); ++ } ++ if (!ei->selected) ++ state = GTK_STATE_NORMAL; ++ else if (gtk_window_has_toplevel_focus (GTK_WINDOW (gtk_widget_get_toplevel (widget)))) ++ state = GTK_STATE_SELECTED; ++ else ++ state = GTK_STATE_ACTIVE; ++ gnome_canvas_item_show_hide (ei->selection, ei->selected); ++ g_object_set (ei->selection, ++ "fill_color_gdk", &widget->style->base [state], ++ NULL); ++ g_object_set (ei->text, ++ "fill_color_gdk", &widget->style->text [state], ++ NULL); ++} ++ ++static gboolean ++cb_entry_info_reset (gpointer data) ++{ ++ EntryInfo *ei = data; ++ ei->launching = FALSE; ++ return FALSE; ++} ++ ++ ++void ++activate_entry (PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ ++ if (!ei->launching) { ++ ei->launching = TRUE; ++ gtk_timeout_add (1000, cb_entry_info_reset, ei); ++ ++ if (panel_addto_add_item (entry->dialog, entry->item_info)) ++ gtk_widget_destroy (entry->dialog->addto_dialog); ++ } ++} ++ ++static void ++panel_addto_drag_data_get_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ const char *string) ++{ ++ gtk_selection_data_set (selection_data, ++ selection_data->target, 8, (guchar *) string, ++ strlen (string)); ++} ++ ++static void ++panel_addto_drag_begin_cb (GtkWidget *canvas, ++ GdkDragContext *context, ++ gpointer data) ++{ ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = priv->selected; ++ gtk_drag_set_icon_pixbuf (context, entry->icon_pixbuf, 0, 0); ++} ++ ++static void ++panel_addto_setup_drag (PanelAddtoCanvas *canvas, ++ const GtkTargetEntry *target, ++ const char *text) ++{ ++ if (!text || panel_lockdown_get_locked_down ()) ++ return; ++ ++ ++ gtk_drag_source_set (GTK_WIDGET (canvas), ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ target, 1, GDK_ACTION_COPY); ++ ++ g_signal_connect_data (G_OBJECT (canvas), "drag_data_get", ++ G_CALLBACK (panel_addto_drag_data_get_cb), ++ g_strdup (text), ++ (GClosureNotify) g_free, ++ 0 /* connect_flags */); ++ g_signal_connect_after (G_OBJECT (canvas), "drag-begin", ++ G_CALLBACK (panel_addto_drag_begin_cb), ++ NULL); ++} ++ ++static void ++panel_addto_setup_launcher_drag (PanelAddtoCanvas *canvas, ++ const char *uri) ++{ ++ static GtkTargetEntry target[] = { ++ { "text/uri-list", 0, 0 } ++ }; ++ char *uri_list; ++ ++ uri_list = g_strconcat (uri, "\r\n", NULL); ++ panel_addto_setup_drag (canvas, target, uri_list); ++ g_free (uri_list); ++} ++ ++static void ++panel_addto_setup_applet_drag (PanelAddtoCanvas *canvas, ++ const char *iid) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-iid", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, iid); ++} ++ ++ ++ ++static void ++panel_addto_setup_internal_applet_drag (PanelAddtoCanvas *canvas, ++ const char *applet_type) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-internal", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, applet_type); ++} ++ ++static void ++panel_addto_selection_changed (PanelAddtoCanvas *canvas, ++ const gchar *status_display, ++ PanelAddtoDialog *dialog) ++{ ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ data = priv->selected ? priv->selected->item_info : NULL; ++ ++ ++ if ((!priv->selected) || (!data)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ if (dialog->statuslabel) ++ gtk_label_set_text (GTK_LABEL (dialog->statuslabel), priv->selected->comment); ++ ++ if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_GO_FORWARD); ++ } else { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ } ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++} ++ ++static void ++select_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoDialog *dialog; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei = NULL; ++ GtkAdjustment *pos; ++ double affine[6]; ++ PanelAddtoEntry *selected; ++ ++ dialog = entry->dialog; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ selected = priv->selected; ++ ++ if (selected == entry) ++ return; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = FALSE; ++ setup_entry (canvas, selected); ++ ++ priv->selected = selected = entry; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = TRUE; ++ setup_entry (canvas, selected); ++ ++ g_signal_emit (canvas, panel_addto_canvas_signals [SELECTION_CHANGED], 0, ++ (entry) ? entry->comment : NULL); ++ ++ if (!entry) ++ return; ++ ++ ei = entry->user_data; ++ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ei->group), affine); ++ pos = gtk_layout_get_vadjustment (GTK_LAYOUT (ei->cover->canvas)); ++ ++ if (affine[5] < pos->value) ++ gtk_adjustment_set_value (pos, MAX (affine[5] - PAD, 0)); ++ else if ((affine[5] + priv->max_item_height) > (pos->value+pos->page_size)) ++ gtk_adjustment_set_value (pos, MAX (MIN (affine[5] + priv->max_item_height + PAD, pos->upper) - pos->page_size, 0)); ++} ++ ++static gboolean ++cover_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ PanelAddtoCanvas *canvas = ei->canvas; ++ PanelAddtoItemInfo *data; ++ PanelAddtoDialog *dialog = entry->dialog; ++ char *iid; ++ ++ data = entry->item_info; ++ ++ switch (event->type) { ++ case GDK_ENTER_NOTIFY: ++ ei->highlighted = TRUE; ++ setup_entry (canvas, entry); /* highlight even if it is already selected */ ++ ++ /* only allow dragging applets if we can add applets */ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_setup_launcher_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_APPLET: ++ panel_addto_setup_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ case PANEL_ADDTO_LAUNCHER_MENU: ++ break; ++ case PANEL_ADDTO_MENU: ++ /* build the iid for menus other than the main menu */ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ } ++ } ++ ++ return TRUE; ++ case GDK_LEAVE_NOTIFY: ++ ei->highlighted = FALSE; ++ setup_entry (canvas, entry); ++ return TRUE; ++ case GDK_BUTTON_PRESS: ++ select_entry (canvas, entry); ++ gtk_widget_grab_focus (GTK_WIDGET (canvas)); ++ return TRUE; ++ case GDK_2BUTTON_PRESS: ++ if (event->button.button == 1) ++ activate_entry (entry); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++static void ++panel_addto_select_first_entry (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCategory *category; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ category = g_slist_nth_data (priv->info->categories, 0); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ select_entry (canvas, entry); ++} ++ ++static gint ++panel_addto_count_visible_entries (PanelAddtoCategory *category) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint n_visible_entries = 0; ++ ++ for (l = category->entries; l; l = l->next) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ n_visible_entries++; ++ } ++ return n_visible_entries; ++} ++ ++static gint ++panel_addto_get_rank_of_nth_visible_entry (PanelAddtoCategory *category, gint n) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_visible_entries = 0; ++ gint seen_entries = 0; ++ gint farthest_visible_entry = 0; ++ ++ l = category->entries; ++ ++ while (seen_visible_entries < n) { ++ if (!l) break; ++ seen_entries++; ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) { ++ seen_visible_entries++; ++ farthest_visible_entry = seen_entries; ++ } ++ l = l->next; ++ } ++ ++ return (farthest_visible_entry - 1); ++} ++ ++static gint ++panel_addto_how_many_visible_entries_before_me (PanelAddtoCategory *category, gint rank) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_entries = 0; ++ gint seen_visible_entries = 0; ++ ++ l = category->entries; ++ while (seen_entries < rank) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ seen_visible_entries++; ++ l = l->next; ++ seen_entries++; ++ } ++ return seen_visible_entries; ++} ++ ++static void ++panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == category->n_entries - 1) { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category + 1); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_west_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == 0) { ++ if (n_category == 0) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category - 1); ++ entry = g_slist_nth_data (category->entries, category->n_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_north_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ if (n_visible_entries_before_me + 1 - priv->items_per_row <= 0) { ++ if (n_category == 0) { ++ panel_addto_select_first_entry (canvas); ++ return; ++ } ++ n_category--; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, --n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row ++ + ((n_visible_entries_before_me + 1) % priv->items_per_row))); ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_south_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ if (n_visible_entries_before_me + 1 + priv->items_per_row > n_visible_entries - 1) { ++ if (n_visible_entries_before_me + 1 ++ <= ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row) { ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } else { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ n_category++; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ei->n_entry % priv->items_per_row); ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, ++n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ (n_visible_entries_before_me + 1) % priv->items_per_row)); ++ ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static gboolean ++cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvas *canvas = (PanelAddtoCanvas *) dialog->canvas; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ EntryInfo *ei = NULL; ++ gint n_category, n_entry; ++ gint n_categories, n_entries; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (event->type == GDK_BUTTON_PRESS) { ++ gtk_drag_source_unset (GTK_WIDGET (canvas)); ++ select_entry (canvas, NULL); ++ gtk_widget_grab_focus (GTK_WIDGET (dialog->canvas)); ++ return TRUE; ++ } ++ ++ if (event->type != GDK_KEY_PRESS) ++ return FALSE; ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (priv->selected) { ++ ei = priv->selected->user_data; ++ current_category = g_slist_nth_data (priv->info->categories, ei->n_category); ++ n_entries = current_category->n_entries; ++ } ++ ++ switch (event->key.keyval) { ++ case GDK_KP_Right: ++ case GDK_Right: ++ if (priv->rtl) ++ panel_addto_select_west_entry (ei, canvas); ++ else ++ panel_addto_select_east_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Left: ++ case GDK_Left: ++ if (priv->rtl) ++ panel_addto_select_east_entry (ei, canvas); ++ else ++ panel_addto_select_west_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Down: ++ case GDK_Down: ++ panel_addto_select_south_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Up: ++ case GDK_Up: ++ panel_addto_select_north_entry (ei, canvas); ++ return TRUE; ++ case GDK_Tab: ++ case GDK_KP_Tab: ++ case GDK_ISO_Left_Tab: ++ gtk_widget_grab_focus (dialog->search_entry); ++ break; ++ case GDK_Return: ++ case GDK_KP_Enter: ++ if (priv->selected) ++ activate_entry (priv->selected); ++ ++ return TRUE; ++ break; ++ case GDK_Escape: ++ panel_addto_dialog_response (dialog->addto_dialog, ++ GTK_RESPONSE_CANCEL, ++ dialog); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++ ++static void ++calculate_item_width (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PangoLayout *layout; ++ PangoRectangle rectangle; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ layout = GNOME_CANVAS_TEXT (ei->text)->layout; ++ ++ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); ++ pango_layout_set_width (layout, -1); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ ++ /* If its too big wrap at the max and regen to find the layout */ ++ if (rectangle.width > MAX_ITEM_WIDTH) { ++ pango_layout_set_width (layout, MAX_ITEM_WIDTH * PANGO_SCALE); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ rectangle.width = MAX_ITEM_WIDTH; ++ } ++ ++ ei->text_height = rectangle.height; ++ ++ priv->max_item_width = MAX (priv->max_item_width, rectangle.width); ++} ++ ++static void ++calculate_item_height (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ gint item_height; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (ei->pixbuf) ++ priv->max_icon_height = MAX (priv->max_icon_height, ei->icon_height); ++ ++ item_height = ei->icon_height + ei->text_height; ++ priv->max_item_height = MAX (priv->max_item_height, item_height); ++} ++ ++static void ++calculate_sizes (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_item_height = 0; ++ priv->max_icon_height = 0; ++ priv->max_item_width = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *ei = current_entry->user_data; ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ } ++ } ++} ++ ++static void ++gnome_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy) ++{ ++ double translate[6]; ++ ++ g_return_if_fail (item != NULL); ++ g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); ++ ++ art_affine_translate (translate, dx, dy); ++ ++ gnome_canvas_item_affine_absolute (item, translate); ++} ++ ++static guchar ++lighten_component (guchar cur_value) ++{ ++ int new_value = cur_value; ++ new_value += 24 + (new_value >> 3); ++ if (new_value > 255) { ++ new_value = 255; ++ } ++ return (guchar) new_value; ++} ++ ++static GdkPixbuf * ++create_spotlight_pixbuf (GdkPixbuf* src) ++{ ++ GdkPixbuf *dest; ++ int i, j; ++ int width, height, has_alpha, src_row_stride, dst_row_stride; ++ guchar *target_pixels, *original_pixels; ++ guchar *pixsrc, *pixdest; ++ ++ g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL); ++ g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 3) ++ || (gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 4), NULL); ++ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL); ++ ++ dest = gdk_pixbuf_copy (src); ++ ++ has_alpha = gdk_pixbuf_get_has_alpha (src); ++ width = gdk_pixbuf_get_width (src); ++ height = gdk_pixbuf_get_height (src); ++ dst_row_stride = gdk_pixbuf_get_rowstride (dest); ++ src_row_stride = gdk_pixbuf_get_rowstride (src); ++ target_pixels = gdk_pixbuf_get_pixels (dest); ++ original_pixels = gdk_pixbuf_get_pixels (src); ++ ++ for (i = 0; i < height; i++) { ++ pixdest = target_pixels + i * dst_row_stride; ++ pixsrc = original_pixels + i * src_row_stride; ++ for (j = 0; j < width; j++) { ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ if (has_alpha) { ++ *pixdest++ = *pixsrc++; ++ } ++ } ++ } ++ ++ return dest; ++} ++ ++static void ++build_canvas (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ EntryInfo *ei; ++ PanelAddtoDialog *dialog; ++ PanelAddtoCategory *current_category = NULL; ++ PanelAddtoInformation *current_info = NULL; ++ PanelAddtoEntry *current_entry = NULL; ++ PanelAddtoCanvasPrivate *priv; ++ GnomeCanvas *gcanvas; ++ GnomeCanvasGroup *hidden_group; ++ int i, j, index; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gcanvas = GNOME_CANVAS (canvas); ++ current_category = priv->info->categories->data; ++ current_entry = current_category->entries->data; ++ dialog = current_entry->dialog; ++ index = 0; ++ ++ priv->under_cover = gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ panel_addto_event_box_get_type(), ++ NULL); ++ ++ current_info = priv->info; ++ gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (gnome_canvas_root (gcanvas))); ++ g_signal_connect (gnome_canvas_root (gcanvas), "event", ++ G_CALLBACK (cb_canvas_event), dialog); ++ ++ hidden_group = GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ for (l = priv->info->categories, i = 0; l; l = l->next, i++) { ++ ++ CategoryInfo *catinfo; ++ current_category = l->data; ++ ++ if (current_category->user_data == NULL) ++ current_category->user_data = g_new (CategoryInfo, 1); ++ ++ catinfo = current_category->user_data; ++ catinfo->group = NULL; ++ catinfo->title = NULL; ++ catinfo->line = NULL; ++ ++ catinfo->group = ++ GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), 0, BORDERS); ++ ++ catinfo->line = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_rect_get_type (), ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ ++ catinfo->title = NULL; ++ ++ if (current_category && (priv->info->n_categories != 1)) { ++ char *label = g_strdup_printf ("%s", current_category->title); ++ catinfo->title = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_text_get_type (), ++ "text", current_category->title, ++ "markup", label, ++ "anchor", GTK_ANCHOR_NW, ++ NULL); ++ g_free (label); ++ } ++ ++ for (m = current_category->entries, j = 0; m; m = m->next, j++) { ++ current_entry = m->data; ++ ++ if (current_entry->user_data == NULL) ++ current_entry->user_data = g_new0 (EntryInfo, 1); ++ ++ ei = current_entry->user_data; ++ ++ ei->canvas = canvas; ++ ei->group = GNOME_CANVAS_GROUP ( ++ gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_group_get_type (), ++ NULL)); ++ ei->selection = gnome_canvas_item_new ( ++ ei->group, ++ PANEL_ADDTO_TYPE_ROUNDED_RECT, ++ NULL); ++ ++ if (current_entry->title) { ++ ei->text = gnome_canvas_item_new (ei->group, ++ gnome_canvas_text_get_type (), ++ "anchor", GTK_ANCHOR_NW, ++ "justification", GTK_JUSTIFY_CENTER, ++ "clip", TRUE, ++ NULL); ++ pango_layout_set_alignment (GNOME_CANVAS_TEXT (ei->text)->layout, ++ PANGO_ALIGN_CENTER); ++ pango_layout_set_justify (GNOME_CANVAS_TEXT (ei->text)->layout, ++ FALSE); ++ g_object_set (ei->text, ++ "text", current_entry->title, ++ NULL); ++ } else ++ ei->text = NULL; ++ ++ if (current_entry->icon_pixbuf) { ++ GdkPixbuf *pixbuf = current_entry->icon_pixbuf; ++ GdkPixbuf *highlight_pixbuf = ++ create_spotlight_pixbuf (pixbuf); ++ ++ ei->icon_height = gdk_pixbuf_get_height (pixbuf); ++ ei->icon_width = gdk_pixbuf_get_width (pixbuf); ++ ei->pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", pixbuf, ++ NULL); ++ g_object_unref (pixbuf); ++ ei->highlight_pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", highlight_pixbuf, ++ NULL); ++ g_object_unref (highlight_pixbuf); ++ } else { ++ ei->pixbuf = NULL; ++ ei->highlight_pixbuf = NULL; ++ } ++ ++ ei->cover = gnome_canvas_item_new (ei->group, ++ panel_addto_event_box_get_type(), ++ NULL); ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ ++ ei->n_category = i; ++ ei->n_entry = j; ++ ei->index = index; ++ ++ setup_entry (canvas, current_entry); ++ ++ g_signal_connect (ei->cover, "event", ++ G_CALLBACK (cover_event), ++ current_entry); ++ index++; ++ } ++ } ++ ++ dialog = current_entry->dialog; ++ ++ g_signal_connect (G_OBJECT (canvas), "selection-changed", ++ G_CALLBACK (panel_addto_selection_changed), current_entry->dialog); ++} ++ ++ ++static const char * ++panel_addto_utf8_casestrstr (const char *haystack, const char *needle) ++{ ++ ++ if (!haystack) ++ return NULL; ++ ++ haystack = g_utf8_strdown (haystack, -1); ++ needle = g_utf8_strdown (needle, -1); ++ ++ const char *s; ++ gsize i; ++ gsize haystack_len = g_utf8_strlen (haystack, -1); ++ gsize needle_len = g_utf8_strlen (needle, -1); ++ int needle_size = strlen (needle); ++ ++ if (needle_len > haystack_len) ++ return NULL; ++ ++ s = haystack; ++ for (i = 0; i <= haystack_len - needle_len; i++) { ++ if (strncmp (s, needle, needle_size) == 0) ++ return s; ++ s = g_utf8_next_char (s); ++ } ++ ++ return NULL; ++} ++ ++void ++panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ gchar *search_text; ++ PanelAddtoCanvasPrivate *priv; ++ ++ search_text = g_malloc (strlen ((gchar*) gtk_entry_get_text (GTK_ENTRY (search_entry))) + 1); ++ g_stpcpy (search_text, gtk_entry_get_text (GTK_ENTRY (search_entry))); ++ g_strchomp (search_text); ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ priv->search_text = search_text; ++ gtk_widget_queue_resize (GTK_WIDGET (dialog->canvas)); ++ } ++} ++ ++void ++panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv->selected) ++ activate_entry (priv->selected); ++} ++ ++/* If we can't find the search query in the applet's name, in the applet's ++ * description, nor in the applet's category, then the applet has to be hidden. ++ */ ++ ++static gboolean ++panel_addto_entry_must_be_hidden (PanelAddtoEntry *entry, const gchar **search_terms) ++{ ++ gint i; ++ gint nb_search_terms = 0, nb_found = 0; ++ gboolean search_is_null = TRUE; ++ ++ for (i = 0; search_terms[i] != NULL; i++) { ++ nb_search_terms ++; ++ search_is_null = FALSE; ++ if ( ++ (entry->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->comment ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->comment, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->category->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->category->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL)))) ++ nb_found++; ++ } ++ ++ if (search_is_null || nb_found == nb_search_terms) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++/* A category canvas item contains all the elements ++ * for the category, as well as the title and a separator ++ */ ++static void ++relayout_category (PanelAddtoCanvas *canvas, CategoryInfo *catinfo, ++ gint vert_pos, gint *category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), ++ 0, vert_pos); ++ ++ if (catinfo->line) { ++ gnome_canvas_item_move_absolute (catinfo->line, BORDERS, ABOVE_LINE_SPACING); ++ ++ gnome_canvas_item_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ if (catinfo->title) { ++ double text_height, text_width; ++ ++ g_object_get (catinfo->title, ++ "text_height", &text_height, ++ "text_width", &text_width, ++ NULL); ++ ++ *category_vert_pos += text_height; /* move it down 1 line */ ++ gnome_canvas_item_move_absolute (catinfo->title, ++ (priv->rtl) ? priv->max_width - BORDERS - text_width : BORDERS, ++ *category_vert_pos); ++ *category_vert_pos += text_height + text_height/2 + UNDER_TITLE_SPACING; ++ } ++} ++ ++static void ++relayout_item (PanelAddtoCanvas *canvas, EntryInfo *ei, ++ gint category_horiz_pos, gint category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (ei->group), ++ category_horiz_pos, ++ category_vert_pos); ++ ++ gnome_canvas_item_set (ei->selection, ++ "x2", (double) priv->max_item_width + 2 * PAD, ++ "y2", (double) ei->text_height + 1, /* expand it down slightly */ ++ NULL); ++ ++ gnome_canvas_item_move_absolute (ei->selection, -PAD, priv->max_icon_height); ++ ++ if (ei->text) { ++ /* canvas asks layout for its extent, layout gives real ++ * size, not fixed width and drawing gets confused. ++ */ ++ gnome_canvas_item_set (ei->text, ++ "clip_width", (double) priv->max_item_width, ++ "clip_height", (double) priv->max_item_height, ++ NULL); ++ ++ /* text is centered by pango */ ++ pango_layout_set_width (GNOME_CANVAS_TEXT (ei->text)->layout, ++ (gint) priv->max_item_width * PANGO_SCALE); ++ ++ gnome_canvas_item_move_absolute (ei->text, ++ 0, priv->max_icon_height); ++ } ++ ++ if (ei->pixbuf) { ++ /* manually center the icon */ ++ gnome_canvas_item_move_absolute (ei->pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ gnome_canvas_item_move_absolute (ei->highlight_pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ } ++ ++ /* cover the item */ ++ gnome_canvas_item_set (ei->cover, ++ "x2", (double) priv->max_item_width, ++ "y2", (double) priv->max_item_height, ++ NULL); ++} ++ ++static void ++relayout_canvas (PanelAddtoCanvas *canvas) ++{ ++ gint entry; ++ gint vert_pos, category_vert_pos, category_horiz_pos; ++ gint real_width; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ CategoryInfo *catinfo; ++ EntryInfo *ei; ++ GSList *l, *m; ++ gboolean at_least_one_found, first_shown_category, first_shown_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ real_width = priv->max_width - 2 * BORDERS + ITEMS_SEPARATION; ++ priv->items_per_row = real_width / ((gint) priv->max_item_width + ITEMS_SEPARATION); ++ ++ vert_pos = BORDERS; ++ ++ const gchar *search_text = priv->search_text; ++ gchar **search_terms; ++ search_terms = search_text ? g_strsplit (search_text, " ", 0) : NULL; ++ ++ first_shown_category = TRUE; ++ first_shown_entry = TRUE; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ ++ at_least_one_found = FALSE; ++ category_vert_pos = 0; ++ ++ category_horiz_pos = (priv->rtl) ? priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ ++ current_category = l->data; ++ catinfo = current_category->user_data; ++ ++ relayout_category (canvas, catinfo, vert_pos, &category_vert_pos); ++ category_vert_pos += UNDER_LINE_SPACING; ++ ++ for (m = current_category->entries, entry = 0; m; m = m->next, entry++) { ++ ++ current_entry = m->data; ++ ei = current_entry->user_data; ++ ++ /* we don't want the first item to wrap, it would ++ be too separated from the section title */ ++ ++ if (!search_text || !panel_addto_entry_must_be_hidden (current_entry, (const gchar **)search_terms)) { ++ at_least_one_found = TRUE; ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = TRUE; ++ if ((entry > 0) && ++ ((priv->items_per_row == 0) || ++ (priv->items_per_row > 0 && (entry % priv->items_per_row == 0)))) { ++ ++ category_horiz_pos = (priv->rtl) ? ++ priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ category_vert_pos += (gint) priv->max_item_height + ITEMS_SEPARATION; ++ } ++ ++ relayout_item (canvas, ei, category_horiz_pos, category_vert_pos); ++ ++ if (priv->rtl) ++ category_horiz_pos -= (gint) priv->max_item_width + ITEMS_SEPARATION; ++ else ++ category_horiz_pos += (gint) priv->max_item_width + ITEMS_SEPARATION; ++ ++ /* If the user is actually using the search bar, select ++ * the first shown entry. ++ */ ++ if (search_text && first_shown_entry) { ++ select_entry (canvas, current_entry); ++ first_shown_entry = FALSE; ++ } ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = FALSE; ++ entry --; ++ } ++ ++ } ++ if (at_least_one_found) { ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = TRUE; ++ category_vert_pos += (gint) priv->max_item_height; ++ vert_pos += category_vert_pos + ITEMS_SEPARATION; ++ ++ if (first_shown_category) { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) 0, ++ NULL); ++ first_shown_category = FALSE; ++ } else { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = FALSE; ++ } ++ } ++ ++ /* substract the last ITEMS_SEPARATION to ++ adjust the canvas size a bit more */ ++ vert_pos -= ITEMS_SEPARATION; ++ ++ priv->height = MAX (vert_pos, priv->min_height); ++ priv->width = priv->max_width; ++} ++ ++ ++static void ++set_style (PanelAddtoCanvas *canvas, gboolean font_changed) ++{ ++ GSList *l, *m; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ PanelAddtoCanvasPrivate *priv; ++ GtkWidget *widget = GTK_WIDGET (canvas); ++ ++ ++ if (!GTK_WIDGET_REALIZED (widget)) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ CategoryInfo *catinfo = current_category->user_data; ++ ++ if (catinfo->line) { ++ g_object_set (catinfo->line, ++ "fill_color_gdk", &widget->style->text_aa[GTK_STATE_NORMAL], ++ NULL); ++ } ++ if (catinfo->title) { ++ g_object_set (catinfo->title, ++ "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL], ++ NULL); ++ ++ if (font_changed) ++ g_object_set (catinfo->title, ++ "font", NULL, ++ NULL); ++ } ++ ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *entryinfo = current_entry->user_data; ++ if (font_changed && entryinfo->text) ++ g_object_set (entryinfo->text, ++ "font", NULL, ++ NULL); ++ setup_entry (canvas, current_entry); ++ } ++ } ++ ++ if (font_changed) { ++ calculate_sizes (canvas); ++ relayout_canvas (canvas); ++ } ++} ++ ++ ++GtkWidget* ++panel_addto_canvas_new (PanelAddtoInformation *info) ++{ ++ ++ return g_object_new (PANEL_ADDTO_TYPE_CANVAS, ++ "info", info, ++ NULL); ++} ++ ++/* Accessibility support */ ++ ++static gpointer accessible_parent_class; ++static gpointer accessible_item_parent_class; ++ ++enum { ++ ACTION_ACTIVATE, ++ LAST_ACTION ++}; ++ ++typedef struct { ++ AtkObject parent; ++ ++ PanelAddtoEntry *entry; ++ AtkStateSet *state_set; ++ ++ guint action_idle_handler; ++} PanelAddtoCanvasItemAccessible; ++ ++typedef struct { ++ AtkObjectClass parent_class; ++} PanelAddtoCanvasItemAccessibleClass; ++ ++static const gchar *const action_names[] = ++{ ++ "activate", ++ NULL ++}; ++ ++static const gchar *const action_descriptions[] = ++{ ++ "Activate item", ++ NULL ++}; ++ ++static void ++panel_addto_canvas_item_accessible_get_extents (AtkComponent *component, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ AtkCoordType coord_type) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ GnomeCanvasItem *cover; ++ AtkObject *parent_object; ++ gint p_x, p_y; ++ ++ item = (PanelAddtoCanvasItemAccessible *) component; ++ ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ parent_object = gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++ atk_component_get_position (ATK_COMPONENT (parent_object), &p_x, &p_y, coord_type); ++ ++ ++ /* the cover pretty much represents the item size */ ++ ++ ++ cover = GNOME_CANVAS_ITEM (((EntryInfo *)item->entry->user_data)->cover); ++ ++ *x = p_x + cover->x1; ++ *y = p_y + cover->y1; ++ *width = cover->x2 - cover->x1; ++ *height = cover->y2 - cover->y1; ++} ++ ++static void ++atk_component_item_interface_init (AtkComponentIface *iface) ++{ ++ iface->get_extents = panel_addto_canvas_item_accessible_get_extents; ++} ++ ++static gboolean ++idle_do_action (gpointer data) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) data; ++ ++ item->action_idle_handler = 0; ++ activate_entry (item->entry); ++ ++ return FALSE; ++} ++ ++ ++static gboolean ++panel_addto_canvas_item_accessible_action_do_action (AtkAction *action, ++ gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (index < 0 || index >= LAST_ACTION) ++ return FALSE; ++ ++ item = (PanelAddtoCanvasItemAccessible *) action; ++ ++ switch (index) { ++ case ACTION_ACTIVATE: ++ if (!item->action_idle_handler) ++ item->action_idle_handler = g_idle_add (idle_do_action, item); ++ break; ++ default: ++ g_assert_not_reached (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_action_get_n_actions (AtkAction *action) ++{ ++ return LAST_ACTION; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_description (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_descriptions[index]; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_name (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_names[index]; ++} ++ ++static void ++atk_action_item_interface_init (AtkActionIface *iface) ++{ ++ iface->do_action = panel_addto_canvas_item_accessible_action_do_action; ++ iface->get_n_actions = panel_addto_canvas_item_accessible_action_get_n_actions; ++ iface->get_description = panel_addto_canvas_item_accessible_action_get_description; ++ iface->get_name = panel_addto_canvas_item_accessible_action_get_name; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_get_index_in_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ return ((EntryInfo *) item->entry->user_data)->index; ++} ++ ++static G_CONST_RETURN gchar* ++panel_addto_canvas_item_accessible_get_name (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (object->name) ++ return object->name; ++ else { ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ if (item->entry && item->entry->title) ++ return item->entry->title; ++ else ++ return "Item with no description"; ++ } ++} ++ ++static AtkObject* ++panel_addto_canvas_item_accessible_get_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ ++ return gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++} ++ ++static AtkStateSet* ++panel_addto_canvas_item_accessible_ref_state_set (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (item->entry == priv->selected) ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED); ++ else ++ atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED); ++ ++ return g_object_ref (item->state_set); ++} ++ ++static void ++panel_addto_canvas_item_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ ++ accessible_item_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ ++ class->get_index_in_parent = panel_addto_canvas_item_accessible_get_index_in_parent; ++ class->get_name = panel_addto_canvas_item_accessible_get_name; ++ class->get_parent = panel_addto_canvas_item_accessible_get_parent; ++ class->ref_state_set = panel_addto_canvas_item_accessible_ref_state_set; ++} ++ ++static void ++panel_addto_canvas_item_accessible_object_init (PanelAddtoCanvasItemAccessible *item) ++{ ++ item->state_set = atk_state_set_new (); ++ ++ atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED); ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE); ++ ++ item->action_idle_handler = 0; ++} ++ ++static GType ++panel_addto_canvas_item_accessible_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (PanelAddtoCanvasItemAccessibleClass), ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_item_accessible_class_init, /* class init */ ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ sizeof (PanelAddtoCanvasItemAccessible), /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) panel_addto_canvas_item_accessible_object_init, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_action_info = { ++ (GInterfaceInitFunc) atk_action_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT, ++ "PanelAddtoCanvasItemAccessible", &info, 0); ++ ++ g_type_add_interface_static (type, ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ATK_TYPE_ACTION, ++ &atk_action_info); ++ } ++ ++ return type; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_n_children (AtkObject *accessible) ++{ ++ GSList *l; ++ PanelAddtoCategory *current_category; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ gint count; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ count += current_category->n_entries; ++ } ++ ++ return count; ++} ++ ++static PanelAddtoEntry* ++panel_addto_canvas_accessible_get_entry (PanelAddtoCanvas *canvas, gint index) ++{ ++ GSList *l; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ gint count; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ if (index >= count && ++ index < count + current_category->n_entries) { ++ return g_slist_nth_data (current_category->entries, index - count); ++ } else ++ count += current_category->n_entries; ++ } ++ ++ return NULL; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_child (AtkObject *accessible, gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ AtkObject *object; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = panel_addto_canvas_accessible_get_entry (canvas, index); ++ ++ if (!entry) ++ return NULL; ++ ++ object = g_hash_table_lookup (priv->accessible_children, &index); ++ ++ if (!object) { ++ object = g_object_new (panel_addto_canvas_item_accessible_get_type (), NULL); ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ object->role = ATK_ROLE_ICON; ++ item->entry = entry; ++ ++ g_hash_table_insert (priv->accessible_children, ++ &((EntryInfo *) entry->user_data)->index, object); ++ } ++ ++ return g_object_ref (object); ++} ++ ++static void ++panel_addto_canvas_accessible_initialize (AtkObject *accessible, gpointer data) ++{ ++ if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize) ++ ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data); ++ ++ accessible->role = ATK_ROLE_LAYERED_PANE; ++} ++ ++static void ++panel_addto_canvas_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ GtkAccessibleClass *accessible_class; ++ ++ accessible_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ accessible_class = (GtkAccessibleClass *)class; ++ ++ class->get_n_children = panel_addto_canvas_accessible_get_n_children; ++ class->ref_child = panel_addto_canvas_accessible_ref_child; ++ class->initialize = panel_addto_canvas_accessible_initialize; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_add_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ PanelAddtoEntry *entry; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ entry = panel_addto_canvas_accessible_get_entry (canvas, i); ++ select_entry (canvas, entry); ++ ++ return TRUE; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_clear_selection (AtkSelection *selection) ++{ ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ select_entry (canvas, NULL); ++ ++ return TRUE; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (priv->selected) ++ return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), ++ ((EntryInfo *)priv->selected->user_data)->index); ++ return NULL; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_selection_count (AtkSelection *selection) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected) ? 1 : 0; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_is_child_selected (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected == panel_addto_canvas_accessible_get_entry (canvas, i)); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_remove_selection (AtkSelection *selection, gint i) ++{ ++ /* There can be only one item selected */ ++ return panel_addto_canvas_accessible_clear_selection (selection); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_select_all_selection (AtkSelection *selection) ++{ ++ /* This can't happen */ ++ return FALSE; ++} ++ ++static void ++panel_addto_canvas_accessible_selection_interface_init (AtkSelectionIface *iface) ++{ ++ iface->add_selection = panel_addto_canvas_accessible_add_selection; ++ iface->clear_selection = panel_addto_canvas_accessible_clear_selection; ++ iface->ref_selection = panel_addto_canvas_accessible_ref_selection; ++ iface->get_selection_count = panel_addto_canvas_accessible_get_selection_count; ++ iface->is_child_selected = panel_addto_canvas_accessible_is_child_selected; ++ iface->remove_selection = panel_addto_canvas_accessible_remove_selection; ++ iface->select_all_selection = panel_addto_canvas_accessible_select_all_selection; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_accessible_at_point (AtkComponent *component, ++ gint x, ++ gint y, ++ AtkCoordType coord_type) ++{ ++ GSList *l, *m; ++ GtkWidget *widget; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ PanelAddtoCategory *current_category; ++ EntryInfo *entry; ++ gint x_pos, y_pos, x_w, y_w; ++ ++ widget = GTK_ACCESSIBLE (component)->widget; ++ ++ if (widget == NULL) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type); ++ x_w = x - x_pos; ++ y_w = y - y_pos; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ entry = (EntryInfo *) m->data; ++ ++ if (x_w > entry->cover->x1 && ++ x_w < entry->cover->x2 && ++ y_w > entry->cover->y1 && ++ y_w < entry->cover->y2) ++ return panel_addto_canvas_accessible_ref_child (ATK_OBJECT (component), entry->index); ++ } ++ } ++ ++ return NULL; ++} ++ ++static void ++atk_component_interface_init (AtkComponentIface *iface) ++{ ++ iface->ref_accessible_at_point = panel_addto_canvas_accessible_ref_accessible_at_point; ++} ++ ++static GType ++panel_addto_canvas_accessible_get_type (void) ++{ ++ static GType type = 0; ++ AtkObjectFactory *factory; ++ GType derived_type; ++ GTypeQuery query; ++ GType derived_atk_type; ++ ++ if (type == 0) { ++ static GTypeInfo info = { ++ 0, /* class size */ ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_class_init, ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ 0, /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) NULL, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_selection_info = { ++ (GInterfaceInitFunc) panel_addto_canvas_accessible_selection_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ factory = atk_registry_get_factory (atk_get_default_registry (), ++ derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ g_type_query (derived_atk_type, &query); ++ ++ info.class_size = query.class_size; ++ info.instance_size = query.instance_size; ++ ++ type = g_type_register_static (derived_atk_type, ++ "PanelAddtoCanvasAccessible", ++ &info, 0); ++ ++ g_type_add_interface_static (type, ++ ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ++ ATK_TYPE_SELECTION, ++ &atk_selection_info); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_new (GObject *object) ++{ ++ AtkObject *accessible; ++ ++ accessible = g_object_new (panel_addto_canvas_accessible_get_type (), NULL); ++ atk_object_initialize (accessible, object); ++ ++ return accessible; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_factory_create_accessible (GObject *object) ++{ ++ return panel_addto_canvas_accessible_new (object); ++} ++ ++static void ++panel_addto_canvas_accessible_factory_class_init (AtkObjectFactoryClass *class) ++{ ++ class->create_accessible = panel_addto_canvas_accessible_factory_create_accessible; ++ class->get_accessible_type = panel_addto_canvas_accessible_get_type; ++} ++ ++static GType ++panel_addto_canvas_accessible_factory_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (AtkObjectFactoryClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_factory_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (AtkObjectFactory), ++ 0, /* n_preallocs */ ++ NULL, NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, ++ "PanelAddtoCanvasAccessibleFactory", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_get_accessible (GtkWidget *widget) ++{ ++ static gboolean already_here = FALSE; ++ ++ if (!already_here) { ++ AtkObjectFactory *factory; ++ AtkRegistry *registry; ++ GType derived_type; ++ GType derived_atk_type; ++ ++ already_here = TRUE; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ ++ registry = atk_get_default_registry (); ++ factory = atk_registry_get_factory (registry, derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ ++ if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) { ++ atk_registry_set_factory_type (registry, ++ PANEL_ADDTO_TYPE_CANVAS, ++ panel_addto_canvas_accessible_factory_get_type ()); ++ } ++ } ++ ++ return (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->get_accessible) (widget); ++} +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-canvas.h gnome-panel-2.19.2.new/gnome-panel/panel-addto-canvas.h +--- gnome-panel-2.19.2/gnome-panel/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-canvas.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,88 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++#ifndef PANEL_ADDTO_CANVAS_H ++#define PANEL_ADDTO_CANVAS_H ++ ++#include ++#include ++#include "panel-addto.h" ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_CANVAS (panel_addto_canvas_get_type ()) ++#define PANEL_ADDTO_CANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvas)) ++#define PANEL_ADDTO_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++#define PANEL_ADDTO_IS_CANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_IS_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_CANVAS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++ ++typedef struct _PanelAddtoCanvas PanelAddtoCanvas; ++typedef struct _PanelAddtoCanvasClass PanelAddtoCanvasClass; ++ ++struct _PanelAddtoCanvas { ++ GnomeCanvas parent; ++}; ++ ++struct _PanelAddtoCanvasClass { ++ GnomeCanvasClass parent_class; ++ ++ void (*changed) (PanelAddtoCanvas *canvas, gchar *str); ++}; ++ ++typedef struct _PanelAddtoCanvasPrivate PanelAddtoCanvasPrivate; ++ ++struct _PanelAddtoCanvasPrivate { ++ GnomeCanvasItem *under_cover; ++ double height; ++ double width; ++ ++ double min_height; ++ double max_width; ++ PanelAddtoInformation *info; ++ PanelAddtoEntry *selected; ++ ++ gboolean rtl; ++ gint items_per_row; ++ gint selected_row; ++ ++ gchar *search_text; ++ ++ /* calculated sizes ++ for the elements */ ++ gdouble max_item_width; ++ gdouble max_item_height; ++ gdouble max_icon_height; ++ ++ /* accessibility stuff */ ++ GHashTable *accessible_children; ++}; ++ ++GType panel_addto_canvas_get_type (void); ++void activate_entry (PanelAddtoEntry *entry); ++void panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++void panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++GtkWidget* panel_addto_canvas_new (PanelAddtoInformation *info); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_CANVAS_H */ +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto.c.orig gnome-panel-2.19.2.new/gnome-panel/panel-addto.c.orig +--- gnome-panel-2.19.2/gnome-panel/panel-addto.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto.c.orig 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,1514 @@ ++/* ++ * panel-addto.c: ++ * ++ * Copyright (C) 2004 Vincent Untz ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ * Authors: ++ * Vincent Untz ++ */ ++ ++#include ++#include ++ ++#include ++ ++#include ++#include ++ ++#include "panel-addto.h" ++#include "panel-addto-canvas.h" ++ ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) ++ ++static GQuark panel_addto_dialog_quark = 0; ++ ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++ typedef struct CategoryInfo { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ } CategoryInfo; ++ ++static PanelAddtoItemInfo internal_addto_items [] = { ++ ++ { PANEL_ADDTO_MENU, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", ++ N_("Main Menu"), ++ N_("The main GNOME menu"), ++ PANEL_MAIN_MENU_ICON, ++ NULL, ++ NULL, ++ NULL, ++ "MENU:MAIN", ++ TRUE }, ++ ++ { PANEL_ADDTO_MENUBAR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", ++ N_("Menu Bar"), ++ N_("A custom menu bar"), ++ PANEL_GNOME_LOGO_ICON, ++ NULL, ++ NULL, ++ NULL, ++ "MENUBAR:NEW", ++ TRUE }, ++ ++ { PANEL_ADDTO_SEPARATOR, ++ PANEL_ACTION_NONE, ++ N_("Utilities"), ++ "Utilities", ++ N_("Separator"), ++ N_("A separator to organize the panel items"), ++ PANEL_SEPARATOR_ICON, ++ NULL, ++ NULL, ++ NULL, ++ "SEPARATOR:NEW", ++ TRUE }, ++ ++ { PANEL_ADDTO_DRAWER, ++ PANEL_ACTION_NONE, ++ N_("Desktop & Windows"), ++ "Desktop & Windows", ++ N_("Drawer"), ++ N_("A pop out drawer to store other items in"), ++ PANEL_DRAWER_ICON, ++ NULL, ++ NULL, ++ NULL, ++ "DRAWER:NEW", ++ TRUE } ++}; ++ ++static const char applet_requirements [] = ++ "has_all (repo_ids, ['IDL:Bonobo/Control:1.0'," ++ " 'IDL:GNOME/Vertigo/PanelAppletShell:1.0']) && " ++ "defined (panel:icon)"; ++ ++static char *applet_sort_criteria [] = { ++ "name", ++ NULL ++ }; ++ ++enum { ++ COLUMN_ICON, ++ COLUMN_TEXT, ++ COLUMN_DATA, ++ COLUMN_SEARCH, ++ NUMBER_COLUMNS ++}; ++ ++enum { ++ PANEL_ADDTO_RESPONSE_BACK, ++ PANEL_ADDTO_RESPONSE_ADD ++}; ++ ++static void panel_addto_present_applications (PanelAddtoDialog *dialog); ++static void panel_addto_present_applets (PanelAddtoDialog *dialog); ++static void panel_addto_init_categories (PanelAddtoDialog *dialog); ++ ++static int ++panel_addto_applet_info_sort_func (PanelAddtoItemInfo *a, ++ PanelAddtoItemInfo *b) ++{ ++ return g_utf8_collate (a->name, b->name); ++} ++ ++static GSList * ++panel_addto_prepend_internal_applets (GSList *list) ++{ ++ static gboolean translated = FALSE; ++ int i; ++ ++ for (i = 0; i < G_N_ELEMENTS (internal_addto_items); i++) { ++ if (!translated) { ++ internal_addto_items [i].name = _(internal_addto_items [i].name); ++ internal_addto_items [i].description = _(internal_addto_items [i].description); ++ internal_addto_items [i].category = _(internal_addto_items [i].category); ++ } ++ ++ list = g_slist_prepend (list, &internal_addto_items [i]); ++ } ++ ++ translated = TRUE; ++ ++ for (i = PANEL_ACTION_LOCK; i < PANEL_ACTION_LAST; i++) { ++ PanelAddtoItemInfo *info; ++ ++ if (panel_action_get_is_disabled (i)) ++ continue; ++ ++ info = g_new0 (PanelAddtoItemInfo, 1); ++ info->type = PANEL_ADDTO_ACTION; ++ info->action_type = i; ++ info->name = g_strdup (panel_action_get_text (i)); ++ info->description = g_strdup (panel_action_get_tooltip (i)); ++ info->category = g_strdup (panel_action_get_category (i)); ++ info->english_category = g_strdup (panel_action_get_english_category (i)); ++ info->icon = g_strdup (panel_action_get_icon_name (i)); ++ info->iid = g_strdup (panel_action_get_drag_id (i)); ++ info->static_data = FALSE; ++ ++ list = g_slist_prepend (list, info); ++ } ++ ++ return list; ++} ++ ++static char * ++panel_addto_make_text (const char *name, ++ const char *desc) ++{ ++ const char *real_name; ++ char *result; ++ ++ real_name = name ? name : _("(empty)"); ++ ++ if (!string_empty (desc)) { ++ result = g_markup_printf_escaped ("%s\n%s", ++ real_name, desc); ++ } else { ++ result = g_markup_printf_escaped ("%s", ++ real_name); ++ } ++ ++ return result; ++} ++ ++#define ICON_SIZE 32 ++#define LAUNCHER_ICON_SIZE 20 ++ ++static GdkPixbuf * ++panel_addto_make_pixbuf (const char *filename) ++{ ++ //FIXME: size shouldn't be fixed but should depend on the font size ++ return panel_load_icon (gtk_icon_theme_get_default (), ++ filename, ++ ICON_SIZE, ICON_SIZE, ICON_SIZE, ++ NULL); ++} ++ ++static GdkPixbuf * ++panel_addto_make_pixbuf_for_launcher (const char *filename) ++{ ++ //FIXME: size shouldn't be fixed but should depend on the font size ++ return panel_load_icon (gtk_icon_theme_get_default (), ++ filename, ++ LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE, ++ NULL); ++} ++ ++static void ++panel_addto_applications_drag_data_get_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ const char *string) ++{ ++ gtk_selection_data_set (selection_data, ++ selection_data->target, 8, (guchar *) string, ++ strlen (string)); ++} ++ ++static void ++panel_addto_applications_drag_begin_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ gpointer data) ++{ ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ GdkPixbuf *pixbuf; ++ ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); ++ ++ gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL); ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_path_free (path); ++ ++ gtk_tree_model_get (model, &iter, ++ COLUMN_ICON, &pixbuf, ++ -1); ++ ++ gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0); ++ g_object_unref (pixbuf); ++} ++ ++static void ++panel_addto_applications_setup_drag (GtkTreeView *tree_view, ++ const GtkTargetEntry *target, ++ const char *text) ++{ ++ if (!text || panel_lockdown_get_locked_down ()) ++ return; ++ ++ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view), ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ target, 1, GDK_ACTION_COPY); ++ ++ g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get", ++ G_CALLBACK (panel_addto_applications_drag_data_get_cb), ++ g_strdup (text), ++ (GClosureNotify) g_free, ++ 0 /* connect_flags */); ++ g_signal_connect_after (G_OBJECT (tree_view), "drag-begin", ++ G_CALLBACK (panel_addto_applications_drag_begin_cb), ++ NULL); ++} ++ ++static void ++panel_addto_applications_setup_launcher_drag (GtkTreeView *tree_view, ++ const char *uri) ++{ ++ static GtkTargetEntry target[] = { ++ { "text/uri-list", 0, 0 } ++ }; ++ char *uri_list; ++ ++ uri_list = g_strconcat (uri, "\r\n", NULL); ++ panel_addto_applications_setup_drag (tree_view, target, uri_list); ++ g_free (uri_list); ++} ++ ++static void ++panel_addto_applications_setup_internal_applet_drag (GtkTreeView *tree_view, ++ const char *applet_type) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-internal", 0, 0 } ++ }; ++ ++ panel_addto_applications_setup_drag (tree_view, target, applet_type); ++} ++ ++static GSList * ++panel_addto_query_applets (GSList *list) ++{ ++ Bonobo_ServerInfoList *applet_list; ++ CORBA_Environment env; ++ const char * const *langs; ++ GSList *langs_gslist; ++ int i; ++ ++ CORBA_exception_init (&env); ++ ++ applet_list = bonobo_activation_query (applet_requirements, ++ applet_sort_criteria, ++ &env); ++ if (BONOBO_EX (&env)) { ++ g_warning (_("query returned exception %s\n"), ++ BONOBO_EX_REPOID (&env)); ++ ++ CORBA_exception_free (&env); ++ CORBA_free (applet_list); ++ ++ return NULL; ++ } ++ ++ CORBA_exception_free (&env); ++ ++ langs = g_get_language_names (); ++ ++ langs_gslist = NULL; ++ for (i = 0; langs[i]; i++) ++ langs_gslist = g_slist_prepend (langs_gslist, (char *) langs[i]); ++ ++ langs_gslist = g_slist_reverse (langs_gslist); ++ ++ for (i = 0; i < applet_list->_length; i++) { ++ Bonobo_ServerInfo *info; ++ const char *name, *description, *category, *english_category, *icon; ++ PanelAddtoItemInfo *applet; ++ ++ info = &applet_list->_buffer[i]; ++ ++ name = bonobo_server_info_prop_lookup (info, ++ "name", ++ langs_gslist); ++ description = bonobo_server_info_prop_lookup (info, ++ "description", ++ langs_gslist); ++ category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ langs_gslist); ++ english_category = bonobo_server_info_prop_lookup (info, ++ "panel:category", ++ NULL); ++ icon = bonobo_server_info_prop_lookup (info, ++ "panel:icon", ++ NULL); ++ ++ if (!name || ++ panel_lockdown_is_applet_disabled (info->iid)) { ++ continue; ++ } ++ ++ applet = g_new0 (PanelAddtoItemInfo, 1); ++ applet->type = PANEL_ADDTO_APPLET; ++ applet->name = g_strdup (name); ++ applet->description = g_strdup (description); ++ applet->icon = g_strdup (icon); ++ applet->iid = g_strdup (info->iid); ++ applet->static_data = FALSE; ++ if (!category) { ++ applet->category = g_strdup_printf (_("Miscellaneous")); ++ applet->english_category = g_strdup_printf ("Miscellaneous"); ++ } else { ++ applet->category = g_markup_escape_text (category, -1); ++ applet->english_category = g_markup_escape_text (english_category, -1); ++ } ++ list = g_slist_prepend (list, applet); ++ } ++ ++ g_slist_free (langs_gslist); ++ CORBA_free (applet_list); ++ ++ return list; ++} ++ ++static void ++panel_addto_append_item (PanelAddtoDialog *dialog, ++ GtkListStore *model, ++ PanelAddtoItemInfo *applet) ++{ ++ char *text; ++ GdkPixbuf *pixbuf; ++ GtkTreeIter iter; ++ ++ if (applet == NULL) { ++ gtk_list_store_append (model, &iter); ++ gtk_list_store_set (model, &iter, ++ COLUMN_ICON, NULL, ++ COLUMN_TEXT, NULL, ++ COLUMN_DATA, NULL, ++ COLUMN_SEARCH, NULL, ++ -1); ++ } else { ++ pixbuf = NULL; ++ ++ if (applet->icon != NULL) { ++ pixbuf = panel_addto_make_pixbuf (applet->icon); ++ } ++ ++ gtk_list_store_append (model, &iter); ++ ++ text = panel_addto_make_text (applet->name, ++ applet->description); ++ ++ gtk_list_store_set (model, &iter, ++ COLUMN_ICON, pixbuf, ++ COLUMN_TEXT, text, ++ COLUMN_DATA, applet, ++ COLUMN_SEARCH, applet->name, ++ -1); ++ ++ if (pixbuf) ++ g_object_unref (pixbuf); ++ ++ g_free (text); ++ } ++} ++ ++static GtkTreeModel * ++panel_addto_make_applet_model (PanelAddtoDialog *dialog) ++{ ++ GtkListStore *model; ++ GSList *l; ++ ++ if (panel_profile_id_lists_are_writable ()) { ++ dialog->applet_list = panel_addto_query_applets (dialog->applet_list); ++ dialog->applet_list = panel_addto_prepend_internal_applets (dialog->applet_list); ++ } ++ ++ dialog->applet_list = g_slist_sort (dialog->applet_list, ++ (GCompareFunc) panel_addto_applet_info_sort_func); ++ ++ model = gtk_list_store_new (NUMBER_COLUMNS, ++ GDK_TYPE_PIXBUF, ++ G_TYPE_STRING, ++ G_TYPE_POINTER, ++ G_TYPE_STRING); ++ ++ if (panel_profile_id_lists_are_writable () && dialog->applet_list) { ++ panel_addto_append_item (dialog, model, NULL); ++ } ++ ++ for (l = dialog->applet_list; l; l = l->next) ++ panel_addto_append_item (dialog, model, l->data); ++ ++ return (GtkTreeModel *) model; ++} ++ ++static void panel_addto_make_application_list (GSList **parent_list, ++ GMenuTreeDirectory *directory, ++ const char *filename); ++ ++static void ++panel_addto_prepend_directory (GSList **parent_list, ++ GMenuTreeDirectory *directory, ++ const char *filename) ++{ ++ PanelAddtoAppList *data; ++ ++ data = g_new0 (PanelAddtoAppList, 1); ++ ++ data->item_info.type = PANEL_ADDTO_MENU; ++ data->item_info.name = g_strdup (gmenu_tree_directory_get_name (directory)); ++ data->item_info.description = g_strdup (gmenu_tree_directory_get_comment (directory)); ++ data->item_info.icon = g_strdup (gmenu_tree_directory_get_icon (directory)); ++ data->item_info.menu_filename = g_strdup (filename); ++ data->item_info.menu_path = gmenu_tree_directory_make_path (directory, NULL); ++ data->item_info.static_data = FALSE; ++ ++ /* We should set the iid here to something and do ++ * iid = g_strdup_printf ("MENU:%s", tfr->name) ++ * but this means we'd have to free the iid later ++ * and this would complexify too much the free ++ * function. ++ * So the iid is built when we select the row. ++ */ ++ ++ *parent_list = g_slist_prepend (*parent_list, data); ++ ++ panel_addto_make_application_list (&data->children, directory, filename); ++} ++ ++static void ++panel_addto_prepend_entry (GSList **parent_list, ++ GMenuTreeEntry *entry, ++ const char *filename) ++{ ++ PanelAddtoAppList *data; ++ ++ data = g_new0 (PanelAddtoAppList, 1); ++ ++ data->item_info.type = PANEL_ADDTO_LAUNCHER; ++ data->item_info.name = g_strdup (gmenu_tree_entry_get_name (entry)); ++ data->item_info.description = g_strdup (gmenu_tree_entry_get_comment (entry)); ++ data->item_info.icon = g_strdup (gmenu_tree_entry_get_icon (entry)); ++ data->item_info.launcher_path = g_strdup (gmenu_tree_entry_get_desktop_file_path (entry)); ++ data->item_info.static_data = FALSE; ++ ++ *parent_list = g_slist_prepend (*parent_list, data); ++} ++ ++static void ++panel_addto_prepend_alias (GSList **parent_list, ++ GMenuTreeAlias *alias, ++ const char *filename) ++{ ++ GMenuTreeItem *aliased_item; ++ ++ aliased_item = gmenu_tree_alias_get_item (alias); ++ ++ switch (gmenu_tree_item_get_type (aliased_item)) { ++ case GMENU_TREE_ITEM_DIRECTORY: ++ panel_addto_prepend_directory (parent_list, ++ GMENU_TREE_DIRECTORY (aliased_item), ++ filename); ++ break; ++ ++ case GMENU_TREE_ITEM_ENTRY: ++ panel_addto_prepend_entry (parent_list, ++ GMENU_TREE_ENTRY (aliased_item), ++ filename); ++ break; ++ ++ default: ++ break; ++ } ++ ++ gmenu_tree_item_unref (aliased_item); ++} ++ ++static void ++panel_addto_make_application_list (GSList **parent_list, ++ GMenuTreeDirectory *directory, ++ const char *filename) ++{ ++ GSList *items; ++ GSList *l; ++ ++ items = gmenu_tree_directory_get_contents (directory); ++ ++ for (l = items; l; l = l->next) { ++ switch (gmenu_tree_item_get_type (l->data)) { ++ case GMENU_TREE_ITEM_DIRECTORY: ++ panel_addto_prepend_directory (parent_list, l->data, filename); ++ break; ++ ++ case GMENU_TREE_ITEM_ENTRY: ++ panel_addto_prepend_entry (parent_list, l->data, filename); ++ break; ++ ++ case GMENU_TREE_ITEM_ALIAS: ++ panel_addto_prepend_alias (parent_list, l->data, filename); ++ break; ++ ++ default: ++ break; ++ } ++ ++ gmenu_tree_item_unref (l->data); ++ } ++ ++ g_slist_free (items); ++ ++ *parent_list = g_slist_reverse (*parent_list); ++} ++ ++static void ++panel_addto_populate_application_model (GtkTreeStore *store, ++ GtkTreeIter *parent, ++ GSList *app_list) ++{ ++ PanelAddtoAppList *data; ++ GtkTreeIter iter; ++ char *text; ++ GdkPixbuf *pixbuf; ++ GSList *app; ++ ++ for (app = app_list; app != NULL; app = app->next) { ++ data = app->data; ++ gtk_tree_store_append (store, &iter, parent); ++ ++ text = panel_addto_make_text (data->item_info.name, ++ data->item_info.description); ++ pixbuf = panel_addto_make_pixbuf (data->item_info.icon); ++ gtk_tree_store_set (store, &iter, ++ COLUMN_ICON, pixbuf, ++ COLUMN_TEXT, text, ++ COLUMN_DATA, &(data->item_info), ++ COLUMN_SEARCH, data->item_info.name, ++ -1); ++ ++ if (pixbuf) ++ g_object_unref (pixbuf); ++ ++ g_free (text); ++ ++ if (data->children != NULL) ++ panel_addto_populate_application_model (store, ++ &iter, ++ data->children); ++ } ++} ++ ++static GtkTreeModel * ++panel_addto_make_application_model (PanelAddtoDialog *dialog) ++{ ++ GtkTreeStore *store; ++ GMenuTree *tree; ++ GMenuTreeDirectory *root; ++ ++ store = gtk_tree_store_new (NUMBER_COLUMNS, ++ GDK_TYPE_PIXBUF, ++ G_TYPE_STRING, ++ G_TYPE_POINTER, ++ G_TYPE_STRING); ++ ++ tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE); ++ ++ if ((root = gmenu_tree_get_root_directory (tree))) { ++ panel_addto_make_application_list (&dialog->application_list, ++ root, "applications.menu"); ++ panel_addto_populate_application_model (store, NULL, dialog->application_list); ++ ++ gmenu_tree_item_unref (root); ++ } ++ ++ gmenu_tree_unref (tree); ++ ++ tree = gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE); ++ ++ if ((root = gmenu_tree_get_root_directory (tree))) { ++ GtkTreeIter iter; ++ ++ gtk_tree_store_append (store, &iter, NULL); ++ gtk_tree_store_set (store, &iter, ++ COLUMN_ICON, NULL, ++ COLUMN_TEXT, NULL, ++ COLUMN_DATA, NULL, ++ COLUMN_SEARCH, NULL, ++ -1); ++ ++ panel_addto_make_application_list (&dialog->settings_list, ++ root, "settings.menu"); ++ panel_addto_populate_application_model (store, NULL, ++ dialog->settings_list); ++ ++ gmenu_tree_item_unref (root); ++ } ++ ++ gmenu_tree_unref (tree); ++ ++ return GTK_TREE_MODEL (store); ++} ++ ++gboolean ++panel_addto_add_item (PanelAddtoDialog *dialog, ++ PanelAddtoItemInfo *item_info) ++{ ++ gboolean destroy; ++ ++ g_assert (item_info != NULL); ++ ++ destroy = TRUE; ++ ++ switch (item_info->type) { ++ case PANEL_ADDTO_APPLET: ++ panel_applet_frame_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position, ++ item_info->iid); ++ break; ++ case PANEL_ADDTO_ACTION: ++ panel_action_button_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position, ++ item_info->action_type); ++ break; ++ case PANEL_ADDTO_LAUNCHER_MENU: ++ panel_addto_present_applications (dialog); ++ destroy = FALSE; ++ break; ++ case PANEL_ADDTO_LAUNCHER: ++ panel_launcher_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position, ++ item_info->launcher_path); ++ break; ++ case PANEL_ADDTO_LAUNCHER_NEW: ++ ask_about_launcher (NULL, dialog->panel_widget, ++ dialog->insertion_position, FALSE); ++ break; ++ case PANEL_ADDTO_MENU: ++ panel_menu_button_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position, ++ item_info->menu_filename, ++ item_info->menu_path, ++ item_info->menu_path != NULL, ++ item_info->name); ++ break; ++ case PANEL_ADDTO_MENUBAR: ++ panel_menu_bar_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position); ++ break; ++ case PANEL_ADDTO_SEPARATOR: ++ panel_separator_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position); ++ break; ++ case PANEL_ADDTO_DRAWER: ++ panel_drawer_create (dialog->panel_widget->toplevel, ++ dialog->insertion_position, ++ NULL, FALSE, NULL); ++ break; ++ } ++ ++ return destroy; ++} ++ ++void ++panel_addto_dialog_response (GtkWidget *widget_dialog, ++ guint response_id, ++ PanelAddtoDialog *dialog) ++{ ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoEntry *selected_applet; ++ GtkTreeSelection *selected_application; ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ ++ switch (response_id) { ++ case GTK_RESPONSE_HELP: ++ panel_show_help (gtk_window_get_screen (GTK_WINDOW (dialog->addto_dialog)), ++ "user-guide.xml", "gospanel-15"); ++ break; ++ ++ case PANEL_ADDTO_RESPONSE_ADD: ++ ++ if (dialog->status == APPLETS) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ selected_applet = priv->selected; ++ data = selected_applet->item_info; ++ if (data) { ++ panel_addto_add_item (dialog, data); ++ } ++ } else if (dialog->status == APPLICATIONS) { ++ selected_application = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ if (gtk_tree_selection_get_selected (selected_application, ++ &model, &iter)) { ++ gtk_tree_model_get (model, &iter, ++ COLUMN_DATA, &data, -1); ++ ++ if (data != NULL) { ++ panel_addto_add_item (dialog, data); ++ } ++ } ++ } ++ ++ break; ++ ++ ++ case PANEL_ADDTO_RESPONSE_BACK: ++ /* This response only happens when we're showing the ++ * application list and the user wants to go back to the ++ * applet list. */ ++ gtk_widget_hide (dialog->applications_sw); ++ dialog->status = APPLETS; ++ panel_addto_present_applets (dialog); ++ gtk_widget_show_all (dialog->applets_sw); ++ gtk_widget_show (dialog->statuslabel); ++ gtk_widget_show (dialog->search_entry); ++ gtk_widget_show (dialog->search_label); ++ gtk_widget_set_sensitive (dialog->launcher_button, TRUE); ++ if (!panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, TRUE); ++ break; ++ ++ case GTK_RESPONSE_CLOSE: ++ gtk_widget_destroy (widget_dialog); ++ break; ++ ++ default: ++ break; ++ } ++} ++ ++static void ++panel_addto_add_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_MENU; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void ++panel_addto_add_custom_launcher (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoEntry *launcher_applet; ++ PanelAddtoItemInfo *data; ++ ++ launcher_applet = g_new (PanelAddtoEntry, 1); ++ data = launcher_applet->item_info; ++ data = g_new (PanelAddtoItemInfo, 1); ++ data->type = PANEL_ADDTO_LAUNCHER_NEW; ++ ++ panel_addto_add_item (dialog, data); ++ ++ g_free (launcher_applet); ++ g_free (data); ++} ++ ++static void ++panel_addto_dialog_destroy (GtkWidget *widget_dialog, ++ PanelAddtoDialog *dialog) ++{ ++ panel_toplevel_pop_autohide_disabler (PANEL_TOPLEVEL (dialog->panel_widget->toplevel)); ++ g_object_set_qdata (G_OBJECT (dialog->panel_widget->toplevel), ++ panel_addto_dialog_quark, ++ NULL); ++} ++ ++ ++static PanelAddtoCategory * ++panel_addto_category_new (const gchar *title, ++ const gchar *english_title, ++ gboolean real_category) ++{ ++ PanelAddtoCategory *retval; ++ retval = g_new0 (PanelAddtoCategory, 1); ++ ++ retval->title = g_strdup (title); ++ retval->english_title = g_strdup (english_title); ++ retval->real_category = real_category != FALSE; ++ retval->entries = NULL; /* We will populate it in init_categories */ ++ ++ return retval; ++} ++ ++static int ++compare_categories (PanelAddtoCategory *a, ++ PanelAddtoCategory *b) ++{ ++ return g_utf8_collate (a->title, b->title); ++} ++ ++static void ++panel_addto_init_categories (PanelAddtoDialog *dialog) ++{ ++ PanelAddtoInformation *info; ++ PanelAddtoItemInfo *applet; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *current_category; ++ GSList *categories = NULL; ++ GSList *l, *m; ++ gchar *category_title, *category_english_title; ++ gboolean found; ++ ++ info = g_new0 (PanelAddtoInformation, 1); ++ ++ for (l = dialog->applet_list; l; l = l->next) { ++ applet = l->data; ++ category_title = g_strdup (applet->category); ++ category_english_title = g_strdup (applet->english_category); ++ found = FALSE; ++ for (m = categories; m; m = m->next) { ++ current_category = m->data; ++ if (!g_utf8_collate (current_category->english_title, category_english_title)) { ++ found = TRUE; ++ current_category->n_entries++; ++ if (!current_category->translated && strcmp (category_title, category_english_title)) { ++ current_category->title = category_title; ++ current_category->translated = TRUE; ++ } ++ break; ++ } ++ } ++ if (!found) { ++ categories = g_slist_prepend (categories, ++ panel_addto_category_new (category_title, category_english_title, TRUE)); ++ current_category = categories->data; ++ current_category->translated = strcmp (category_title, category_english_title) ? TRUE : FALSE; ++ current_category->n_entries = 1; ++ } ++ ++ entry = g_new0 (PanelAddtoEntry, 1); ++ entry->title = g_strdup (applet->name); ++ entry->comment = g_strdup (applet->description); ++ entry->item_info = applet; ++ entry->category = current_category; ++ entry->dialog = dialog; ++ entry->icon_pixbuf = panel_addto_make_pixbuf (applet->icon); ++ current_category->entries = g_slist_append (current_category->entries, entry); ++ } ++ ++ categories = g_slist_sort (categories, ++ (GCompareFunc) compare_categories); ++ ++ info->n_categories = g_slist_length (categories); ++ info->categories = categories; ++ ++ dialog->info = info; ++} ++ ++static gboolean ++panel_addto_separator_func (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ gpointer data) ++{ ++ int column = GPOINTER_TO_INT (data); ++ char *text; ++ ++ gtk_tree_model_get (model, iter, column, &text, -1); ++ ++ if (!text) ++ return TRUE; ++ ++ g_free(text); ++ return FALSE; ++} ++ ++static void ++panel_addto_applications_selection_changed (GtkTreeSelection *selection, ++ PanelAddtoDialog *dialog) ++{ ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ PanelAddtoItemInfo *data; ++ char *iid; ++ ++ ++ if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_tree_model_get (model, &iter, COLUMN_DATA, &data, -1); ++ ++ if (!data) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++ /* only allow dragging applets if we can add applets */ ++ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_applications_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_MENU: ++ ++ /* build the iid for menus other than the main menu */ ++ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_applications_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ break; ++ } ++ } ++} ++ ++ ++static void ++panel_addto_applications_selection_activated (GtkTreeView *view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ PanelAddtoDialog *dialog) ++{ ++ gtk_dialog_response (GTK_DIALOG (dialog->addto_dialog), ++ PANEL_ADDTO_RESPONSE_ADD); ++} ++ ++static void ++panel_addto_present_applications (PanelAddtoDialog *dialog) ++{ ++ GtkTreeSelection *selection; ++ GtkTreeViewColumn *column; ++ ++ if (dialog->application_model == NULL) { ++ dialog->application_model = panel_addto_make_application_model (dialog); ++ } ++ gtk_widget_hide (dialog->applets_sw); ++ gtk_widget_hide (dialog->statuslabel); ++ gtk_widget_hide (dialog->search_entry); ++ gtk_widget_hide (dialog->search_label); ++ ++ gtk_widget_set_sensitive (dialog->launcher_button, FALSE); ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); ++ ++ dialog->status = APPLICATIONS; ++ ++ dialog->applications_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applications_sw), ++ GTK_SHADOW_IN); ++ dialog->tree_view = gtk_tree_view_new (); ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), ++ FALSE); ++ gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->tree_view)); ++ ++ dialog->renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, ++ "xpad", 4, ++ "ypad", 4, ++ NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "pixbuf", COLUMN_ICON, ++ NULL); ++ ++ dialog->renderer = gtk_cell_renderer_text_new (); ++ g_object_set (dialog->renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); ++ ++ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view), ++ -1, NULL, ++ dialog->renderer, ++ "markup", COLUMN_TEXT, ++ NULL); ++ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_SEARCH); ++ ++ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view), ++ panel_addto_separator_func, ++ GINT_TO_POINTER (COLUMN_TEXT), ++ NULL); ++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); ++ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); ++ ++ column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->tree_view), ++ COLUMN_TEXT); ++ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); ++ ++ g_signal_connect (selection, "changed", ++ G_CALLBACK (panel_addto_applications_selection_changed), ++ dialog); ++ ++ g_signal_connect (dialog->tree_view, "row-activated", ++ G_CALLBACK (panel_addto_applications_selection_activated), ++ dialog); ++ ++ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), ++ dialog->application_model); ++ gtk_container_add (GTK_CONTAINER (dialog->applications_sw), ++ GTK_WIDGET (dialog->tree_view)); ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), ++ GTK_WIDGET (dialog->applications_sw), TRUE, TRUE, 0); ++ ++ ++ gtk_window_set_focus (GTK_WINDOW (dialog->addto_dialog), ++ dialog->tree_view); ++ gtk_widget_set_sensitive (dialog->back_button, TRUE); ++ gtk_widget_show_all (GTK_WIDGET (dialog->applications_sw)); ++} ++ ++static void ++panel_addto_present_applets (PanelAddtoDialog *dialog) ++{ ++ ++ if (dialog->applet_model == NULL) ++ dialog->applet_model = panel_addto_make_applet_model (dialog); ++ ++ gtk_widget_set_sensitive (dialog->back_button, FALSE); ++ ++} ++ ++static void ++panel_addto_dialog_free_item_info (PanelAddtoItemInfo *item_info) ++{ ++ if (item_info == NULL || item_info->static_data) ++ return; ++ ++ if (item_info->name != NULL) ++ g_free (item_info->name); ++ item_info->name = NULL; ++ ++ if (item_info->description != NULL) ++ g_free (item_info->description); ++ item_info->description = NULL; ++ ++ if (item_info->icon != NULL) ++ g_free (item_info->icon); ++ item_info->icon = NULL; ++ ++ if (item_info->iid != NULL) ++ g_free (item_info->iid); ++ item_info->iid = NULL; ++ ++ if (item_info->launcher_path != NULL) ++ g_free (item_info->launcher_path); ++ item_info->launcher_path = NULL; ++ ++ if (item_info->menu_filename != NULL) ++ g_free (item_info->menu_filename); ++ item_info->menu_filename = NULL; ++ ++ if (item_info->menu_path != NULL) ++ g_free (item_info->menu_path); ++ item_info->menu_path = NULL; ++} ++ ++static void ++panel_addto_dialog_free_application_list (GSList *application_list) ++{ ++ PanelAddtoAppList *data; ++ GSList *app; ++ ++ if (application_list == NULL) ++ return; ++ ++ for (app = application_list; app != NULL; app = app->next) { ++ data = app->data; ++ if (data->children) { ++ panel_addto_dialog_free_application_list (data->children); ++ } ++ panel_addto_dialog_free_item_info (&data->item_info); ++ g_free (data); ++ } ++ g_slist_free (application_list); ++} ++ ++static void ++panel_addto_dialog_free (PanelAddtoDialog *dialog) ++{ ++ GConfClient *client; ++ GSList *item, *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ ++ client = panel_gconf_get_client (); ++ ++ if (dialog->name_notify) ++ gconf_client_notify_remove (client, dialog->name_notify); ++ dialog->name_notify = 0; ++ ++ if (dialog->addto_dialog) ++ gtk_widget_destroy (dialog->addto_dialog); ++ dialog->addto_dialog = NULL; ++ ++ if (dialog->label) { ++ dialog->label = NULL; ++ } ++ ++ for (item = dialog->applet_list; item != NULL; item = item->next) { ++ PanelAddtoItemInfo *applet; ++ ++ applet = (PanelAddtoItemInfo *) item->data; ++ if (!applet->static_data) { ++ panel_addto_dialog_free_item_info (applet); ++ g_free (applet); ++ } ++ } ++ g_slist_free (dialog->applet_list); ++ ++ panel_addto_dialog_free_application_list (dialog->application_list); ++ panel_addto_dialog_free_application_list (dialog->settings_list); ++ ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv) { ++ if (priv && priv->info && priv->info->categories) { ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ g_free (m->data); ++ } ++ if (current_category->user_data) ++ g_free (current_category->user_data); ++ g_slist_free (current_category->entries); ++ g_free (current_category); ++ } ++ g_slist_free (priv->info->categories); ++ } ++ g_free (priv->search_text); ++ } ++ } ++ ++ ++ ++ if (dialog->applet_model) ++ g_object_unref (dialog->applet_model); ++ dialog->applet_model = NULL; ++ ++ if (dialog->application_model) ++ g_object_unref (dialog->application_model); ++ dialog->application_model = NULL; ++ ++ if (dialog->menu_tree) ++ gmenu_tree_unref (dialog->menu_tree); ++ dialog->menu_tree = NULL; ++ ++ g_free (dialog); ++} ++ ++static void ++panel_addto_name_change (PanelAddtoDialog *dialog, ++ const char *name) ++{ ++ char *title; ++ char *label; ++ ++ label = NULL; ++ ++ if (!string_empty (name)) ++ label = g_strdup_printf (_("Select an item to add to \"%s\":"), ++ name); ++ ++ if (panel_toplevel_get_is_attached (dialog->panel_widget->toplevel)) { ++ title = g_strdup_printf (_("Add to Drawer")); ++ if (label == NULL) ++ label = g_strdup (_("Select an item to add to the drawer:")); ++ } else { ++ title = g_strdup_printf (_("Add to Panel")); ++ if (label == NULL) ++ label = g_strdup (_("Select an item to add to the panel \n\ ++(you can also directly drag and drop items onto the panel):")); ++ } ++ ++ gtk_window_set_title (GTK_WINDOW (dialog->addto_dialog), title); ++ g_free (title); ++ ++ gtk_label_set_text_with_mnemonic (GTK_LABEL (dialog->label), label); ++ g_free (label); ++} ++ ++static void ++panel_addto_name_notify (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ PanelAddtoDialog *dialog) ++{ ++ GConfValue *value; ++ const char *key; ++ const char *text = NULL; ++ ++ key = panel_gconf_basename (gconf_entry_get_key (entry)); ++ ++ if (strcmp (key, "name")) ++ return; ++ ++ value = gconf_entry_get_value (entry); ++ ++ if (value && value->type == GCONF_VALUE_STRING) ++ text = gconf_value_get_string (value); ++ ++ if (text) ++ panel_addto_name_change (dialog, text); ++} ++ ++ ++static PanelAddtoDialog * ++panel_addto_dialog_new (PanelWidget *panel_widget) ++{ ++ PanelAddtoDialog *dialog; ++ GtkWidget *vbox; ++ GtkWidget *top_hbox; ++ GtkWidget *launchers_hbox; ++ GdkPixbuf *launcher_pixbuf; ++ GtkWidget *launcher_image; ++ GtkWidget *bottom_hbox; ++ GtkTooltips *launchers_tooltips; ++ GtkImage *label_image; ++ ++ dialog = g_new0 (PanelAddtoDialog, 1); ++ ++ dialog->status = APPLETS; ++ ++ g_object_set_qdata_full (G_OBJECT (panel_widget->toplevel), ++ panel_addto_dialog_quark, ++ dialog, ++ (GDestroyNotify) panel_addto_dialog_free); ++ ++ dialog->panel_widget = panel_widget; ++ dialog->name_notify = ++ panel_profile_toplevel_notify_add (dialog->panel_widget->toplevel, ++ "name", ++ (GConfClientNotifyFunc) panel_addto_name_notify, ++ dialog); ++ dialog->addto_dialog = gtk_dialog_new (); ++ ++ dialog->statuslabel = gtk_label_new (""); ++ ++ gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), ++ GTK_STOCK_HELP, GTK_RESPONSE_HELP); ++ dialog->back_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), ++ GTK_STOCK_GO_BACK, ++ PANEL_ADDTO_RESPONSE_BACK); ++ dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), ++ GTK_STOCK_ADD, ++ PANEL_ADDTO_RESPONSE_ADD); ++ gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog), ++ GTK_STOCK_CLOSE, ++ GTK_RESPONSE_CLOSE); ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ gtk_dialog_set_has_separator (GTK_DIALOG (dialog->addto_dialog), ++ FALSE); ++ gtk_dialog_set_default_response (GTK_DIALOG (dialog->addto_dialog), ++ PANEL_ADDTO_RESPONSE_ADD); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (dialog->addto_dialog), 5); ++ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog->addto_dialog)->vbox), 2); ++ g_signal_connect (G_OBJECT (dialog->addto_dialog), "response", ++ G_CALLBACK (panel_addto_dialog_response), dialog); ++ g_signal_connect (dialog->addto_dialog, "destroy", ++ G_CALLBACK (panel_addto_dialog_destroy), dialog); ++ ++ vbox = gtk_vbox_new (FALSE, 12); ++ gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->addto_dialog)->vbox), ++ GTK_WIDGET (vbox)); ++ ++ dialog->inner_vbox = gtk_vbox_new (FALSE, 6); ++ gtk_box_pack_start (GTK_BOX (vbox), dialog->inner_vbox, TRUE, TRUE, 0); ++ ++ top_hbox = gtk_hbox_new (FALSE, 6); ++ launchers_hbox = gtk_hbox_new (FALSE, 6); ++ bottom_hbox = gtk_hbox_new (FALSE, 0); ++ dialog->label = gtk_label_new_with_mnemonic (""); ++ gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.5); ++ gtk_label_set_use_markup (GTK_LABEL (dialog->label), TRUE); ++ ++ label_image = g_object_new (GTK_TYPE_IMAGE, ++ "stock", GTK_STOCK_DIALOG_INFO, ++ "icon-size", GTK_ICON_SIZE_DND, ++ NULL); ++ dialog->search_label = gtk_label_new_with_mnemonic (_("_Search: ")); ++ dialog->search_entry = gtk_entry_new (); ++ g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry))); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->search_label), GTK_WIDGET (dialog->search_entry)); ++ ++ g_signal_connect (G_OBJECT (dialog->search_entry), "changed", ++ G_CALLBACK (panel_addto_relayout_for_search), dialog); ++ g_signal_connect (G_OBJECT (dialog->search_entry), "activate", ++ G_CALLBACK (panel_addto_activate_from_searchbar), dialog); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET(label_image), ++ FALSE, FALSE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), dialog->label, ++ TRUE, TRUE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_label), ++ FALSE, FALSE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (top_hbox), GTK_WIDGET (dialog->search_entry), ++ TRUE, TRUE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), top_hbox, ++ FALSE, FALSE, 0); ++ ++ /* Launcher button */ ++ launchers_tooltips = gtk_tooltips_new (); ++ dialog->launcher_button = gtk_button_new_with_mnemonic (_("A_pplication Launcher...")); ++ launcher_pixbuf = panel_addto_make_pixbuf_for_launcher ("launcher-program"); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->launcher_button, _("Launch a program that is already in the GNOME menu"), NULL); ++ g_signal_connect_swapped (dialog->launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->launcher_button, ++ FALSE, FALSE, 0); ++ ++ /* Custom launcher button*/ ++ dialog->custom_launcher_button = gtk_button_new_with_mnemonic (_("Custom Application _Launcher")); ++ launcher_image = gtk_image_new_from_pixbuf (launcher_pixbuf); ++ gtk_button_set_image (GTK_BUTTON (dialog->custom_launcher_button), launcher_image); ++ gtk_tooltips_set_tip (launchers_tooltips, dialog->custom_launcher_button, _("Create a new launcher"), NULL); ++ g_signal_connect_swapped (dialog->custom_launcher_button, "clicked", ++ G_CALLBACK (panel_addto_add_custom_launcher), dialog); ++ gtk_box_pack_start (GTK_BOX (launchers_hbox), dialog->custom_launcher_button, ++ FALSE, FALSE, 0); ++ ++ if (panel_lockdown_get_disable_command_line ()) ++ gtk_widget_set_sensitive (dialog->custom_launcher_button, FALSE); ++ ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), launchers_hbox, ++ FALSE, FALSE, 0); ++ ++ dialog->applets_sw = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->applets_sw), ++ GTK_SHADOW_IN); ++ ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), dialog->applets_sw, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (bottom_hbox), dialog->statuslabel, FALSE, FALSE, 0); ++ ++ gtk_box_pack_start (GTK_BOX (dialog->inner_vbox), bottom_hbox, ++ FALSE, FALSE, 0); ++ ++ gtk_widget_show_all (vbox); ++ ++ gtk_label_set_mnemonic_widget (GTK_LABEL (dialog->label), ++ dialog->canvas); ++ ++ panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel); ++ panel_widget_register_open_dialog (panel_widget, ++ dialog->addto_dialog); ++ panel_addto_name_change (dialog, ++ panel_toplevel_get_name (dialog->panel_widget->toplevel)); ++ ++ return dialog; ++} ++ ++#define MAX_ADDTOPANEL_HEIGHT 540 ++ ++void ++panel_addto_present (GtkMenuItem *item, ++ PanelWidget *panel_widget) ++{ ++ PanelAddtoDialog *dialog; ++ PanelToplevel *toplevel; ++ PanelData *pd; ++ GtkAdjustment *sw_adjustment = NULL; ++ GdkScreen *screen; ++ gint screen_height; ++ gint height; ++ ++ toplevel = panel_widget->toplevel; ++ pd = g_object_get_data (G_OBJECT (toplevel), "PanelData"); ++ ++ if (!panel_addto_dialog_quark) ++ panel_addto_dialog_quark = ++ g_quark_from_static_string ("panel-addto-dialog"); ++ ++ dialog = g_object_get_qdata (G_OBJECT (toplevel), ++ panel_addto_dialog_quark); ++ ++ screen = gtk_window_get_screen (GTK_WINDOW (toplevel)); ++ screen_height = gdk_screen_get_height (screen); ++ height = MIN (MAX_ADDTOPANEL_HEIGHT, 3 * (screen_height / 4)); ++ ++ if (!dialog) { ++ dialog = panel_addto_dialog_new (panel_widget); ++ ++ panel_addto_present_applets (dialog); ++ panel_addto_init_categories (dialog); ++ ++ dialog->canvas = panel_addto_canvas_new (dialog->info); ++ gtk_container_add (GTK_CONTAINER (dialog->applets_sw), ++ GTK_WIDGET (dialog->canvas)); ++ } ++ ++ sw_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw)); ++ dialog->insertion_position = pd ? pd->insertion_pos : -1; ++ gtk_window_set_screen (GTK_WINDOW (dialog->addto_dialog), screen); ++ gtk_window_set_default_size (GTK_WINDOW (dialog->addto_dialog), ++ height * 1.35, height); ++ gtk_window_present (GTK_WINDOW (dialog->addto_dialog)); ++ ++ sw_adjustment->value = sw_adjustment->lower; ++ sw_adjustment->step_increment = 55; ++ gtk_adjustment_clamp_page (sw_adjustment, sw_adjustment->lower, sw_adjustment->upper); ++ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (dialog->applets_sw), sw_adjustment); ++} +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-event-box.c gnome-panel-2.19.2.new/gnome-panel/panel-addto-event-box.c +--- gnome-panel-2.19.2/gnome-panel/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-event-box.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,99 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#include ++ ++#include "panel-addto-event-box.h" ++ ++#define noVERBOSE ++ ++static GnomeCanvasItemClass *parent_class; ++ ++static double ++panel_addto_event_box_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, ++ GnomeCanvasItem **actual_item) ++{ ++ double x1, x2, y1, y2; ++ g_object_get (item, ++ "x1", &x1, ++ "x2", &x2, ++ "y1", &y1, ++ "y2", &y2, ++ NULL); ++ if (x <= x2 && x >= x1 && ++ y <= y2 && y >= y1) { ++ *actual_item = item; ++ ++ return 0.0; ++ } ++ return 1e12; ++} ++ ++static void ++panel_addto_event_box_class_init (PanelAddtoEventBoxClass *class) ++{ ++ GnomeCanvasItemClass *item_class; ++ ++ item_class = (GnomeCanvasItemClass *) class; ++ ++ parent_class = g_type_class_peek_parent (class); ++ ++ item_class->point = panel_addto_event_box_point; ++} ++ ++GType ++panel_addto_event_box_get_type (void) ++{ ++ static GType type; ++ ++ if (!type) { ++ static const GTypeInfo object_info = { ++ sizeof (PanelAddtoEventBoxClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) panel_addto_event_box_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (PanelAddtoEventBox), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ type = g_type_register_static (GNOME_TYPE_CANVAS_RECT, "PanelAddtoEventBox", ++ &object_info, 0); ++ } ++ ++ return type; ++} +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-event-box.h gnome-panel-2.19.2.new/gnome-panel/panel-addto-event-box.h +--- gnome-panel-2.19.2/gnome-panel/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-event-box.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event Box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#ifndef PANEL_ADDTO_EVENT_BOX_H ++#define PANEL_ADDTO_EVENT_BOX_H ++ ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++/* Event Box item. No configurable or queryable arguments are available (use those in ++ * GnomeCanvasRE). ++ */ ++ ++ ++#define PANEL_ADDTO_TYPE_EVENT_BOX (panel_addto_event_box_get_type ()) ++#define PANEL_ADDTO_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBox)) ++#define PANEL_ADDTO_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++#define PANEL_ADDTO_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_EVENT_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++ ++ ++typedef struct _PanelAddtoEventBox PanelAddtoEventBox; ++typedef struct _PanelAddtoEventBoxClass PanelAddtoEventBoxClass; ++ ++struct _PanelAddtoEventBox { ++ GnomeCanvasRect item; ++}; ++ ++struct _PanelAddtoEventBoxClass { ++ GnomeCanvasRectClass parent_class; ++}; ++ ++ ++/* Standard Gtk function */ ++GType panel_addto_event_box_get_type (void) G_GNUC_CONST; ++ ++G_END_DECLS ++ ++#endif +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto.h gnome-panel-2.19.2.new/gnome-panel/panel-addto.h +--- gnome-panel-2.19.2/gnome-panel/panel-addto.h 2007-05-14 21:53:01.000000000 +0200 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto.h 2007-05-15 12:42:45.000000000 +0200 +@@ -20,6 +20,7 @@ + * + * Authors: + * Vincent Untz ++ * Manu Cornet + */ + + #ifndef __PANEL_ADDTO_H__ +@@ -27,8 +28,144 @@ + + G_BEGIN_DECLS + +-void panel_addto_present (GtkMenuItem *item, +- PanelWidget *panel_widget); ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "menu.h" ++ ++#include "launcher.h" ++#include "panel.h" ++#include "drawer.h" ++#include "panel-applet-frame.h" ++#include "panel-action-button.h" ++#include "panel-menu-bar.h" ++#include "panel-separator.h" ++#include "panel-toplevel.h" ++#include "panel-menu-button.h" ++#include "panel-globals.h" ++#include "panel-lockdown.h" ++#include "panel-util.h" ++#include "panel-profile.h" ++ ++typedef struct PanelAddtoEntry PanelAddtoEntry; ++ ++typedef struct PanelAddtoInformation { ++ GSList *categories; ++ int n_categories; ++} PanelAddtoInformation; ++ ++typedef struct { ++ PanelWidget *panel_widget; ++ PanelAddtoInformation *info; ++ ++ GtkWidget *addto_dialog; ++ GtkWidget *label; ++ GtkWidget *back_button; ++ GtkWidget *add_button; ++ GtkWidget *tree_view; ++ GtkWidget *canvas; ++ GtkWidget *applets_sw; ++ GtkWidget *applications_sw; ++ GtkWidget *inner_vbox; ++ GtkWidget *statuslabel; ++ GtkWidget *search_entry; ++ GtkWidget *search_label; ++ GtkWidget *launcher_button; ++ GtkWidget *custom_launcher_button; ++ GtkCellRenderer *renderer; ++ GtkTreeModel *applet_model; ++ GtkTreeModel *application_model; ++ ++ GMenuTree *menu_tree; ++ ++ GSList *applet_list; ++ GSList *application_list; ++ GSList *settings_list; ++ guint name_notify; ++ int insertion_position; ++ ++ gint status; ++} PanelAddtoDialog; ++ ++enum { ++ APPLETS, ++ APPLICATIONS ++}; ++ ++typedef enum { ++ PANEL_ADDTO_APPLET, ++ PANEL_ADDTO_ACTION, ++ PANEL_ADDTO_LAUNCHER_MENU, ++ PANEL_ADDTO_LAUNCHER, ++ PANEL_ADDTO_LAUNCHER_NEW, ++ PANEL_ADDTO_MENU, ++ PANEL_ADDTO_MENUBAR, ++ PANEL_ADDTO_SEPARATOR, ++ PANEL_ADDTO_DRAWER ++} PanelAddtoItemType; ++ ++ ++typedef struct PanelAddtoCategory { ++ GSList *entries; ++ int n_entries; ++ ++ char *title; ++ char *english_title; ++ ++ gboolean translated; ++ ++ gpointer user_data; ++ ++ guint real_category : 1; ++} PanelAddtoCategory; ++ ++typedef struct PanelAddtoItemInfo { ++ PanelAddtoItemType type; ++ PanelActionButtonType action_type; ++ char *category; ++ char *english_category; ++ char *name; ++ char *description; ++ char *icon; ++ char *launcher_path; ++ char *menu_filename; ++ char *menu_path; ++ char *iid; ++ gboolean static_data; ++} PanelAddtoItemInfo; ++ ++struct PanelAddtoEntry { ++ PanelAddtoCategory *category; ++ PanelAddtoItemInfo *item_info; ++ PanelAddtoDialog *dialog; ++ ++ char *title; ++ char *comment; ++ ++ GdkPixbuf *icon_pixbuf; ++ ++ gpointer user_data; ++}; ++ ++ ++typedef struct { ++ GSList *children; ++ PanelAddtoItemInfo item_info; ++} PanelAddtoAppList; ++ ++void ++panel_addto_dialog_response (GtkWidget *widget_dialog, ++ guint response_id, ++ PanelAddtoDialog *dialog); ++gboolean panel_addto_add_item (PanelAddtoDialog *dialog, ++ PanelAddtoItemInfo *item_info); ++void panel_addto_debug_print (PanelAddtoInformation *info); ++void panel_addto_present (GtkMenuItem *item, ++ PanelWidget *panel_widget); + + G_END_DECLS + +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect.c gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect.c +--- gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,103 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * panel-addto-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++ * USA ++ */ ++ ++#include ++#include "panel-addto-rounded-rect.h" ++#include "panel-addto-rounded-rect-pixbuf.h" ++#include ++#include ++ ++struct _PanelAddtoRoundedRect { ++ GnomeCanvasRect base; ++}; ++typedef GnomeCanvasRectClass PanelAddtoRoundedRectClass; ++ ++#define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, PanelAddtoRoundedRectClass)) ++#define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) ++ ++G_DEFINE_TYPE (PanelAddtoRoundedRect, panel_addto_rounded_rect, GNOME_TYPE_CANVAS_RECT); ++ ++/************************************************************************* ++ * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c ++ */ ++/* clear the corners of the selection pixbuf by copying the corners of the passed-in pixbuf */ ++static void ++panel_addto_rounded_rect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ static GdkPixbuf *corner_pixbuf = NULL; ++ GnomeCanvasRE const *re = GNOME_CANVAS_RE (item); ++ int dest_width, dest_height, src_width, src_height; ++ int dx, dy; ++ int corner_size = 5; ++ double affine[6]; ++ ++ GNOME_CANVAS_ITEM_CLASS (panel_addto_rounded_rect_parent_class)->draw (item, drawable, x, y, width, height); ++ ++ if (corner_pixbuf == NULL) ++ corner_pixbuf = gdk_pixbuf_new_from_inline (-1, ++ panel_addto_rounded_rect_frame, FALSE, NULL); ++ src_width = gdk_pixbuf_get_width (corner_pixbuf); ++ src_height = gdk_pixbuf_get_height (corner_pixbuf); ++ ++ gnome_canvas_item_i2c_affine (item, affine); ++ ++ dest_width = fabs (re->x2 - re->x1); ++ dest_height = fabs (re->y2 - re->y1); ++ dx = affine[4] - x; ++ dy = affine[5] - y; ++ ++ /* draw top left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, 0, ++ dx, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw top right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, 0, ++ dx + dest_width - corner_size, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, src_height - corner_size, ++ dx, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, src_height - corner_size, ++ dx + dest_width - corner_size, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++} ++ ++static void ++panel_addto_rounded_rect_class_init (PanelAddtoRoundedRectClass *klass) ++{ ++ GnomeCanvasItemClass *item_klass = (GnomeCanvasItemClass *) klass; ++ item_klass->draw = panel_addto_rounded_rect_draw; ++} ++static void ++panel_addto_rounded_rect_init (PanelAddtoRoundedRect *rr) ++{ ++} +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect.h gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect.h +--- gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,39 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * gnomecc-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++ * USA ++ */ ++#ifndef PANEL_ADDTO_ROUNDED_RECT_H ++#define PANEL_ADDTO_ROUNDED_RECT_H ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_ROUNDED_RECT (panel_addto_rounded_rect_get_type ()) ++#define PANEL_ADDTO_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT, PanelAddtoRoundedRect)) ++#define PANEL_ADDTO_IS_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT)) ++ ++typedef struct _PanelAddtoRoundedRect PanelAddtoRoundedRect; ++GType panel_addto_rounded_rect_get_type (void); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_ROUNDED_RECT_H */ +diff -Nur gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.19.2/gnome-panel/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/gnome-panel/panel-addto-rounded-rect-pixbuf.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,319 @@ ++/* GdkPixbuf RGBA C-Source image dump */ ++ ++#ifdef __SUNPRO_C ++#pragma align 4 (panel_addto_rounded_rect_frame) ++#endif ++#ifdef __GNUC__ ++static const guint8 panel_addto_rounded_rect_frame[] __attribute__ ((__aligned__ (4))) = ++#else ++static const guint8 panel_addto_rounded_rect_frame[] = ++#endif ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (5848) */ ++ "\0\0\26\360" ++ /* pixdata_type (0x1010002) */ ++ "\1\1\0\2" ++ /* rowstride (344) */ ++ "\0\0\1X" ++ /* width (86) */ ++ "\0\0\0V" ++ /* height (17) */ ++ "\0\0\0\21" ++ /* pixel_data: */ ++ "\377\377\377\377\377\377\377\377\377\377\377\303\377\377\377q\377\377" ++ "\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377/\377\377\377q\377\377\377\303\377\377" ++ "\377\377\377\377\377\377\377\377\377\377\377\377\377\242\377\377\377" ++ "(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377(\377\377\377\242\377\377\377\377\377\377\377\303\377\377" ++ "\377(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377(\377\377\377\303\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377\303\377\377\377(\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377(\377\377\377\303\377\377\377\377\377\377\377\242\377\377\377(\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377(\377\377\377\242\377\377\377\377\377\377\377\377\377\377\377" ++ "\377\377\377\377\303\377\377\377q\377\377\377/\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377/\377\377\377q\377\377\377\303\377\377\377\377\377\377\377\377"}; ++ ++ +diff -Nur gnome-panel-2.19.2/panel-addto-canvas.c gnome-panel-2.19.2.new/panel-addto-canvas.c +--- gnome-panel-2.19.2/panel-addto-canvas.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-canvas.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,2309 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto.h" ++#include "panel-profile.h" ++ ++#define PAD 5 /*when scrolling keep a few pixels above or below if possible */ ++#define ABOVE_LINE_SPACING 0 ++#define UNDER_LINE_SPACING 0 ++#define UNDER_TITLE_SPACING 0 /* manually insert 1 blank line of text */ ++#define LINE_HEIGHT 1 ++#define BORDERS 7 ++#define MAX_ITEM_WIDTH 125 ++#define ITEMS_SEPARATION 7 ++ ++#include "panel-addto-canvas.h" ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define PANEL_ADDTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasPrivate)) ++ ++typedef struct EntryInfo { ++ PanelAddtoCanvas *canvas; ++ ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *text; ++ GnomeCanvasItem *pixbuf; ++ GnomeCanvasItem *highlight_pixbuf; ++ GnomeCanvasItem *cover; ++ GnomeCanvasItem *selection; ++ ++ double icon_height; ++ double icon_width; ++ double text_height; ++ guint launching : 1; ++ guint selected : 1; ++ guint highlighted : 1; ++ gboolean visible; ++ ++ gint n_category; ++ gint n_entry; ++ gint index; ++} EntryInfo; ++ ++typedef struct { ++ GnomeCanvasGroup *group; ++ GnomeCanvasItem *title; ++ GnomeCanvasItem *line; ++ gboolean visible; ++} CategoryInfo; ++ ++enum { ++ SELECTION_CHANGED, ++ LAST_SIGNAL ++}; ++ ++enum { ++ PROP_0, ++ PROP_INFO ++}; ++ ++ ++static guint panel_addto_canvas_signals [LAST_SIGNAL] = { 0 }; ++ ++ ++static void panel_addto_canvas_class_init (PanelAddtoCanvasClass *class); ++static void panel_addto_canvas_init (PanelAddtoCanvas *canvas); ++static void panel_addto_canvas_finalize (GObject *object); ++static void panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec); ++static void panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height); ++static void panel_addto_canvas_size_allocate (GtkWidget *canvas, ++ GtkAllocation *allocation); ++static void panel_addto_canvas_style_set (GtkWidget *canvas, ++ GtkStyle *previous_style); ++static void panel_addto_canvas_realize (GtkWidget *canvas); ++ ++static void panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas); ++static void build_canvas (PanelAddtoCanvas *canvas); ++static void relayout_canvas (PanelAddtoCanvas *canvas); ++static void set_style (PanelAddtoCanvas *canvas, gboolean font_changed); ++ ++G_DEFINE_TYPE (PanelAddtoCanvas, panel_addto_canvas, GNOME_TYPE_CANVAS); ++ ++ ++static AtkObject* panel_addto_canvas_get_accessible (GtkWidget *widget); ++ ++#include "panel-addto-event-box.h" ++#include "panel-addto-rounded-rect.h" ++#include "panel-profile.h" ++ ++static void ++panel_addto_canvas_class_init (PanelAddtoCanvasClass *class) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (class); ++ GnomeCanvasClass *canvas_class = GNOME_CANVAS_CLASS (class); ++ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); ++ ++ object_class->set_property = panel_addto_canvas_set_property; ++ object_class->get_property = panel_addto_canvas_get_property; ++ object_class->finalize = panel_addto_canvas_finalize; ++ canvas_class->draw_background = panel_addto_canvas_draw_background; ++ ++ widget_class->style_set = panel_addto_canvas_style_set; ++ widget_class->size_allocate = panel_addto_canvas_size_allocate; ++ widget_class->realize = panel_addto_canvas_realize; ++ widget_class->get_accessible = panel_addto_canvas_get_accessible; ++ ++ class->changed = NULL; ++ ++ g_object_class_install_property (object_class, ++ PROP_INFO, ++ g_param_spec_pointer ("info", ++ "information for the canvas", ++ "information for the canvas", ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); ++ panel_addto_canvas_signals [SELECTION_CHANGED] = ++ g_signal_new ("selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (PanelAddtoCanvasClass, changed), ++ NULL, NULL, ++ g_cclosure_marshal_VOID__STRING, ++ G_TYPE_NONE, 1, ++ G_TYPE_STRING); ++ ++ g_type_class_add_private (object_class, ++ sizeof (PanelAddtoCanvasPrivate)); ++} ++ ++ ++static void ++panel_addto_canvas_init (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ g_return_if_fail (PANEL_ADDTO_IS_CANVAS (canvas)); ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ priv->max_width = 300; ++ priv->min_height = 0; ++ priv->info = NULL; ++ priv->selected = NULL; ++ ++ priv->max_item_width = 0; ++ priv->max_item_height = 0; ++ priv->items_per_row = 0; ++ priv->rtl = (gtk_widget_get_direction (GTK_WIDGET (canvas)) == GTK_TEXT_DIR_RTL); ++ priv->accessible_children = g_hash_table_new (g_int_hash, g_int_equal); ++ ++ gtk_widget_show_all (GTK_WIDGET (canvas)); ++} ++ ++static void ++panel_addto_canvas_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ priv->info = g_value_get_pointer (value); ++ build_canvas (PANEL_ADDTO_CANVAS (object)); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (object); ++ ++ switch (prop_id) { ++ case PROP_INFO: ++ g_value_set_pointer (value, priv->info); ++ break; ++ } ++} ++ ++static void ++panel_addto_canvas_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) ++ (* G_OBJECT_CLASS (panel_addto_canvas_parent_class)->finalize) (object); ++} ++ ++ ++static void ++panel_addto_canvas_draw_background (GnomeCanvas *canvas, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ /* By default, we use the style base color. */ ++ gdk_gc_set_foreground (canvas->pixmap_gc, ++ >K_WIDGET (canvas)->style->base[GTK_STATE_NORMAL]); ++ gdk_draw_rectangle (drawable, ++ canvas->pixmap_gc, ++ TRUE, ++ 0, 0, ++ width, height); ++} ++ ++static void ++panel_addto_canvas_size_allocate(GtkWidget *canvas, GtkAllocation *allocation) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->size_allocate) (canvas, allocation); ++ ++ if (allocation->height == 1 || allocation->width == 1) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_width = allocation->width; ++ priv->min_height = allocation->height; ++ ++ relayout_canvas (PANEL_ADDTO_CANVAS (canvas)); ++ ++ gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, priv->width - 1, priv->height - 1); ++ g_object_set (priv->under_cover, ++ "x2", priv->width, ++ "y2", priv->height, ++ NULL); ++} ++ ++static void ++panel_addto_canvas_realize (GtkWidget *canvas) ++{ ++ if (GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) ++ (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->realize) (canvas); ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), FALSE); ++} ++ ++static void ++panel_addto_canvas_style_set (GtkWidget *canvas, GtkStyle *previous_style) ++{ ++ if (!GTK_WIDGET_REALIZED (canvas)) ++ return; ++ ++ set_style (PANEL_ADDTO_CANVAS (canvas), (previous_style && ++ canvas->style && ++ !pango_font_description_equal (canvas->style->font_desc, ++ previous_style->font_desc))); ++} ++ ++static void ++gnome_canvas_item_show_hide (GnomeCanvasItem *item, gboolean show) ++{ ++ if (show) ++ gnome_canvas_item_show (item); ++ else ++ gnome_canvas_item_hide (item); ++} ++ ++static void ++setup_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ GtkWidget *widget; ++ GtkStateType state; ++ ++ if (!entry) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ widget = GTK_WIDGET (canvas); ++ ei = entry->user_data; ++ ++ if (ei->pixbuf) { ++ gnome_canvas_item_show_hide (ei->highlight_pixbuf, ei->highlighted); ++ gnome_canvas_item_show_hide (ei->pixbuf, !ei->highlighted); ++ } ++ if (!ei->selected) ++ state = GTK_STATE_NORMAL; ++ else if (gtk_window_has_toplevel_focus (GTK_WINDOW (gtk_widget_get_toplevel (widget)))) ++ state = GTK_STATE_SELECTED; ++ else ++ state = GTK_STATE_ACTIVE; ++ gnome_canvas_item_show_hide (ei->selection, ei->selected); ++ g_object_set (ei->selection, ++ "fill_color_gdk", &widget->style->base [state], ++ NULL); ++ g_object_set (ei->text, ++ "fill_color_gdk", &widget->style->text [state], ++ NULL); ++} ++ ++static gboolean ++cb_entry_info_reset (gpointer data) ++{ ++ EntryInfo *ei = data; ++ ei->launching = FALSE; ++ return FALSE; ++} ++ ++ ++void ++activate_entry (PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ ++ if (!ei->launching) { ++ ei->launching = TRUE; ++ gtk_timeout_add (1000, cb_entry_info_reset, ei); ++ ++ if (panel_addto_add_item (entry->dialog, entry->item_info)) ++ gtk_widget_destroy (entry->dialog->addto_dialog); ++ } ++} ++ ++static void ++panel_addto_drag_data_get_cb (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ const char *string) ++{ ++ gtk_selection_data_set (selection_data, ++ selection_data->target, 8, (guchar *) string, ++ strlen (string)); ++} ++ ++static void ++panel_addto_drag_begin_cb (GtkWidget *canvas, ++ GdkDragContext *context, ++ gpointer data) ++{ ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = priv->selected; ++ gtk_drag_set_icon_pixbuf (context, entry->icon_pixbuf, 0, 0); ++} ++ ++static void ++panel_addto_setup_drag (PanelAddtoCanvas *canvas, ++ const GtkTargetEntry *target, ++ const char *text) ++{ ++ if (!text || panel_lockdown_get_locked_down ()) ++ return; ++ ++ ++ gtk_drag_source_set (GTK_WIDGET (canvas), ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ target, 1, GDK_ACTION_COPY); ++ ++ g_signal_connect_data (G_OBJECT (canvas), "drag_data_get", ++ G_CALLBACK (panel_addto_drag_data_get_cb), ++ g_strdup (text), ++ (GClosureNotify) g_free, ++ 0 /* connect_flags */); ++ g_signal_connect_after (G_OBJECT (canvas), "drag-begin", ++ G_CALLBACK (panel_addto_drag_begin_cb), ++ NULL); ++} ++ ++static void ++panel_addto_setup_launcher_drag (PanelAddtoCanvas *canvas, ++ const char *uri) ++{ ++ static GtkTargetEntry target[] = { ++ { "text/uri-list", 0, 0 } ++ }; ++ char *uri_list; ++ ++ uri_list = g_strconcat (uri, "\r\n", NULL); ++ panel_addto_setup_drag (canvas, target, uri_list); ++ g_free (uri_list); ++} ++ ++static void ++panel_addto_setup_applet_drag (PanelAddtoCanvas *canvas, ++ const char *iid) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-iid", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, iid); ++} ++ ++ ++ ++static void ++panel_addto_setup_internal_applet_drag (PanelAddtoCanvas *canvas, ++ const char *applet_type) ++{ ++ static GtkTargetEntry target[] = { ++ { "application/x-panel-applet-internal", 0, 0 } ++ }; ++ ++ panel_addto_setup_drag (canvas, target, applet_type); ++} ++ ++static void ++panel_addto_selection_changed (PanelAddtoCanvas *canvas, ++ const gchar *status_display, ++ PanelAddtoDialog *dialog) ++{ ++ PanelAddtoItemInfo *data; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ data = priv->selected ? priv->selected->item_info : NULL; ++ ++ ++ if ((!priv->selected) || (!data)) { ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE); ++ return; ++ } ++ ++ gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), TRUE); ++ ++ if (dialog->statuslabel) ++ gtk_label_set_text (GTK_LABEL (dialog->statuslabel), priv->selected->comment); ++ ++ if (data->type == PANEL_ADDTO_LAUNCHER_MENU) { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_GO_FORWARD); ++ } else { ++ gtk_button_set_label (GTK_BUTTON (dialog->add_button), ++ GTK_STOCK_ADD); ++ } ++ gtk_button_set_use_stock (GTK_BUTTON (dialog->add_button), ++ TRUE); ++ ++} ++ ++static void ++select_entry (PanelAddtoCanvas *canvas, PanelAddtoEntry *entry) ++{ ++ PanelAddtoDialog *dialog; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei = NULL; ++ GtkAdjustment *pos; ++ double affine[6]; ++ PanelAddtoEntry *selected; ++ ++ dialog = entry->dialog; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ selected = priv->selected; ++ ++ if (selected == entry) ++ return; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = FALSE; ++ setup_entry (canvas, selected); ++ ++ priv->selected = selected = entry; ++ ++ if (selected && selected->user_data) ++ ((EntryInfo *) selected->user_data)->selected = TRUE; ++ setup_entry (canvas, selected); ++ ++ g_signal_emit (canvas, panel_addto_canvas_signals [SELECTION_CHANGED], 0, ++ (entry) ? entry->comment : NULL); ++ ++ if (!entry) ++ return; ++ ++ ei = entry->user_data; ++ gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ei->group), affine); ++ pos = gtk_layout_get_vadjustment (GTK_LAYOUT (ei->cover->canvas)); ++ ++ if (affine[5] < pos->value) ++ gtk_adjustment_set_value (pos, MAX (affine[5] - PAD, 0)); ++ else if ((affine[5] + priv->max_item_height) > (pos->value+pos->page_size)) ++ gtk_adjustment_set_value (pos, MAX (MIN (affine[5] + priv->max_item_height + PAD, pos->upper) - pos->page_size, 0)); ++} ++ ++static gboolean ++cover_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoEntry *entry) ++{ ++ EntryInfo *ei = entry->user_data; ++ PanelAddtoCanvas *canvas = ei->canvas; ++ PanelAddtoItemInfo *data; ++ PanelAddtoDialog *dialog = entry->dialog; ++ char *iid; ++ ++ data = entry->item_info; ++ ++ switch (event->type) { ++ case GDK_ENTER_NOTIFY: ++ ei->highlighted = TRUE; ++ setup_entry (canvas, entry); /* highlight even if it is already selected */ ++ ++ /* only allow dragging applets if we can add applets */ ++ if (panel_profile_id_lists_are_writable ()) { ++ switch (data->type) { ++ case PANEL_ADDTO_LAUNCHER: ++ panel_addto_setup_launcher_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->launcher_path); ++ break; ++ case PANEL_ADDTO_APPLET: ++ panel_addto_setup_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ case PANEL_ADDTO_LAUNCHER_MENU: ++ break; ++ case PANEL_ADDTO_MENU: ++ /* build the iid for menus other than the main menu */ ++ if (data->iid == NULL) { ++ iid = g_strdup_printf ("MENU:%s/%s", ++ data->menu_filename, ++ data->menu_path); ++ } else { ++ iid = g_strdup (data->iid); ++ } ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ iid); ++ g_free (iid); ++ break; ++ default: ++ panel_addto_setup_internal_applet_drag (PANEL_ADDTO_CANVAS (dialog->canvas), ++ data->iid); ++ break; ++ } ++ } ++ ++ return TRUE; ++ case GDK_LEAVE_NOTIFY: ++ ei->highlighted = FALSE; ++ setup_entry (canvas, entry); ++ return TRUE; ++ case GDK_BUTTON_PRESS: ++ select_entry (canvas, entry); ++ gtk_widget_grab_focus (GTK_WIDGET (canvas)); ++ return TRUE; ++ case GDK_2BUTTON_PRESS: ++ if (event->button.button == 1) ++ activate_entry (entry); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++static void ++panel_addto_select_first_entry (PanelAddtoCanvas *canvas) ++{ ++ PanelAddtoCategory *category; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ EntryInfo *ei; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ category = g_slist_nth_data (priv->info->categories, 0); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ select_entry (canvas, entry); ++} ++ ++static gint ++panel_addto_count_visible_entries (PanelAddtoCategory *category) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint n_visible_entries = 0; ++ ++ for (l = category->entries; l; l = l->next) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ n_visible_entries++; ++ } ++ return n_visible_entries; ++} ++ ++static gint ++panel_addto_get_rank_of_nth_visible_entry (PanelAddtoCategory *category, gint n) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_visible_entries = 0; ++ gint seen_entries = 0; ++ gint farthest_visible_entry = 0; ++ ++ l = category->entries; ++ ++ while (seen_visible_entries < n) { ++ if (!l) break; ++ seen_entries++; ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) { ++ seen_visible_entries++; ++ farthest_visible_entry = seen_entries; ++ } ++ l = l->next; ++ } ++ ++ return (farthest_visible_entry - 1); ++} ++ ++static gint ++panel_addto_how_many_visible_entries_before_me (PanelAddtoCategory *category, gint rank) ++{ ++ GSList *l; ++ PanelAddtoEntry *entry; ++ EntryInfo *ei; ++ gint seen_entries = 0; ++ gint seen_visible_entries = 0; ++ ++ l = category->entries; ++ while (seen_entries < rank) { ++ entry = l->data; ++ ei = entry->user_data; ++ if (ei->visible) ++ seen_visible_entries++; ++ l = l->next; ++ seen_entries++; ++ } ++ return seen_visible_entries; ++} ++ ++static void ++panel_addto_select_east_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == category->n_entries - 1) { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category + 1); ++ entry = g_slist_nth_data (category->entries, 0); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_west_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category, n_entry; ++ gint n_categories; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ if (ei->n_entry == 0) { ++ if (n_category == 0) ++ return; ++ category = g_slist_nth_data (priv->info->categories, ei->n_category - 1); ++ entry = g_slist_nth_data (category->entries, category->n_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_west_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_north_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ if (n_visible_entries_before_me + 1 - priv->items_per_row <= 0) { ++ if (n_category == 0) { ++ panel_addto_select_first_entry (canvas); ++ return; ++ } ++ n_category--; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, --n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row ++ + ((n_visible_entries_before_me + 1) % priv->items_per_row))); ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry - priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static void ++panel_addto_select_south_entry (EntryInfo *ei, PanelAddtoCanvas *canvas) ++{ ++ gint n_category = 0; ++ gint n_categories; ++ gint n_visible_entries = 0; ++ gint n_visible_entries_before_me = 0; ++ PanelAddtoEntry *entry; ++ PanelAddtoCategory *category; ++ PanelAddtoCanvasPrivate *priv; ++ CategoryInfo *catinfo; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ n_categories = priv->info->n_categories; ++ ++ if (ei) { ++ n_category = ei->n_category; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ n_visible_entries_before_me = ++ panel_addto_how_many_visible_entries_before_me (category, ei->n_entry); ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ if (n_visible_entries_before_me + 1 + priv->items_per_row > n_visible_entries - 1) { ++ if (n_visible_entries_before_me + 1 ++ <= ((n_visible_entries - 1) / priv->items_per_row) * priv->items_per_row) { ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } else { ++ if (n_category == priv->info->n_categories - 1) ++ return; ++ n_category++; ++ category = g_slist_nth_data (priv->info->categories, n_category); ++ catinfo = category->user_data; ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ei->n_entry % priv->items_per_row); ++ if (!catinfo->visible) { ++ while (!catinfo->visible) { ++ category = g_slist_nth_data (priv->info->categories, ++n_category); ++ if (!category) ++ return; ++ catinfo = category->user_data; ++ if (!catinfo) ++ return; ++ } ++ } ++ n_visible_entries = panel_addto_count_visible_entries (category); ++ entry = g_slist_nth_data (category->entries, ++ panel_addto_get_rank_of_nth_visible_entry ++ (category, ++ (n_visible_entries_before_me + 1) % priv->items_per_row)); ++ ++ if (!entry) ++ entry = g_slist_nth_data (category->entries, n_visible_entries - 1); ++ } ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } else { ++ entry = g_slist_nth_data (category->entries, ei->n_entry + priv->items_per_row); ++ ei = entry->user_data; ++ if (!ei->visible) { ++ panel_addto_select_east_entry (ei, canvas); ++ return; ++ } ++ } ++ select_entry (canvas, entry); ++ } else ++ panel_addto_select_first_entry (canvas); ++} ++ ++static gboolean ++cb_canvas_event (GnomeCanvasItem *item, GdkEvent *event, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvas *canvas = (PanelAddtoCanvas *) dialog->canvas; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ EntryInfo *ei = NULL; ++ gint n_category, n_entry; ++ gint n_categories, n_entries; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (event->type == GDK_BUTTON_PRESS) { ++ gtk_drag_source_unset (GTK_WIDGET (canvas)); ++ select_entry (canvas, NULL); ++ gtk_widget_grab_focus (GTK_WIDGET (dialog->canvas)); ++ return TRUE; ++ } ++ ++ if (event->type != GDK_KEY_PRESS) ++ return FALSE; ++ ++ n_entry = 0; ++ n_category = 0; ++ n_categories = priv->info->n_categories; ++ ++ if (priv->selected) { ++ ei = priv->selected->user_data; ++ current_category = g_slist_nth_data (priv->info->categories, ei->n_category); ++ n_entries = current_category->n_entries; ++ } ++ ++ switch (event->key.keyval) { ++ case GDK_KP_Right: ++ case GDK_Right: ++ if (priv->rtl) ++ panel_addto_select_west_entry (ei, canvas); ++ else ++ panel_addto_select_east_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Left: ++ case GDK_Left: ++ if (priv->rtl) ++ panel_addto_select_east_entry (ei, canvas); ++ else ++ panel_addto_select_west_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Down: ++ case GDK_Down: ++ panel_addto_select_south_entry (ei, canvas); ++ return TRUE; ++ case GDK_KP_Up: ++ case GDK_Up: ++ panel_addto_select_north_entry (ei, canvas); ++ return TRUE; ++ case GDK_Tab: ++ case GDK_KP_Tab: ++ case GDK_ISO_Left_Tab: ++ gtk_widget_grab_focus (dialog->search_entry); ++ break; ++ case GDK_Return: ++ case GDK_KP_Enter: ++ if (priv->selected) ++ activate_entry (priv->selected); ++ ++ return TRUE; ++ break; ++ case GDK_Escape: ++ panel_addto_dialog_response (dialog->addto_dialog, ++ GTK_RESPONSE_CANCEL, ++ dialog); ++ return TRUE; ++ default: ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++ ++static void ++calculate_item_width (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PangoLayout *layout; ++ PangoRectangle rectangle; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ layout = GNOME_CANVAS_TEXT (ei->text)->layout; ++ ++ pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); ++ pango_layout_set_width (layout, -1); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ ++ /* If its too big wrap at the max and regen to find the layout */ ++ if (rectangle.width > MAX_ITEM_WIDTH) { ++ pango_layout_set_width (layout, MAX_ITEM_WIDTH * PANGO_SCALE); ++ pango_layout_get_pixel_extents (layout, NULL, &rectangle); ++ rectangle.width = MAX_ITEM_WIDTH; ++ } ++ ++ ei->text_height = rectangle.height; ++ ++ priv->max_item_width = MAX (priv->max_item_width, rectangle.width); ++} ++ ++static void ++calculate_item_height (PanelAddtoCanvas *canvas, EntryInfo *ei) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ gint item_height; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (ei->pixbuf) ++ priv->max_icon_height = MAX (priv->max_icon_height, ei->icon_height); ++ ++ item_height = ei->icon_height + ei->text_height; ++ priv->max_item_height = MAX (priv->max_item_height, item_height); ++} ++ ++static void ++calculate_sizes (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ priv->max_item_height = 0; ++ priv->max_icon_height = 0; ++ priv->max_item_width = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *ei = current_entry->user_data; ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ } ++ } ++} ++ ++static void ++gnome_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy) ++{ ++ double translate[6]; ++ ++ g_return_if_fail (item != NULL); ++ g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); ++ ++ art_affine_translate (translate, dx, dy); ++ ++ gnome_canvas_item_affine_absolute (item, translate); ++} ++ ++static guchar ++lighten_component (guchar cur_value) ++{ ++ int new_value = cur_value; ++ new_value += 24 + (new_value >> 3); ++ if (new_value > 255) { ++ new_value = 255; ++ } ++ return (guchar) new_value; ++} ++ ++static GdkPixbuf * ++create_spotlight_pixbuf (GdkPixbuf* src) ++{ ++ GdkPixbuf *dest; ++ int i, j; ++ int width, height, has_alpha, src_row_stride, dst_row_stride; ++ guchar *target_pixels, *original_pixels; ++ guchar *pixsrc, *pixdest; ++ ++ g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL); ++ g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 3) ++ || (gdk_pixbuf_get_has_alpha (src) ++ && gdk_pixbuf_get_n_channels (src) == 4), NULL); ++ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (src) == 8, NULL); ++ ++ dest = gdk_pixbuf_copy (src); ++ ++ has_alpha = gdk_pixbuf_get_has_alpha (src); ++ width = gdk_pixbuf_get_width (src); ++ height = gdk_pixbuf_get_height (src); ++ dst_row_stride = gdk_pixbuf_get_rowstride (dest); ++ src_row_stride = gdk_pixbuf_get_rowstride (src); ++ target_pixels = gdk_pixbuf_get_pixels (dest); ++ original_pixels = gdk_pixbuf_get_pixels (src); ++ ++ for (i = 0; i < height; i++) { ++ pixdest = target_pixels + i * dst_row_stride; ++ pixsrc = original_pixels + i * src_row_stride; ++ for (j = 0; j < width; j++) { ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ *pixdest++ = lighten_component (*pixsrc++); ++ if (has_alpha) { ++ *pixdest++ = *pixsrc++; ++ } ++ } ++ } ++ ++ return dest; ++} ++ ++static void ++build_canvas (PanelAddtoCanvas *canvas) ++{ ++ GSList *l, *m; ++ EntryInfo *ei; ++ PanelAddtoDialog *dialog; ++ PanelAddtoCategory *current_category = NULL; ++ PanelAddtoInformation *current_info = NULL; ++ PanelAddtoEntry *current_entry = NULL; ++ PanelAddtoCanvasPrivate *priv; ++ GnomeCanvas *gcanvas; ++ GnomeCanvasGroup *hidden_group; ++ int i, j, index; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gcanvas = GNOME_CANVAS (canvas); ++ current_category = priv->info->categories->data; ++ current_entry = current_category->entries->data; ++ dialog = current_entry->dialog; ++ index = 0; ++ ++ priv->under_cover = gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ panel_addto_event_box_get_type(), ++ NULL); ++ ++ current_info = priv->info; ++ gnome_canvas_item_grab_focus (GNOME_CANVAS_ITEM (gnome_canvas_root (gcanvas))); ++ g_signal_connect (gnome_canvas_root (gcanvas), "event", ++ G_CALLBACK (cb_canvas_event), dialog); ++ ++ hidden_group = GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ for (l = priv->info->categories, i = 0; l; l = l->next, i++) { ++ ++ CategoryInfo *catinfo; ++ current_category = l->data; ++ ++ if (current_category->user_data == NULL) ++ current_category->user_data = g_new (CategoryInfo, 1); ++ ++ catinfo = current_category->user_data; ++ catinfo->group = NULL; ++ catinfo->title = NULL; ++ catinfo->line = NULL; ++ ++ catinfo->group = ++ GNOME_CANVAS_GROUP (gnome_canvas_item_new (gnome_canvas_root (gcanvas), ++ gnome_canvas_group_get_type (), ++ NULL)); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), 0, BORDERS); ++ ++ catinfo->line = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_rect_get_type (), ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ ++ catinfo->title = NULL; ++ ++ if (current_category && (priv->info->n_categories != 1)) { ++ char *label = g_strdup_printf ("%s", current_category->title); ++ catinfo->title = gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_text_get_type (), ++ "text", current_category->title, ++ "markup", label, ++ "anchor", GTK_ANCHOR_NW, ++ NULL); ++ g_free (label); ++ } ++ ++ for (m = current_category->entries, j = 0; m; m = m->next, j++) { ++ current_entry = m->data; ++ ++ if (current_entry->user_data == NULL) ++ current_entry->user_data = g_new0 (EntryInfo, 1); ++ ++ ei = current_entry->user_data; ++ ++ ei->canvas = canvas; ++ ei->group = GNOME_CANVAS_GROUP ( ++ gnome_canvas_item_new (catinfo->group, ++ gnome_canvas_group_get_type (), ++ NULL)); ++ ei->selection = gnome_canvas_item_new ( ++ ei->group, ++ PANEL_ADDTO_TYPE_ROUNDED_RECT, ++ NULL); ++ ++ if (current_entry->title) { ++ ei->text = gnome_canvas_item_new (ei->group, ++ gnome_canvas_text_get_type (), ++ "anchor", GTK_ANCHOR_NW, ++ "justification", GTK_JUSTIFY_CENTER, ++ "clip", TRUE, ++ NULL); ++ pango_layout_set_alignment (GNOME_CANVAS_TEXT (ei->text)->layout, ++ PANGO_ALIGN_CENTER); ++ pango_layout_set_justify (GNOME_CANVAS_TEXT (ei->text)->layout, ++ FALSE); ++ g_object_set (ei->text, ++ "text", current_entry->title, ++ NULL); ++ } else ++ ei->text = NULL; ++ ++ if (current_entry->icon_pixbuf) { ++ GdkPixbuf *pixbuf = current_entry->icon_pixbuf; ++ GdkPixbuf *highlight_pixbuf = ++ create_spotlight_pixbuf (pixbuf); ++ ++ ei->icon_height = gdk_pixbuf_get_height (pixbuf); ++ ei->icon_width = gdk_pixbuf_get_width (pixbuf); ++ ei->pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", pixbuf, ++ NULL); ++ g_object_unref (pixbuf); ++ ei->highlight_pixbuf = gnome_canvas_item_new (ei->group, ++ gnome_canvas_pixbuf_get_type (), ++ "pixbuf", highlight_pixbuf, ++ NULL); ++ g_object_unref (highlight_pixbuf); ++ } else { ++ ei->pixbuf = NULL; ++ ei->highlight_pixbuf = NULL; ++ } ++ ++ ei->cover = gnome_canvas_item_new (ei->group, ++ panel_addto_event_box_get_type(), ++ NULL); ++ calculate_item_width (canvas, ei); ++ calculate_item_height (canvas, ei); ++ ++ ei->n_category = i; ++ ei->n_entry = j; ++ ei->index = index; ++ ++ setup_entry (canvas, current_entry); ++ ++ g_signal_connect (ei->cover, "event", ++ G_CALLBACK (cover_event), ++ current_entry); ++ index++; ++ } ++ } ++ ++ dialog = current_entry->dialog; ++ ++ g_signal_connect (G_OBJECT (canvas), "selection-changed", ++ G_CALLBACK (panel_addto_selection_changed), current_entry->dialog); ++} ++ ++ ++static const char * ++panel_addto_utf8_casestrstr (const char *haystack, const char *needle) ++{ ++ ++ if (!haystack) ++ return NULL; ++ ++ haystack = g_utf8_strdown (haystack, -1); ++ needle = g_utf8_strdown (needle, -1); ++ ++ const char *s; ++ gsize i; ++ gsize haystack_len = g_utf8_strlen (haystack, -1); ++ gsize needle_len = g_utf8_strlen (needle, -1); ++ int needle_size = strlen (needle); ++ ++ if (needle_len > haystack_len) ++ return NULL; ++ ++ s = haystack; ++ for (i = 0; i <= haystack_len - needle_len; i++) { ++ if (strncmp (s, needle, needle_size) == 0) ++ return s; ++ s = g_utf8_next_char (s); ++ } ++ ++ return NULL; ++} ++ ++void ++panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ gchar *search_text; ++ PanelAddtoCanvasPrivate *priv; ++ ++ search_text = g_malloc (strlen ((gchar*) gtk_entry_get_text (GTK_ENTRY (search_entry))) + 1); ++ g_stpcpy (search_text, gtk_entry_get_text (GTK_ENTRY (search_entry))); ++ g_strchomp (search_text); ++ if (dialog->canvas) { ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ priv->search_text = search_text; ++ gtk_widget_queue_resize (GTK_WIDGET (dialog->canvas)); ++ } ++} ++ ++void ++panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (dialog->canvas); ++ if (priv->selected) ++ activate_entry (priv->selected); ++} ++ ++/* If we can't find the search query in the applet's name, in the applet's ++ * description, nor in the applet's category, then the applet has to be hidden. ++ */ ++ ++static gboolean ++panel_addto_entry_must_be_hidden (PanelAddtoEntry *entry, const gchar **search_terms) ++{ ++ gint i; ++ gint nb_search_terms = 0, nb_found = 0; ++ gboolean search_is_null = TRUE; ++ ++ for (i = 0; search_terms[i] != NULL; i++) { ++ nb_search_terms ++; ++ search_is_null = FALSE; ++ if ( ++ (entry->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->comment ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->comment, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL))) ++ || (entry->category->title ++ && panel_addto_utf8_casestrstr (g_locale_to_utf8 (entry->category->title, -1, NULL, NULL, NULL), ++ g_locale_to_utf8 (search_terms[i], -1, NULL, NULL, NULL)))) ++ nb_found++; ++ } ++ ++ if (search_is_null || nb_found == nb_search_terms) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++/* A category canvas item contains all the elements ++ * for the category, as well as the title and a separator ++ */ ++static void ++relayout_category (PanelAddtoCanvas *canvas, CategoryInfo *catinfo, ++ gint vert_pos, gint *category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (catinfo->group), ++ 0, vert_pos); ++ ++ if (catinfo->line) { ++ gnome_canvas_item_move_absolute (catinfo->line, BORDERS, ABOVE_LINE_SPACING); ++ ++ gnome_canvas_item_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ if (catinfo->title) { ++ double text_height, text_width; ++ ++ g_object_get (catinfo->title, ++ "text_height", &text_height, ++ "text_width", &text_width, ++ NULL); ++ ++ *category_vert_pos += text_height; /* move it down 1 line */ ++ gnome_canvas_item_move_absolute (catinfo->title, ++ (priv->rtl) ? priv->max_width - BORDERS - text_width : BORDERS, ++ *category_vert_pos); ++ *category_vert_pos += text_height + text_height/2 + UNDER_TITLE_SPACING; ++ } ++} ++ ++static void ++relayout_item (PanelAddtoCanvas *canvas, EntryInfo *ei, ++ gint category_horiz_pos, gint category_vert_pos) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ gnome_canvas_item_move_absolute (GNOME_CANVAS_ITEM (ei->group), ++ category_horiz_pos, ++ category_vert_pos); ++ ++ gnome_canvas_item_set (ei->selection, ++ "x2", (double) priv->max_item_width + 2 * PAD, ++ "y2", (double) ei->text_height + 1, /* expand it down slightly */ ++ NULL); ++ ++ gnome_canvas_item_move_absolute (ei->selection, -PAD, priv->max_icon_height); ++ ++ if (ei->text) { ++ /* canvas asks layout for its extent, layout gives real ++ * size, not fixed width and drawing gets confused. ++ */ ++ gnome_canvas_item_set (ei->text, ++ "clip_width", (double) priv->max_item_width, ++ "clip_height", (double) priv->max_item_height, ++ NULL); ++ ++ /* text is centered by pango */ ++ pango_layout_set_width (GNOME_CANVAS_TEXT (ei->text)->layout, ++ (gint) priv->max_item_width * PANGO_SCALE); ++ ++ gnome_canvas_item_move_absolute (ei->text, ++ 0, priv->max_icon_height); ++ } ++ ++ if (ei->pixbuf) { ++ /* manually center the icon */ ++ gnome_canvas_item_move_absolute (ei->pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ gnome_canvas_item_move_absolute (ei->highlight_pixbuf, ++ priv->max_item_width / 2 - ei->icon_width / 2, 0); ++ } ++ ++ /* cover the item */ ++ gnome_canvas_item_set (ei->cover, ++ "x2", (double) priv->max_item_width, ++ "y2", (double) priv->max_item_height, ++ NULL); ++} ++ ++static void ++relayout_canvas (PanelAddtoCanvas *canvas) ++{ ++ gint entry; ++ gint vert_pos, category_vert_pos, category_horiz_pos; ++ gint real_width; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ CategoryInfo *catinfo; ++ EntryInfo *ei; ++ GSList *l, *m; ++ gboolean at_least_one_found, first_shown_category, first_shown_entry; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ real_width = priv->max_width - 2 * BORDERS + ITEMS_SEPARATION; ++ priv->items_per_row = real_width / ((gint) priv->max_item_width + ITEMS_SEPARATION); ++ ++ vert_pos = BORDERS; ++ ++ const gchar *search_text = priv->search_text; ++ gchar **search_terms; ++ search_terms = search_text ? g_strsplit (search_text, " ", 0) : NULL; ++ ++ first_shown_category = TRUE; ++ first_shown_entry = TRUE; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ ++ at_least_one_found = FALSE; ++ category_vert_pos = 0; ++ ++ category_horiz_pos = (priv->rtl) ? priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ ++ current_category = l->data; ++ catinfo = current_category->user_data; ++ ++ relayout_category (canvas, catinfo, vert_pos, &category_vert_pos); ++ category_vert_pos += UNDER_LINE_SPACING; ++ ++ for (m = current_category->entries, entry = 0; m; m = m->next, entry++) { ++ ++ current_entry = m->data; ++ ei = current_entry->user_data; ++ ++ /* we don't want the first item to wrap, it would ++ be too separated from the section title */ ++ ++ if (!search_text || !panel_addto_entry_must_be_hidden (current_entry, (const gchar **)search_terms)) { ++ at_least_one_found = TRUE; ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = TRUE; ++ if ((entry > 0) && ++ ((priv->items_per_row == 0) || ++ (priv->items_per_row > 0 && (entry % priv->items_per_row == 0)))) { ++ ++ category_horiz_pos = (priv->rtl) ? ++ priv->max_width - (gint) priv->max_item_width - BORDERS : BORDERS; ++ category_vert_pos += (gint) priv->max_item_height + ITEMS_SEPARATION; ++ } ++ ++ relayout_item (canvas, ei, category_horiz_pos, category_vert_pos); ++ ++ if (priv->rtl) ++ category_horiz_pos -= (gint) priv->max_item_width + ITEMS_SEPARATION; ++ else ++ category_horiz_pos += (gint) priv->max_item_width + ITEMS_SEPARATION; ++ ++ /* If the user is actually using the search bar, select ++ * the first shown entry. ++ */ ++ if (search_text && first_shown_entry) { ++ select_entry (canvas, current_entry); ++ first_shown_entry = FALSE; ++ } ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (ei->group)); ++ ei->visible = FALSE; ++ entry --; ++ } ++ ++ } ++ if (at_least_one_found) { ++ gnome_canvas_item_show (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = TRUE; ++ category_vert_pos += (gint) priv->max_item_height; ++ vert_pos += category_vert_pos + ITEMS_SEPARATION; ++ ++ if (first_shown_category) { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) 0, ++ NULL); ++ first_shown_category = FALSE; ++ } else { ++ g_object_set (catinfo->line, ++ "x2", (double) priv->max_width - 2 * BORDERS, ++ "y2", (double) LINE_HEIGHT, ++ NULL); ++ } ++ ++ } else { ++ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (catinfo->group)); ++ catinfo->visible = FALSE; ++ } ++ } ++ ++ /* substract the last ITEMS_SEPARATION to ++ adjust the canvas size a bit more */ ++ vert_pos -= ITEMS_SEPARATION; ++ ++ priv->height = MAX (vert_pos, priv->min_height); ++ priv->width = priv->max_width; ++} ++ ++ ++static void ++set_style (PanelAddtoCanvas *canvas, gboolean font_changed) ++{ ++ GSList *l, *m; ++ PanelAddtoCategory *current_category; ++ PanelAddtoEntry *current_entry; ++ PanelAddtoCanvasPrivate *priv; ++ GtkWidget *widget = GTK_WIDGET (canvas); ++ ++ ++ if (!GTK_WIDGET_REALIZED (widget)) ++ return; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ CategoryInfo *catinfo = current_category->user_data; ++ ++ if (catinfo->line) { ++ g_object_set (catinfo->line, ++ "fill_color_gdk", &widget->style->text_aa[GTK_STATE_NORMAL], ++ NULL); ++ } ++ if (catinfo->title) { ++ g_object_set (catinfo->title, ++ "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL], ++ NULL); ++ ++ if (font_changed) ++ g_object_set (catinfo->title, ++ "font", NULL, ++ NULL); ++ } ++ ++ for (m = current_category->entries; m; m = m->next) { ++ current_entry = m->data; ++ EntryInfo *entryinfo = current_entry->user_data; ++ if (font_changed && entryinfo->text) ++ g_object_set (entryinfo->text, ++ "font", NULL, ++ NULL); ++ setup_entry (canvas, current_entry); ++ } ++ } ++ ++ if (font_changed) { ++ calculate_sizes (canvas); ++ relayout_canvas (canvas); ++ } ++} ++ ++ ++GtkWidget* ++panel_addto_canvas_new (PanelAddtoInformation *info) ++{ ++ ++ return g_object_new (PANEL_ADDTO_TYPE_CANVAS, ++ "info", info, ++ NULL); ++} ++ ++/* Accessibility support */ ++ ++static gpointer accessible_parent_class; ++static gpointer accessible_item_parent_class; ++ ++enum { ++ ACTION_ACTIVATE, ++ LAST_ACTION ++}; ++ ++typedef struct { ++ AtkObject parent; ++ ++ PanelAddtoEntry *entry; ++ AtkStateSet *state_set; ++ ++ guint action_idle_handler; ++} PanelAddtoCanvasItemAccessible; ++ ++typedef struct { ++ AtkObjectClass parent_class; ++} PanelAddtoCanvasItemAccessibleClass; ++ ++static const gchar *const action_names[] = ++{ ++ "activate", ++ NULL ++}; ++ ++static const gchar *const action_descriptions[] = ++{ ++ "Activate item", ++ NULL ++}; ++ ++static void ++panel_addto_canvas_item_accessible_get_extents (AtkComponent *component, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ AtkCoordType coord_type) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ GnomeCanvasItem *cover; ++ AtkObject *parent_object; ++ gint p_x, p_y; ++ ++ item = (PanelAddtoCanvasItemAccessible *) component; ++ ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ parent_object = gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++ atk_component_get_position (ATK_COMPONENT (parent_object), &p_x, &p_y, coord_type); ++ ++ ++ /* the cover pretty much represents the item size */ ++ ++ ++ cover = GNOME_CANVAS_ITEM (((EntryInfo *)item->entry->user_data)->cover); ++ ++ *x = p_x + cover->x1; ++ *y = p_y + cover->y1; ++ *width = cover->x2 - cover->x1; ++ *height = cover->y2 - cover->y1; ++} ++ ++static void ++atk_component_item_interface_init (AtkComponentIface *iface) ++{ ++ iface->get_extents = panel_addto_canvas_item_accessible_get_extents; ++} ++ ++static gboolean ++idle_do_action (gpointer data) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) data; ++ ++ item->action_idle_handler = 0; ++ activate_entry (item->entry); ++ ++ return FALSE; ++} ++ ++ ++static gboolean ++panel_addto_canvas_item_accessible_action_do_action (AtkAction *action, ++ gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (index < 0 || index >= LAST_ACTION) ++ return FALSE; ++ ++ item = (PanelAddtoCanvasItemAccessible *) action; ++ ++ switch (index) { ++ case ACTION_ACTIVATE: ++ if (!item->action_idle_handler) ++ item->action_idle_handler = g_idle_add (idle_do_action, item); ++ break; ++ default: ++ g_assert_not_reached (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_action_get_n_actions (AtkAction *action) ++{ ++ return LAST_ACTION; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_description (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_descriptions[index]; ++} ++ ++static const gchar * ++panel_addto_canvas_item_accessible_action_get_name (AtkAction *action, ++ gint index) ++{ ++ if (index < 0 || index >= LAST_ACTION) ++ return NULL; ++ ++ return action_names[index]; ++} ++ ++static void ++atk_action_item_interface_init (AtkActionIface *iface) ++{ ++ iface->do_action = panel_addto_canvas_item_accessible_action_do_action; ++ iface->get_n_actions = panel_addto_canvas_item_accessible_action_get_n_actions; ++ iface->get_description = panel_addto_canvas_item_accessible_action_get_description; ++ iface->get_name = panel_addto_canvas_item_accessible_action_get_name; ++} ++ ++static gint ++panel_addto_canvas_item_accessible_get_index_in_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ return ((EntryInfo *) item->entry->user_data)->index; ++} ++ ++static G_CONST_RETURN gchar* ++panel_addto_canvas_item_accessible_get_name (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ ++ if (object->name) ++ return object->name; ++ else { ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ if (item->entry && item->entry->title) ++ return item->entry->title; ++ else ++ return "Item with no description"; ++ } ++} ++ ++static AtkObject* ++panel_addto_canvas_item_accessible_get_parent (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ ++ return gtk_widget_get_accessible (GTK_WIDGET (canvas)); ++} ++ ++static AtkStateSet* ++panel_addto_canvas_item_accessible_ref_state_set (AtkObject *object) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ canvas = ((EntryInfo *) item->entry->user_data)->canvas; ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (item->entry == priv->selected) ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED); ++ else ++ atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED); ++ ++ return g_object_ref (item->state_set); ++} ++ ++static void ++panel_addto_canvas_item_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ ++ accessible_item_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ ++ class->get_index_in_parent = panel_addto_canvas_item_accessible_get_index_in_parent; ++ class->get_name = panel_addto_canvas_item_accessible_get_name; ++ class->get_parent = panel_addto_canvas_item_accessible_get_parent; ++ class->ref_state_set = panel_addto_canvas_item_accessible_ref_state_set; ++} ++ ++static void ++panel_addto_canvas_item_accessible_object_init (PanelAddtoCanvasItemAccessible *item) ++{ ++ item->state_set = atk_state_set_new (); ++ ++ atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED); ++ atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE); ++ atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE); ++ ++ item->action_idle_handler = 0; ++} ++ ++static GType ++panel_addto_canvas_item_accessible_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (PanelAddtoCanvasItemAccessibleClass), ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_item_accessible_class_init, /* class init */ ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ sizeof (PanelAddtoCanvasItemAccessible), /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) panel_addto_canvas_item_accessible_object_init, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_action_info = { ++ (GInterfaceInitFunc) atk_action_item_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT, ++ "PanelAddtoCanvasItemAccessible", &info, 0); ++ ++ g_type_add_interface_static (type, ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ATK_TYPE_ACTION, ++ &atk_action_info); ++ } ++ ++ return type; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_n_children (AtkObject *accessible) ++{ ++ GSList *l; ++ PanelAddtoCategory *current_category; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ gint count; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ count += current_category->n_entries; ++ } ++ ++ return count; ++} ++ ++static PanelAddtoEntry* ++panel_addto_canvas_accessible_get_entry (PanelAddtoCanvas *canvas, gint index) ++{ ++ GSList *l; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCategory *current_category; ++ gint count; ++ ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ count = 0; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ if (index >= count && ++ index < count + current_category->n_entries) { ++ return g_slist_nth_data (current_category->entries, index - count); ++ } else ++ count += current_category->n_entries; ++ } ++ ++ return NULL; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_child (AtkObject *accessible, gint index) ++{ ++ PanelAddtoCanvasItemAccessible *item; ++ PanelAddtoEntry *entry; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ AtkObject *object; ++ ++ widget = GTK_ACCESSIBLE (accessible)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ entry = panel_addto_canvas_accessible_get_entry (canvas, index); ++ ++ if (!entry) ++ return NULL; ++ ++ object = g_hash_table_lookup (priv->accessible_children, &index); ++ ++ if (!object) { ++ object = g_object_new (panel_addto_canvas_item_accessible_get_type (), NULL); ++ item = (PanelAddtoCanvasItemAccessible *) object; ++ ++ object->role = ATK_ROLE_ICON; ++ item->entry = entry; ++ ++ g_hash_table_insert (priv->accessible_children, ++ &((EntryInfo *) entry->user_data)->index, object); ++ } ++ ++ return g_object_ref (object); ++} ++ ++static void ++panel_addto_canvas_accessible_initialize (AtkObject *accessible, gpointer data) ++{ ++ if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize) ++ ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data); ++ ++ accessible->role = ATK_ROLE_LAYERED_PANE; ++} ++ ++static void ++panel_addto_canvas_accessible_class_init (AtkObjectClass *class) ++{ ++ GObjectClass *object_class; ++ GtkAccessibleClass *accessible_class; ++ ++ accessible_parent_class = g_type_class_peek_parent (class); ++ ++ object_class = (GObjectClass *)class; ++ accessible_class = (GtkAccessibleClass *)class; ++ ++ class->get_n_children = panel_addto_canvas_accessible_get_n_children; ++ class->ref_child = panel_addto_canvas_accessible_ref_child; ++ class->initialize = panel_addto_canvas_accessible_initialize; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_add_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ PanelAddtoEntry *entry; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ entry = panel_addto_canvas_accessible_get_entry (canvas, i); ++ select_entry (canvas, entry); ++ ++ return TRUE; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_clear_selection (AtkSelection *selection) ++{ ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ select_entry (canvas, NULL); ++ ++ return TRUE; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_selection (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ if (priv->selected) ++ return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), ++ ((EntryInfo *)priv->selected->user_data)->index); ++ return NULL; ++} ++ ++static gint ++panel_addto_canvas_accessible_get_selection_count (AtkSelection *selection) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return 0; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected) ? 1 : 0; ++} ++ ++static gboolean ++panel_addto_canvas_accessible_is_child_selected (AtkSelection *selection, gint i) ++{ ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ GtkWidget *widget; ++ ++ widget = GTK_ACCESSIBLE (selection)->widget; ++ ++ if (!widget) ++ return FALSE; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ return (priv->selected == panel_addto_canvas_accessible_get_entry (canvas, i)); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_remove_selection (AtkSelection *selection, gint i) ++{ ++ /* There can be only one item selected */ ++ return panel_addto_canvas_accessible_clear_selection (selection); ++} ++ ++static gboolean ++panel_addto_canvas_accessible_select_all_selection (AtkSelection *selection) ++{ ++ /* This can't happen */ ++ return FALSE; ++} ++ ++static void ++panel_addto_canvas_accessible_selection_interface_init (AtkSelectionIface *iface) ++{ ++ iface->add_selection = panel_addto_canvas_accessible_add_selection; ++ iface->clear_selection = panel_addto_canvas_accessible_clear_selection; ++ iface->ref_selection = panel_addto_canvas_accessible_ref_selection; ++ iface->get_selection_count = panel_addto_canvas_accessible_get_selection_count; ++ iface->is_child_selected = panel_addto_canvas_accessible_is_child_selected; ++ iface->remove_selection = panel_addto_canvas_accessible_remove_selection; ++ iface->select_all_selection = panel_addto_canvas_accessible_select_all_selection; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_ref_accessible_at_point (AtkComponent *component, ++ gint x, ++ gint y, ++ AtkCoordType coord_type) ++{ ++ GSList *l, *m; ++ GtkWidget *widget; ++ PanelAddtoCanvasPrivate *priv; ++ PanelAddtoCanvas *canvas; ++ PanelAddtoCategory *current_category; ++ EntryInfo *entry; ++ gint x_pos, y_pos, x_w, y_w; ++ ++ widget = GTK_ACCESSIBLE (component)->widget; ++ ++ if (widget == NULL) ++ return NULL; ++ ++ canvas = PANEL_ADDTO_CANVAS (widget); ++ priv = PANEL_ADDTO_CANVAS_GET_PRIVATE (canvas); ++ ++ atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type); ++ x_w = x - x_pos; ++ y_w = y - y_pos; ++ ++ for (l = priv->info->categories; l; l = l->next) { ++ current_category = l->data; ++ for (m = current_category->entries; m; m = m->next) { ++ entry = (EntryInfo *) m->data; ++ ++ if (x_w > entry->cover->x1 && ++ x_w < entry->cover->x2 && ++ y_w > entry->cover->y1 && ++ y_w < entry->cover->y2) ++ return panel_addto_canvas_accessible_ref_child (ATK_OBJECT (component), entry->index); ++ } ++ } ++ ++ return NULL; ++} ++ ++static void ++atk_component_interface_init (AtkComponentIface *iface) ++{ ++ iface->ref_accessible_at_point = panel_addto_canvas_accessible_ref_accessible_at_point; ++} ++ ++static GType ++panel_addto_canvas_accessible_get_type (void) ++{ ++ static GType type = 0; ++ AtkObjectFactory *factory; ++ GType derived_type; ++ GTypeQuery query; ++ GType derived_atk_type; ++ ++ if (type == 0) { ++ static GTypeInfo info = { ++ 0, /* class size */ ++ (GBaseInitFunc) NULL, /* base init */ ++ (GBaseFinalizeFunc) NULL, /* base finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_class_init, ++ (GClassFinalizeFunc) NULL, /* class finalize */ ++ NULL, /* class data */ ++ 0, /* instance size */ ++ 0, /* nb preallocs */ ++ (GInstanceInitFunc) NULL, /* instance init */ ++ NULL /* value table */ ++ }; ++ ++ static const GInterfaceInfo atk_component_info = { ++ (GInterfaceInitFunc) atk_component_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ static const GInterfaceInfo atk_selection_info = { ++ (GInterfaceInitFunc) panel_addto_canvas_accessible_selection_interface_init, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL ++ }; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ factory = atk_registry_get_factory (atk_get_default_registry (), ++ derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ g_type_query (derived_atk_type, &query); ++ ++ info.class_size = query.class_size; ++ info.instance_size = query.instance_size; ++ ++ type = g_type_register_static (derived_atk_type, ++ "PanelAddtoCanvasAccessible", ++ &info, 0); ++ ++ g_type_add_interface_static (type, ++ ATK_TYPE_COMPONENT, ++ &atk_component_info); ++ g_type_add_interface_static (type, ++ ATK_TYPE_SELECTION, ++ &atk_selection_info); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_new (GObject *object) ++{ ++ AtkObject *accessible; ++ ++ accessible = g_object_new (panel_addto_canvas_accessible_get_type (), NULL); ++ atk_object_initialize (accessible, object); ++ ++ return accessible; ++} ++ ++static AtkObject* ++panel_addto_canvas_accessible_factory_create_accessible (GObject *object) ++{ ++ return panel_addto_canvas_accessible_new (object); ++} ++ ++static void ++panel_addto_canvas_accessible_factory_class_init (AtkObjectFactoryClass *class) ++{ ++ class->create_accessible = panel_addto_canvas_accessible_factory_create_accessible; ++ class->get_accessible_type = panel_addto_canvas_accessible_get_type; ++} ++ ++static GType ++panel_addto_canvas_accessible_factory_get_type (void) ++{ ++ static GType type = 0; ++ ++ if (type == 0) { ++ static const GTypeInfo info = { ++ sizeof (AtkObjectFactoryClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) panel_addto_canvas_accessible_factory_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (AtkObjectFactory), ++ 0, /* n_preallocs */ ++ NULL, NULL ++ }; ++ ++ type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, ++ "PanelAddtoCanvasAccessibleFactory", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static AtkObject* ++panel_addto_canvas_get_accessible (GtkWidget *widget) ++{ ++ static gboolean already_here = FALSE; ++ ++ if (!already_here) { ++ AtkObjectFactory *factory; ++ AtkRegistry *registry; ++ GType derived_type; ++ GType derived_atk_type; ++ ++ already_here = TRUE; ++ ++ derived_type = g_type_parent (PANEL_ADDTO_TYPE_CANVAS); ++ ++ registry = atk_get_default_registry (); ++ factory = atk_registry_get_factory (registry, derived_type); ++ ++ derived_atk_type = atk_object_factory_get_accessible_type (factory); ++ ++ if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) { ++ atk_registry_set_factory_type (registry, ++ PANEL_ADDTO_TYPE_CANVAS, ++ panel_addto_canvas_accessible_factory_get_type ()); ++ } ++ } ++ ++ return (* GTK_WIDGET_CLASS (panel_addto_canvas_parent_class)->get_accessible) (widget); ++} +diff -Nur gnome-panel-2.19.2/panel-addto-canvas.h gnome-panel-2.19.2.new/panel-addto-canvas.h +--- gnome-panel-2.19.2/panel-addto-canvas.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-canvas.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,88 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* Copyright (C) 2005 Carlos Garnacho ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * Authors: Jody Goldberg ++ * Carlos Garnacho Parro ++ * Manu Cornet ++ */ ++ ++#ifndef PANEL_ADDTO_CANVAS_H ++#define PANEL_ADDTO_CANVAS_H ++ ++#include ++#include ++#include "panel-addto.h" ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_CANVAS (panel_addto_canvas_get_type ()) ++#define PANEL_ADDTO_CANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvas)) ++#define PANEL_ADDTO_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++#define PANEL_ADDTO_IS_CANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_IS_CANVAS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), PANEL_ADDTO_TYPE_CANVAS)) ++#define PANEL_ADDTO_CANVAS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_ADDTO_TYPE_CANVAS, PanelAddtoCanvasClass)) ++ ++typedef struct _PanelAddtoCanvas PanelAddtoCanvas; ++typedef struct _PanelAddtoCanvasClass PanelAddtoCanvasClass; ++ ++struct _PanelAddtoCanvas { ++ GnomeCanvas parent; ++}; ++ ++struct _PanelAddtoCanvasClass { ++ GnomeCanvasClass parent_class; ++ ++ void (*changed) (PanelAddtoCanvas *canvas, gchar *str); ++}; ++ ++typedef struct _PanelAddtoCanvasPrivate PanelAddtoCanvasPrivate; ++ ++struct _PanelAddtoCanvasPrivate { ++ GnomeCanvasItem *under_cover; ++ double height; ++ double width; ++ ++ double min_height; ++ double max_width; ++ PanelAddtoInformation *info; ++ PanelAddtoEntry *selected; ++ ++ gboolean rtl; ++ gint items_per_row; ++ gint selected_row; ++ ++ gchar *search_text; ++ ++ /* calculated sizes ++ for the elements */ ++ gdouble max_item_width; ++ gdouble max_item_height; ++ gdouble max_icon_height; ++ ++ /* accessibility stuff */ ++ GHashTable *accessible_children; ++}; ++ ++GType panel_addto_canvas_get_type (void); ++void activate_entry (PanelAddtoEntry *entry); ++void panel_addto_relayout_for_search (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++void panel_addto_activate_from_searchbar (GtkWidget *search_entry, PanelAddtoDialog *dialog); ++GtkWidget* panel_addto_canvas_new (PanelAddtoInformation *info); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_CANVAS_H */ +diff -Nur gnome-panel-2.19.2/panel-addto-event-box.c gnome-panel-2.19.2.new/panel-addto-event-box.c +--- gnome-panel-2.19.2/panel-addto-event-box.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-event-box.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,99 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#include ++ ++#include "panel-addto-event-box.h" ++ ++#define noVERBOSE ++ ++static GnomeCanvasItemClass *parent_class; ++ ++static double ++panel_addto_event_box_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, ++ GnomeCanvasItem **actual_item) ++{ ++ double x1, x2, y1, y2; ++ g_object_get (item, ++ "x1", &x1, ++ "x2", &x2, ++ "y1", &y1, ++ "y2", &y2, ++ NULL); ++ if (x <= x2 && x >= x1 && ++ y <= y2 && y >= y1) { ++ *actual_item = item; ++ ++ return 0.0; ++ } ++ return 1e12; ++} ++ ++static void ++panel_addto_event_box_class_init (PanelAddtoEventBoxClass *class) ++{ ++ GnomeCanvasItemClass *item_class; ++ ++ item_class = (GnomeCanvasItemClass *) class; ++ ++ parent_class = g_type_class_peek_parent (class); ++ ++ item_class->point = panel_addto_event_box_point; ++} ++ ++GType ++panel_addto_event_box_get_type (void) ++{ ++ static GType type; ++ ++ if (!type) { ++ static const GTypeInfo object_info = { ++ sizeof (PanelAddtoEventBoxClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) panel_addto_event_box_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (PanelAddtoEventBox), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ type = g_type_register_static (GNOME_TYPE_CANVAS_RECT, "PanelAddtoEventBox", ++ &object_info, 0); ++ } ++ ++ return type; ++} +diff -Nur gnome-panel-2.19.2/panel-addto-event-box.h gnome-panel-2.19.2.new/panel-addto-event-box.h +--- gnome-panel-2.19.2/panel-addto-event-box.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-event-box.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation ++ * All rights reserved. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++/* ++ @NOTATION@ ++ */ ++/* Event Box item type for GnomeCanvas widget ++ * ++ * GnomeCanvas is basically a port of the Tk toolkit's most excellent canvas widget. Tk is ++ * copyrighted by the Regents of the University of California, Sun Microsystems, and other parties. ++ * ++ * ++ * Author: Chris Lahey ++ */ ++ ++#ifndef PANEL_ADDTO_EVENT_BOX_H ++#define PANEL_ADDTO_EVENT_BOX_H ++ ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++/* Event Box item. No configurable or queryable arguments are available (use those in ++ * GnomeCanvasRE). ++ */ ++ ++ ++#define PANEL_ADDTO_TYPE_EVENT_BOX (panel_addto_event_box_get_type ()) ++#define PANEL_ADDTO_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBox)) ++#define PANEL_ADDTO_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++#define PANEL_ADDTO_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), PANEL_ADDTO_TYPE_EVENT_BOX)) ++#define PANEL_ADDTO_EVENT_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), PANEL_ADDTO_TYPE_EVENT_BOX, PanelAddtoEventBoxClass)) ++ ++ ++typedef struct _PanelAddtoEventBox PanelAddtoEventBox; ++typedef struct _PanelAddtoEventBoxClass PanelAddtoEventBoxClass; ++ ++struct _PanelAddtoEventBox { ++ GnomeCanvasRect item; ++}; ++ ++struct _PanelAddtoEventBoxClass { ++ GnomeCanvasRectClass parent_class; ++}; ++ ++ ++/* Standard Gtk function */ ++GType panel_addto_event_box_get_type (void) G_GNUC_CONST; ++ ++G_END_DECLS ++ ++#endif +diff -Nur gnome-panel-2.19.2/panel-addto-rounded-rect.c gnome-panel-2.19.2.new/panel-addto-rounded-rect.c +--- gnome-panel-2.19.2/panel-addto-rounded-rect.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-rounded-rect.c 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,103 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * panel-addto-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++ * USA ++ */ ++ ++#include ++#include "panel-addto-rounded-rect.h" ++#include "panel-addto-rounded-rect-pixbuf.h" ++#include ++#include ++ ++struct _PanelAddtoRoundedRect { ++ GnomeCanvasRect base; ++}; ++typedef GnomeCanvasRectClass PanelAddtoRoundedRectClass; ++ ++#define GNOMECC_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNOMECC_TYPE_ROUNDED_RECT, PanelAddtoRoundedRectClass)) ++#define GNOMECC_IS_ROUNDED_RECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNOMECC_TYPE_ROUNDED_RECT)) ++ ++G_DEFINE_TYPE (PanelAddtoRoundedRect, panel_addto_rounded_rect, GNOME_TYPE_CANVAS_RECT); ++ ++/************************************************************************* ++ * Adapted from nautilus/libnautilus-private/nautilus-icon-canvas-item.c ++ */ ++/* clear the corners of the selection pixbuf by copying the corners of the passed-in pixbuf */ ++static void ++panel_addto_rounded_rect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, ++ int x, int y, int width, int height) ++{ ++ static GdkPixbuf *corner_pixbuf = NULL; ++ GnomeCanvasRE const *re = GNOME_CANVAS_RE (item); ++ int dest_width, dest_height, src_width, src_height; ++ int dx, dy; ++ int corner_size = 5; ++ double affine[6]; ++ ++ GNOME_CANVAS_ITEM_CLASS (panel_addto_rounded_rect_parent_class)->draw (item, drawable, x, y, width, height); ++ ++ if (corner_pixbuf == NULL) ++ corner_pixbuf = gdk_pixbuf_new_from_inline (-1, ++ panel_addto_rounded_rect_frame, FALSE, NULL); ++ src_width = gdk_pixbuf_get_width (corner_pixbuf); ++ src_height = gdk_pixbuf_get_height (corner_pixbuf); ++ ++ gnome_canvas_item_i2c_affine (item, affine); ++ ++ dest_width = fabs (re->x2 - re->x1); ++ dest_height = fabs (re->y2 - re->y1); ++ dx = affine[4] - x; ++ dy = affine[5] - y; ++ ++ /* draw top left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, 0, ++ dx, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw top right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, 0, ++ dx + dest_width - corner_size, dy, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom left corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ 0, src_height - corner_size, ++ dx, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++ /* draw bottom right corner */ ++ gdk_draw_pixbuf (drawable, NULL, corner_pixbuf, ++ src_width - corner_size, src_height - corner_size, ++ dx + dest_width - corner_size, dy + dest_height - corner_size, ++ corner_size, corner_size, ++ GDK_RGB_DITHER_NORMAL, 0, 0); ++} ++ ++static void ++panel_addto_rounded_rect_class_init (PanelAddtoRoundedRectClass *klass) ++{ ++ GnomeCanvasItemClass *item_klass = (GnomeCanvasItemClass *) klass; ++ item_klass->draw = panel_addto_rounded_rect_draw; ++} ++static void ++panel_addto_rounded_rect_init (PanelAddtoRoundedRect *rr) ++{ ++} +diff -Nur gnome-panel-2.19.2/panel-addto-rounded-rect.h gnome-panel-2.19.2.new/panel-addto-rounded-rect.h +--- gnome-panel-2.19.2/panel-addto-rounded-rect.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-rounded-rect.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,39 @@ ++/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ ++/* ++ * gnomecc-rounded-rect.c: A rectangle with rounded corners ++ * ++ * Copyright (C) 2004 Novell Inc ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU General Public ++ * License as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++ * USA ++ */ ++#ifndef PANEL_ADDTO_ROUNDED_RECT_H ++#define PANEL_ADDTO_ROUNDED_RECT_H ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define PANEL_ADDTO_TYPE_ROUNDED_RECT (panel_addto_rounded_rect_get_type ()) ++#define PANEL_ADDTO_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT, PanelAddtoRoundedRect)) ++#define PANEL_ADDTO_IS_ROUNDED_RECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_ADDTO_TYPE_ROUNDED_RECT)) ++ ++typedef struct _PanelAddtoRoundedRect PanelAddtoRoundedRect; ++GType panel_addto_rounded_rect_get_type (void); ++ ++G_END_DECLS ++ ++#endif /* PANEL_ADDTO_ROUNDED_RECT_H */ +diff -Nur gnome-panel-2.19.2/panel-addto-rounded-rect-pixbuf.h gnome-panel-2.19.2.new/panel-addto-rounded-rect-pixbuf.h +--- gnome-panel-2.19.2/panel-addto-rounded-rect-pixbuf.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-panel-2.19.2.new/panel-addto-rounded-rect-pixbuf.h 2007-05-15 12:42:45.000000000 +0200 +@@ -0,0 +1,319 @@ ++/* GdkPixbuf RGBA C-Source image dump */ ++ ++#ifdef __SUNPRO_C ++#pragma align 4 (panel_addto_rounded_rect_frame) ++#endif ++#ifdef __GNUC__ ++static const guint8 panel_addto_rounded_rect_frame[] __attribute__ ((__aligned__ (4))) = ++#else ++static const guint8 panel_addto_rounded_rect_frame[] = ++#endif ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (5848) */ ++ "\0\0\26\360" ++ /* pixdata_type (0x1010002) */ ++ "\1\1\0\2" ++ /* rowstride (344) */ ++ "\0\0\1X" ++ /* width (86) */ ++ "\0\0\0V" ++ /* height (17) */ ++ "\0\0\0\21" ++ /* pixel_data: */ ++ "\377\377\377\377\377\377\377\377\377\377\377\303\377\377\377q\377\377" ++ "\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377/\377\377\377q\377\377\377\303\377\377" ++ "\377\377\377\377\377\377\377\377\377\377\377\377\377\242\377\377\377" ++ "(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377" ++ "\0\377\377\377(\377\377\377\242\377\377\377\377\377\377\377\303\377\377" ++ "\377(\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377(\377\377\377\303\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377/\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377/\377\377" ++ "\377q\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377q\377\377\377\303\377\377\377(\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377(\377\377\377\303\377\377\377\377\377\377\377\242\377\377\377(\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377" ++ "\377\377(\377\377\377\242\377\377\377\377\377\377\377\377\377\377\377" ++ "\377\377\377\377\303\377\377\377q\377\377\377/\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377" ++ "\377/\377\377\377q\377\377\377\303\377\377\377\377\377\377\377\377"}; ++ ++ --- gnome-panel-2.20.0.1.orig/debian/maintfiles/changelog_unreleased +++ gnome-panel-2.20.0.1/debian/maintfiles/changelog_unreleased @@ -0,0 +1,2 @@ + + modified gnomezilla patch to fix opening evolution at the selected + date (also partially fix opening tasks) (Closes: #272777). --- gnome-panel-2.20.0.1.orig/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING +++ gnome-panel-2.20.0.1/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING @@ -0,0 +1,17 @@ +diff -p -u -5 -r1.82 panel-toplevel.c +--- gnome-panel/gnome-panel/panel-toplevel.c 2004/12/22 18:09:19 1.82 ++++ gnome-panel/gnome-panel/panel-toplevel.c 2005/01/06 04:12:41 +@@ -2468,10 +2468,13 @@ panel_toplevel_attach_to_widget (PanelTo + panel_toplevel_reverse_arrows (toplevel); + panel_toplevel_set_expand (toplevel, FALSE); + panel_toplevel_update_attach_orientation (toplevel); + panel_toplevel_update_hide_buttons (toplevel); + ++ gtk_window_set_screen (GTK_WINDOW (toplevel), ++ gtk_widget_get_screen (GTK_WIDGET (toplevel->priv->attach_toplevel))); ++ + if (toplevel->priv->state == PANEL_STATE_NORMAL) + panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel); + + gtk_widget_queue_resize (GTK_WIDGET (toplevel)); + } --- gnome-panel-2.20.0.1.orig/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING +++ gnome-panel-2.20.0.1/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING @@ -0,0 +1,34 @@ +--- gnome-panel/panel-recent.c.orig 2005-01-26 00:32:36.000000000 +0100 ++++ gnome-panel/panel-recent.c 2005-01-26 00:39:22.000000000 +0100 +@@ -49,6 +49,8 @@ + char *path; + char *quoted; + gboolean ret = TRUE; ++ GConfClient *client; ++ gchar *terminal_exec, *terminal_exec_arg; + + /* Don't allow suspicious looking URIs */ + if (uri [0] == '-') +@@ -62,13 +64,18 @@ + return FALSE; + } + ++ + str = g_string_new (""); + + if (app->requires_terminal) { +- /* FIXME: we should use their preferred terminal +- * maybe a multiscreen variant of gnome_execcute_terminal_shell? +- */ +- g_string_append_printf (str, "gnome-terminal -x %s", app->command); ++ client = panel_gconf_get_client (); ++ terminal_exec = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec", NULL); ++ terminal_exec_arg = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec_arg", NULL); ++ ++ g_string_append_printf (str, "%s %s %s", terminal_exec, terminal_exec_arg, app->command); ++ ++ g_free(terminal_exec); ++ g_free(terminal_exec_arg); + } else + str = g_string_append (str, app->command); + --- gnome-panel-2.20.0.1.orig/debian/maintfiles/clock_applet_evo_open.patch +++ gnome-panel-2.20.0.1/debian/maintfiles/clock_applet_evo_open.patch @@ -0,0 +1,200 @@ +diff -u -r1.10 calendar-client.c +--- applets/clock/calendar-client.c 31 Aug 2004 08:18:34 -0000 1.10 ++++ applets/clock/calendar-client.c 27 Dec 2004 09:07:15 -0000 +@@ -529,18 +529,6 @@ + return g_strdup (icalproperty_get_description (prop)); + } + +-static char * +-get_ical_url (icalcomponent *ical) +-{ +- icalproperty *prop; +- +- prop = icalcomponent_get_first_property (ical, ICAL_URL_PROPERTY); +- if (!prop) +- return NULL; +- +- return g_strdup (icalproperty_get_url (prop)); +-} +- + static inline GTime + get_ical_start_time (icalcomponent *ical, + icaltimezone *default_zone) +@@ -832,7 +820,6 @@ + null_safe_strcmp (a->summary, b->summary) == 0 && + null_safe_strcmp (a->description, b->description) == 0 && + null_safe_strcmp (a->color_string, b->color_string) == 0 && +- null_safe_strcmp (a->url, b->url) == 0 && + a->start_time == b->start_time && + a->due_time == b->due_time && + a->percent_complete == b->percent_complete && +@@ -850,7 +837,6 @@ + task_copy->summary = g_strdup (task->summary); + task_copy->description = g_strdup (task->description); + task_copy->color_string = g_strdup (task->color_string); +- task_copy->url = g_strdup (task->url); + task_copy->start_time = task->start_time; + task_copy->due_time = task->due_time; + task_copy->percent_complete = task->percent_complete; +@@ -872,9 +858,6 @@ + g_free (task->color_string); + task->color_string = NULL; + +- g_free (task->url); +- task->url = NULL; +- + task->percent_complete = 0; + } + +@@ -888,7 +871,6 @@ + task->summary = get_ical_summary (ical); + task->description = get_ical_description (ical); + task->color_string = get_source_color (source->source); +- task->url = get_ical_url (ical); + task->start_time = get_ical_start_time (ical, default_zone); + task->due_time = get_ical_due_time (ical, default_zone); + task->percent_complete = get_ical_percent_complete (ical); +@@ -1980,25 +1962,3 @@ + e_cal_modify_object (esource, ical, CALOBJ_MOD_ALL, NULL); + } + +-gboolean +-calendar_client_launch_editor (CalendarClient *client, +- CalendarEventType event_type, +- GdkScreen *screen, +- GError **error) +-{ +- char *command_line; +- gboolean retval; +- +- g_return_val_if_fail (CALENDAR_IS_CLIENT (client), FALSE); +- g_return_val_if_fail (event_type == CALENDAR_EVENT_APPOINTMENT || +- event_type == CALENDAR_EVENT_TASK, FALSE); +- +- command_line = g_strdup_printf ("evolution -c %s", +- event_type == CALENDAR_EVENT_APPOINTMENT ? "calendar" : "tasks"); +- +- retval = gdk_spawn_command_line_on_screen (screen, command_line, error); +- +- g_free (command_line); +- +- return retval; +-} +diff -u -r1.4 calendar-client.h +--- applets/clock/calendar-client.h 19 Jul 2004 19:11:14 -0000 1.4 ++++ applets/clock/calendar-client.h 27 Dec 2004 09:07:15 -0000 +@@ -27,7 +27,6 @@ + #define __CALENDAR_CLIENT_H__ + + #include +-#include + + G_BEGIN_DECLS + +@@ -90,7 +89,6 @@ + char *summary; + char *description; + char *color_string; +- char *url; + GTime start_time; + GTime due_time; + guint percent_complete; +@@ -139,10 +137,6 @@ + char *task_uid, + gboolean task_completed, + guint percent_complete); +-gboolean calendar_client_launch_editor (CalendarClient *client, +- CalendarEventType event_type, +- GdkScreen *screen, +- GError **error); + + void calendar_event_free (CalendarEvent *event); + +--- applets/clock/clock.c 2005-01-25 01:37:50.000000000 +0100 ++++ applets/clock/clock.c.mod 2005-01-25 01:42:25.000000000 +0100 +@@ -545,7 +545,6 @@ + TASK_COLUMN_COMPLETED_TIME, + TASK_COLUMN_OVERDUE_ATTR, + TASK_COLUMN_COLOR, +- TASK_COLUMN_URL, + N_TASK_COLUMNS + }; + +@@ -625,7 +624,6 @@ + TASK_COLUMN_COMPLETED, task->percent_complete == 100, + TASK_COLUMN_COMPLETED_TIME, task->completed_time, + TASK_COLUMN_COLOR, task->color_string, +- TASK_COLUMN_URL, task->url, + -1); + + g_free (percent_complete_text); +@@ -808,17 +806,21 @@ + GtkTreeViewColumn *column, + ClockData *cd) + { +- GError *err = NULL; + GtkTreeIter iter; +- char *uri; +- ++ gchar *command_line; ++ gchar *uid; ++ + gtk_tree_model_get_iter (GTK_TREE_MODEL (cd->tasks_model), &iter, path); + gtk_tree_model_get (GTK_TREE_MODEL (cd->tasks_model), &iter, +- TASK_COLUMN_URL, &uri, -1); +- +- if (uri) +- gnome_url_show (uri, &err); +- ++ TASK_COLUMN_UID, &uid, -1); ++ ++ command_line = g_strdup_printf ("evolution task:%s", uid); ++ ++ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL); ++ ++ g_free (command_line); ++ g_free (uid); ++ + return TRUE; + } + +@@ -909,7 +911,6 @@ + G_TYPE_LONG, /* completed time */ + PANGO_TYPE_ATTR_LIST, /* summary text attributes */ + G_TYPE_STRING, /* color */ +- G_TYPE_STRING /* url */ + }; + + cd->tasks_model = gtk_list_store_newv (N_TASK_COLUMNS, column_types); +@@ -1137,14 +1138,23 @@ + + static void + calendar_day_activated (ClockData *cd) +-{ +- /* FIXME: should be able to launch the editor for +- * the specific day +- */ +- calendar_client_launch_editor (cd->client, +- CALENDAR_EVENT_APPOINTMENT, +- gtk_widget_get_screen (cd->calendar), +- NULL); ++{ ++ guint day; ++ guint year; ++ guint month; ++ ++ GDate *date; ++ gchar command_line[40]; ++ ++ gtk_calendar_get_date (GTK_CALENDAR(cd->calendar), &year, &month, &day); ++ date = g_date_new (); ++ g_date_set_dmy (date, day, month + 1, year); ++ ++ g_date_strftime (command_line, sizeof (command_line), "evolution -c calendar date:%x", date); ++ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL); ++ g_date_free (date); ++ ++ return; + } + + static void --- gnome-panel-2.20.0.1.orig/debian/changelog +++ gnome-panel-2.20.0.1/debian/changelog @@ -0,0 +1,2198 @@ +gnome-panel (1:2.20.0.1-0ubuntu2) gutsy; urgency=low + + * debian/patches/09_lpi.patch: + - removed the launchpad integration from the panel context menu, + the users tend to use it as a "send a bug" item for issues which + are not due to the gnome-panel + * debian/patches/15_no_animation_if_composited.patch: + - change from Travis Watkins, + "Disable panel animations if a compositor is running. (LP: #135382)" + + -- Sebastien Bacher Fri, 21 Sep 2007 17:27:08 +0200 + +gnome-panel (1:2.20.0.1-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Revert usage of new icon name for logout: it breaks some icon themes. + The change is postponed for 2.21. + * debian/patches/12_autoreconf.patch: + - updated + + -- Sebastien Bacher Tue, 18 Sep 2007 22:06:57 +0200 + +gnome-panel (1:2.20.0-0ubuntu1) gutsy; urgency=low + + * New upstream version + Panel + - Show drawers on same monitor as the panels they're attached to + (LP: #32285) + - Use new icon name for logout + Clock Applet + - Fix crashers in timezone handling + - Don't show the UI to have timezones in the clock since it's not ready + Docs Translators + Translators + * debian/patches/12_autoreconf.patch: + - updated + + -- Sebastien Bacher Tue, 18 Sep 2007 11:16:26 +0200 + +gnome-panel (1:2.19.92-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Fallback to user name when real name is empty in logout dialog + - Do not show tooltips for application categories in menu (LP: #129679) + - Use new icon name for search + * debian/patches/12_autoreconf.patch: + - updated + + -- Sebastien Bacher Tue, 04 Sep 2007 23:38:17 +0200 + +gnome-panel (1:2.19.6-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Fix tooltips changing on launchers + - Use new freedesktop.org power management interface + - Small fix to make panel work with older versions of GNOME + All applets + - Use gtk-about icon instead of deprecated gnome-stock-about + Clock Applet + - Fixed a crash when /etc/localtime is not a hardlink + - Small fixes for compilation on Solaris + - Don't mark icons as translatable + - Build fixes + - Code cleanups + * debian/patches/12_autoreconf.patch: + - updated + * debian/patches/90_use_fpic_build_on_amd64.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 14 Aug 2007 11:57:42 +0200 + +gnome-panel (1:2.19.5-0ubuntu5) gutsy; urgency=low + + * debian/patches/04_default_panel_config.patch: + - updated to list deskbar and fast-user-switch on the default configuration + + -- Sebastien Bacher Mon, 06 Aug 2007 21:33:38 +0200 + +gnome-panel (1:2.19.5-0ubuntu4) gutsy; urgency=low + + * debian/control.in: + - don't version the scrollkeeper Depends so rarian-compat can be installed + + -- Sebastien Bacher Tue, 31 Jul 2007 22:34:32 +0200 + +gnome-panel (1:2.19.5-0ubuntu3) gutsy; urgency=low + + * Rebuild due to debhelper change (bad image index, generated cache was + invalid) + + -- Sarah Hobbs Sun, 22 Jul 2007 00:34:18 +1000 + +gnome-panel (1:2.19.5-0ubuntu2) gutsy; urgency=low + + * debian/patches/90_use_fpic_build_on_amd64.patch: + - use -fPIC to fix build on amd64 + + -- Sebastien Bacher Wed, 11 Jul 2007 11:42:10 +0100 + +gnome-panel (1:2.19.5-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Make changing orientation of an expanded panel work better when + dragging the panel + - Fix name of launcher created by dropping an URI on the panel + (LP: #35919) + - Improve handling of size hints from applets. This is needed for the + tasklist sizing algorithm to correctly work + - Use new icon for recent documents + - Save the panel position relatively to the right/bottom edge of the + monitor when needed. This fixes a lot of problems, like the panel + being at the center of the screen when resizing the screen or when + the size of the panel grows. (LP: #39856) + - Also do not save the position of the panel in gconf when the position + is changed because of constraints. This also fixes a lot of problems, + like the panel suddenly snapping to the center or an edge of the + screen because its size has changed. + - Fix crash when a panel is destroyed whil its context menu is opened + - Make it possible to have bigger panels (up to 1/5 the screen size) + for people wanting sidebars + - Fix a crash in the lockdown checking code + - Don't use nautilus-home.desktop for the places menu, but makes the + item a real place item + - Automatically use the right icon for launchers for $HOME or ~/Desktop + - Migrate to GtkTooltip + - Code cleanups + - Add a detail for theming the arrow in the button widget + - Add new _GNOME_PANEL_ACTION_KILL_DIALOG action to the panel action + protocol + - Use program-name instead of name property for GtkAboutDialog + gnome-desktop-item-edit + - Use g_option_context_set_translation_domain() + All applets + - Use gtk_widget_set_tooltip_text() + - Use program-name instead of name property for GtkAboutDialog + - Fix compilation + Clock Applet + - Sort completed tasks last, treat unprioritised tasks as normal + priority, and fall back on sorting by summary + - Add a first version of timezone support. This needs some UI love. + Window List Applet + - Do not call wnck_screen_force_update(). Fix a crash. + - Code cleanups + - Fix window list sizing (most of the changes are in libwnck) (LP: #16391) + - Deprecate minimum/maximum size settings + Workspace Switcher Applet + - Code cleanups + - Show/hide some of the settings in the properties dialog depending on + the window manager, since some of the settings are not saved or don't + make sense when metacity is not used. + Misc + - Require libwnck 2.19.5 + - Add libbonobo and libbonoboui explicit checks for compilation + * debian/control.in: + - updated libwnck requirement + * debian/patches/01_layout.patch: + - updated + * debian/patches/09_lpi.patch: + - updated + * debian/patches/12_autoreconf.patch: + - updated + + -- Sebastien Bacher Mon, 09 Jul 2007 18:33:05 +0200 + +gnome-panel (1:2.19.4-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Use g_timeout_add_seconds() when possible + - Use g_get_user_special_dir() to get XDG user dirs + - Code cleanup + - Fix crash when the applications menu is updated but the user had a + context menu for a launcher + libpanel-applet + - Code cleanup + All applets + - Migrate to new tooltip API + Clock Applet + - Use g_timeout_add_seconds() when possible + - Fix compilation issue when e-d-s is not used + Misc + - Require glib 2.13.0 + - Require gtk+ 2.11.3 + * debian/control.in: + - updated requirements on glib and gtk + * debian/patches/09_lpi.patch: + - updated + * debian/patches/12_autoreconf.patch: + - updated + + -- Sebastien Bacher Sun, 17 Jun 2007 23:40:16 +0200 + +gnome-panel (1:2.19.3-0ubuntu1) gutsy; urgency=low + + * News Upstream Release + - Depend libwnck21 (2.19.3) + - Removed duplicated build-dep (libgnome-menu-dev) + - Patchs Removed + 07_fix_clock_command_typo.patch + 15_clock_start_evo_midday.patch + - Patchs Updated + 08_clock_applet_event.patch + 12_autoreconf.patch + * [Daniel Holbach] + - debian/rules: bump the shlibs of libpanel-applet, new interfaces were + added. + + -- Fernando Ribeiro Mon, 04 Jun 2007 12:27:24 -0300 + +gnome-panel (1:2.19.2-0ubuntu3) gutsy; urgency=low + + * debian/patches/08_clock_applet_event.patch: + - fix multi-days event being marked on one day only (Ubuntu: #114515) + + -- Sebastien Bacher Mon, 21 May 2007 16:12:36 +0200 + +gnome-panel (1:2.19.2-0ubuntu2) gutsy; urgency=low + + * debian/control.in: + - Build-Depends on sharutils + + -- Sebastien Bacher Tue, 15 May 2007 20:50:34 +0200 + +gnome-panel (1:2.19.2-0ubuntu1) gutsy; urgency=low + + * New upstream version: + Panel + - Code cleanups + - Force the panel to not be restarted when there's already a panel + running, fix endless loop of error dialogs + - Add a checkbox to let the user choose to not restart the panel if + there was a problem registering with bonobo at startup + - Default the "Applet disappeared" dialog to reload + - Default the "Can't load applet" dialog to not delete + - Small HIG improvements to the launcher editor + - Fix alignment of the run label in the run dialog + - Fix creation of launchers with empty spaces in the command + - Fix the launcher editor to not save a full-path icon for the + non-localized icon when it's not needed + - Fix gnome-desktop-item-edit work for relative URI when creating a + .directory file + - Use the launcher icon as a fallback for launchers without an icon + - Guess the icon when the user enters a command in the launcher editor + - Use macros for name icons to easily change the name of named icons + when needed + - Check whether reboot is enabled in gdm (and not only shutdown) and + only show the buttons when they're useful in the logout dialog + - Prefer /var/run/gdm_socket as path for the GDM socket + - Take into account NAME_MAX for the length of the filename when + guessing a name for launchers in gnome-desktop-item-edit + - Fix creation of launcher when dragging an URL with ? or : + - Make some error dialogs visible in the taskbar and make some other + transient to the panel + Clock Applet + - Don't display tasks that are marked completed + - Update the clock when the configuration tool exits so that the user + doesn't have to wait up to one minute to see the change + - Fix preferences window to not hide the custom format when it should + be shown + - Document that the custom format is the format used by strftime + - Show the date by default in the applet + - Let distributor easily specify their configuation tool instead of + hardcoding everything + - Update the clock every second for UNIX format + - Make Internet time work a bit better + Notification Area Applet + - Fix compiler warning + Misc + - Install data files in $(datadir)/gnome-panel/ instead of + $(datadir)/gnome/panel/ (Vincent) + - Add --with-clock-time-utility configure flag + - Run gtk-update-icon-cache on uninstall + - Make .desktop file used for bug-buddy translatable + * Sync with Debian + * debian/application-default-icon.png.uue: + - default icon for the menu entries. + * debian/control.in: + - Build-Depends on liblpint-bonobo-dev, liblaunchpad-integration-dev + - gnome-panel Recommends menu-xdg instead of Depends on it + and Recommends alacarte + - gnome-panel Suggests fortunes-mod, it's used by the fish applet + - maintainer is the Ubuntu Desktop Team + * debian/gnome-panel-data.install: + - updated and install the "About Ubuntu" menu item + * debian/gnome-panel-data.postinst, debian/gnome-panel-data.postrm: + - updated profiles transition version for Ubuntu + * debian/patches/01_layout.patch: + - changes to the panel layout + * debian/patches/04_default_panel_config.patch: + - change to the default configuration. + * debian/patches/06_applets_category.patch: + - fix applets categories. + * debian/patches/07_fix_clock_command_typo.patch: + - fix typo to the clock command macro + * debian/patches/09_default_icons.patch: + - shows an icon if the .desktop hasn't one. + * debian/patches/09_help_submenu.patch: + - make a "help" submenu for support (Ubuntu: #31775 + * debian/patches/09_lpi.patch, + - Launchpad Integration. + * debian/patches/11_applet_use_session_dialog.patch: + - Ubuntu session dialog + * debian/patches/11_panel_addto_dialog.patch: + - new 'add to panel' dialog. + * debian/patches/12_autoreconf.patch: + - update the build files. + * debian/patches/14_remove_separators.patch: + - patch by Gary Coady + - removed unneeded menu separators, fix the separator being displayed + to the application menu for non admin users by example (Ubuntu: #34363) + * debian/patches/15_clock_start_evo_midday.patch: + - patch by Tollef Fog Heen, "always use 120000Z when calling evo", fix the + evolution calendar being opened shifted from one day sometimes depending + on the timezone (Ubuntu: #42115) + * debian/patches/99_about-ubuntu-translation.patch: + - list ubuntu-about.desktop as to translate + * debian/rules: + - install the default menu icon + - run intltool-update + - use --with-clock-time-utility="gksu time-admin" + * debian/ubuntu-about.desktop, debian/ubuntu-about.desktop.in: + - "About Ubuntu" menu item. + + -- Sebastien Bacher Tue, 15 May 2007 11:51:03 +0200 + +gnome-panel (2.18.1-1) unstable; urgency=low + + [ Riccardo Setti ] + * New upstream release; no API change. + - Added libpango1.0-dev as build-dep. + - Built with --with-in-process-applets=all. + - Dropped 01_default-setup_evolution.patch, new version of evolution + doesn't ship a versioned .desktop file. + - Dropped 02_menu_initial_size.patch, applied upstream. + + [ Loic Minier ] + * Add a libedataserver1.2-dev (>= 1.2.0) build-dep. + * New upstream stable release; no API change. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Add a ${misc:Depends}. + * Only run update-gconf-defaults if it's available. + * Use http in copyright. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Cleanups. + * Take advantage of the applets rename to stop shipping *.la files. + + -- Loic Minier Sun, 22 Apr 2007 18:43:41 +0200 + +gnome-panel (2.16.3-1) experimental; urgency=low + + [ Josselin Mouette ] + * Remove 04_menus_rename.patch. + * Build-depend on libgnome-menus-dev 2.16.1-1. + * 01_default-setup_evolution.patch: call evolution-2.8.desktop, as + evolution.desktop doesn't exist (closes: #404878). + * 02_menu_initial_size.patch: stolen from the SVN. Fix for the arrows + appearing in a menu when installing new applications. See Bugzilla + #331780. + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstream release; no API change. + - Drop patch 10_panel-transparency-after-resolution-change, merged + upstream. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to make the package + autobuildable. + + -- Loic Minier Mon, 12 Mar 2007 11:42:00 +0100 + +gnome-panel (2.16.2-1) experimental; urgency=low + + * New upstream release. + * Require intltool 0.35.0. + * Update build-dependencies and -dev dependencies. + * Build-depend on gtk-doc-tools. + * Generate less strict shlibs for the library. + * Rename the -dbg package to gnome-panel-dbg and include all debugging + symbols in this package. + * Switch to debhelper mode 5, build-depend accordingly. + * Don't generate cdbs build-depends automatically, thanks. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Call clean-la.mk and gnome-version.mk. + * Require gnome-pkg-tools 0.7. + * Regenerate the Debian manpages to remove French iso-8859-1 text. + + -- Josselin Mouette Sun, 3 Dec 2006 23:25:17 +0100 + +gnome-panel (2.14.3-3) unstable; urgency=low + + * Sync with overrides: set libpanel-applet2-dbg's priority to extra. + * Fix upstream version computation to allow "-" in upstream versions. + * New patch, 10_panel-transparency-after-resolution-change, to fix wrong + geometry calculation of the root window after a resolution change which + broke gnome-panel transparency; taken from GNOME #353781; patch by + bugreports@nn7.de; thanks Soeren Sonnenburg. + + -- Loic Minier Fri, 24 Nov 2006 14:31:19 +0100 + +gnome-panel (2.14.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Move menu-xdg to a Depends: instead of a Recommends: + (closes: #322517). + Rationale: people who don't want the Debian menu can remove "menu" + and the "empty menu" bug has been fixed some time ago. + + [ Loic Minier ] + * Only update-gconf-defaults on removal, not on purge. (Closes: #387925) + * Cleanup postinst and postrm. + + -- Loic Minier Sun, 17 Sep 2006 21:11:15 +0200 + +gnome-panel (2.14.3-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 8 Aug 2006 11:05:53 +0200 + +gnome-panel (2.14.2-2) unstable; urgency=low + + * Install default entries properly (closes: #369858). + + rules: move the entries to /usr/share/gconf/defaults. + + control.in: depend on gconf2 2.14.0-2 instead of ${misc:Depends}. + + Call update-gconf-defaults in postinst and postrm. + + gnome-panel-data.postinst: recursively unset the entries in /etc. + From now on, the administrator will be able to use this place to + customize the default panel layout. + + -- Josselin Mouette Thu, 3 Aug 2006 00:01:42 +0200 + +gnome-panel (2.14.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Remove the dependency on this broken gamin package, and remove fam + as well as gnome-menus now use gnome-vfs as a backend + (closes: #349835, #367094, #351093). + + [ Loic Minier ] + * Make gnome-panel Recommend evolution-data-server. (Closes: #372567) + * Drop the useless libnspr4-dev build-dep, thanks Steve Langasek. + [debian/control, debian/control.in] + * New upstream release. + - Bump up libgnomevfs2-dev build-dep to >= 2.14.2. + [debian/control, debian/control.in] + * Use ${binary:Version} instead of ${Source-Version}. + * Add ${misc:Depends}. + * Update watch file to track stable series. + + -- Loic Minier Sat, 24 Jun 2006 11:14:15 +0200 + +gnome-panel (2.14.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + + * debian/control.in, debian/control: + - updated e-mail address. + - updated Standards-Version to 3.7.2. + - updated build dependencies according to configure.in. + - changed build-dep on libnspr-dev to libnspr4-dev to use xulrunner. + + * debian/patches/06_sync_clear_documents.patch: + - dropped; libegg updated upstream. + + * debian/patches/99_reautogenization.patch: + - dropped; the gnome-panel maintainer runs a Debian derivative. + + [ Marco Cabizza ] + * debian/control.in: + - changed build-dep on deprecated libpng3-dev to libpng12-dev. + + [ Ross Burton ] + * Build-depend on libecal1.2-dev, not libedata-cal1.2-dev + + [ Josselin Mouette ] + * Make the package binNMU-safe. + - Build-depend on dpkg-dev 1.13.19. + - Use ${source:Version}. + * Remove a useless ${Source-Version}. + + -- Guilherme de S. Pastore Mon, 8 May 2006 15:54:43 -0300 + +gnome-panel (2.12.3-2) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la and Xrender.la. + + -- Loic Minier Sun, 23 Apr 2006 21:31:36 +0200 + +gnome-panel (2.12.3-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - General cleanups + - Added the alternative on x-terminal-emulator back, as gnome-panel + obeys the GNOME prefered applications settings. + + [ Loic Minier ] + * Depend on gamin | fam since gnome-vfs deps are not enough to ensure it's + there. (Closes: #353164) + [debian/control, debian/control.in] + + [ Sjoerd Simons ] + * New upstream release + * Let libpanel-applet2-dev depend on liborbit2-dev >= 2.12.4. It defines the + new ORBIT2_MAYBE_CONS macro the code generator uses. (Closes: #350883) + * debian/patches/99_reautogenization.patch + + Updated. + + -- Sjoerd Simons Mon, 20 Feb 2006 22:56:36 +0100 + +gnome-panel (2.12.2-3) unstable; urgency=low + + * Upload to unstable (Closes: #347881) + + [ Josselin Mouette ] + * Suggest gnome-terminal only, as x-terminal-emulator won't be used + (closes: #291058). + + -- Guilherme de S. Pastore Fri, 13 Jan 2006 13:40:37 -0200 + +gnome-panel (2.12.2-2) experimental; urgency=low + + * Build-depend on libedataserverui1.2-dev (>= 1.3.0), so control-center and + gnome-panel can't be build with conflicting e-d-s libraries. + + -- Sjoerd Simons Tue, 27 Dec 2005 19:54:59 +0100 + +gnome-panel (2.12.2-1) experimental; urgency=low + + * New upstream release + * debian/patches/02_panel-menu-items.c.patch: + - dropped; applied upstream + * Don't build on a separate directory, it breaks gnome-doc-utils + + -- Guilherme de S. Pastore Wed, 30 Nov 2005 14:30:20 -0200 + +gnome-panel (2.12.1-2) experimental; urgency=low + + * New maintainer + Thanks for all your work, Marc! + + * debian/patches/06_sync_clear_documents.patch: + - patch from upstream CVS to force update when Gamin/FAM + notification is not available (Closes: #319800, #330847) + + -- Guilherme de S. Pastore Fri, 11 Nov 2005 20:54:11 -0200 + +gnome-panel (2.12.1-1) experimental; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release + * debian/patches/01_defaults_add_notifarea.patch, + debian/patches/02_clockapplet_reload_timezone.patch, + debian/patches/03_libpanel-applet_X11_link_missing.patch + - removed, applied upstream or fixed otherwise + * debian/patches/02_panel-menu-items.c.patch: + - added, from Ubuntu's package packaging patch, which added it + from GNOME's bugzilla #315322 + * debian/patches/99_reautogenization.patch: + - updated with: + libtoolize -c -f --automake && aclocal-1.9 && autoheader && \ + automake-1.9 -acf && autoconf && rm -rf autom4te.cache + * debian/patches/04_menus_rename.patch: + - updated + * debian/rules: + - disable scrollkeeper on build, based on Ubuntu's change + * debian/watch: + - updated for 2.12 major + * debian/control.in: + - updated Build-Depends according to Ubuntu's package and on the + upstream package's configure.in pkgconfig stuff + + [ Guilherme de S. Pastore ] + * debian/control.in: + - moved menu-xdg from Suggests to Recommends (Closes: #315782) + + [ Loic Minier ] + * Clarify "Copyright" versus "License". + + -- Gustavo Noronha Silva Sat, 29 Oct 2005 19:54:10 -0200 + +gnome-panel (2.10.2-2) UNRELEASED; urgency=low + + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/gnome-vfolder-user, + debian/gnome-panel-data.menu-method.experimental, + debian/gnome-panel-data.menu-method] + + -- Loic Minier Thu, 20 Oct 2005 16:33:49 +0200 + +gnome-panel (2.10.2-1) unstable; urgency=low + + * New upstream release + * Removed 06_fr_po_fix.patch now included upstream. + * Re-autogen-ized. + * Increased Standards-Version (no changes needed). + + -- Marc Dequènes (Duck) Tue, 28 Jun 2005 23:30:00 +0200 + +gnome-panel (2.10.1-5) unstable; urgency=medium + + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * Remove most replaces and conflicts fields, they are unused now. + * gnome-panel only Recommends: gnome-session. + * gnome-panel-data only Recommends: gnome-panel (breaking a dependency + cycle). + + -- Josselin Mouette Sat, 25 Jun 2005 19:45:52 +0200 + +gnome-panel (2.10.1-4) unstable; urgency=low + + * Replaced Suggests on menu by menu-xdg (Closes: #313011). + * Added patch to fix missing includes from Dann Frazier (Closes: + #314692). + * Fix fr translation s/Environnement de bureau/Bureau/ (from GNOME + CVS) (Closes: #313351). + * Now building in 'debian/build/' directory (cleaner). + * Pass --as-needed to LDFLAGS to reduce dependencies if possible. + * Disabled evolution-data-server support on Hurd (thanks to Michael + Banck). + + -- Marc Dequènes (Duck) Sun, 19 Jun 2005 11:51:40 +0200 + +gnome-panel (2.10.1-3) unstable; urgency=low + + * Upload to unstable (Closes: #312609). + * Added patch to solve menu files conflicts with other desktop + environnements (Closes: #307098) (thanks to seb128). + * Removed clean rule hack to work around #299010. + + -- Marc Dequènes (Duck) Tue, 7 Jun 2005 23:44:00 +0200 + +gnome-panel (2.10.1-2) experimental; urgency=low + + * Some more build-depends, depends, and suggests update (gnome-about + and new gnome-menus are now dependencies). + * Fixed in 2.10 branch : + + drawer does not open at the right place on dual-screen display + (Closes: #260480). + + click repeat rate in calendar view for clock applet is too fast + (Closes: #272885). + + panel won't scale some SVGs properly (Closes: #275215). + + translation error in pt-BR (Closes: #293656). + * Removed 'gnome-panel-screenshot' man page (command moved to gnome- + utils). + * Fixed stupid cut-and-paste mistake in 'debian/copyright'. + + -- Marc Dequènes (Duck) Sun, 17 Apr 2005 02:25:16 +0200 + +gnome-panel (2.10.1-1) experimental; urgency=low + + * New upstream release + * Removed the following patches now included upstream : + + 03_french_typo.patch + + 06_translation_silliness.patch + + 08_improved_run_in_term_speed.patch + * Mass build-depends and depends update. + * Patched libpanel-applet to correctly link with X11. + * Re-autogen-ized. + * Removed '/usr/share/gnome-panel' not used anymore in 'debian/gnome- + panel-data.install'. + * Updated 'debian/watch'. + + -- Marc Dequènes (Duck) Sun, 10 Apr 2005 21:06:35 +0200 + +gnome-panel (2.8.3-1) unstable; urgency=medium + + * Marc Dequènes: + + Rebuilt with fixed libgnomeui without non-free howl stuff + (Closes: #298887) (thus urgency). + + Used revised timezone patch for clock applet made by Stephen Gildea + (Closes: #294591). + + Made load of gconf config quiet (Closes: #293204). + + Readded 'userprefix' in menu-method as it broke 'favorites://' in + nautilus (Closes: #295091). + + Added a menu-method to produce a customisable Debian menu made by + Bill Allombert (not activated by default, see README.Debian) + (Closes: #259400). + * Sjoerd Simons: + + New upstream release + + debian/patches/07_empty_desktop_keys.patch + - Removed. Merged upstream. + + -- Marc Dequènes (Duck) Sun, 13 Mar 2005 11:01:55 +0100 + +gnome-panel (2.8.2-2) unstable; urgency=medium + + * urgency high because menu bug is very bad for sarge, and custom + lauchers are an important feature which is unfortunatly broken. + * menu : (thanks to Bill Allombert) + + updated suggests and added conflicts for nice woody transition + (Closes: #291085). + + removed unuseful 'userprefix' in menu-method. + * Added patches : + + custom lauchers fix from Sjoerd Simons (Closes: #291185). + + run-application typing completion speed improvements (from + gnomezilla) (Closes: #287120). + * Corrected doc-base index location (Closes: #285650). + * Corrected descriptions to please lintian. + + -- Marc Dequènes (Duck) Fri, 28 Jan 2005 23:58:50 +0100 + +gnome-panel (2.8.2-1) unstable; urgency=low + + * New upstream release : + + no longer respond to delete event (Closes: #254972). + * CDBS Tweaks. + * Regenerated '05_clockapplet_reload_timezone.patch'. + * Regenerated relibtoolize patch. + * Updated policy to 3.6.1.1 (no changes needed). + * Patched or and uk translations : some translators should _really_ + learn how to read english. + + -- Marc Dequènes (Duck) Fri, 10 Dec 2004 02:31:05 +0100 + +gnome-panel (2.8.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 19 Nov 2004 13:14:18 +0100 + +gnome-panel (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Removed '03_define_types.patch' not necessary anymore. + * Regenerated relibtoolize patch. + * Reintroduced '04_french_typo.patch' removed by mistake. + + -- Marc Dequènes (Duck) Thu, 14 Oct 2004 01:28:31 +0200 + +gnome-panel (2.8.0.1-1) experimental; urgency=low + + * New upstream release : + + clock applet : fixed padding on a 24px panel (Closes: #258323). + + fix panel orientation badly set/remembered (Closes: #216997). + + fix freakiness with autohiding and snap-to-screen-edge + (Closes #255608). + * [JHM] Added devhelp doc symlink (Closes: #273491) + * Dropped '04_french_typo.patch' now included upstream. + + -- Marc Dequènes (Duck) Sun, 3 Oct 2004 15:09:48 +0200 + +gnome-panel (2.8.0-2) experimental; urgency=low + + * Version 2.8.0 corrects : + + run in terminal works again (Closes: #262487). + + custom launcher command browser was lacking navigation entries + (Closes: #254443). + * Enabled evolution-data-server support (Closes: #272061). + * Updated versions in 'debian/control'. + + -- Marc Dequènes (Duck) Wed, 22 Sep 2004 00:50:02 +0200 + +gnome-panel (2.8.0-1) experimental; urgency=low + + * New upstream release. + * Updated watch file. + * Regenerated relibtoolize patch. + * Made build idempotent (typo patch for 'po/fr.po' was causing + problems) + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS automatic 'config.*' management. + + -- Marc Dequènes (Duck) Tue, 14 Sep 2004 21:16:42 +0200 + +gnome-panel (2.7.92-1) experimental; urgency=low + + * New upstream release : + + correct pointer detection problem on multiscreen causing several + problems like autihiding not always working (Closes: #178710) + + new add applet dialog (Closes: #247982) (bug obsoleted) + * NOTICE : panel settings dialog was removed upstream, use gconf + editor instead. + * Build-Depends/Depends versions update (Closes: #261327). + * Ported changes from 2.6.2-2 & 2.6.2-3. + * Removed 03_po_gu_fix.patch now included upstream. + * Patch added to correct a typo in french translation (Closes: + #268618). + * Corrected quoting problem in description (Closes: #244071). + * Patch from gnomezilla to reload timezone in clock applet (Closes: + #61611). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Sun, 12 Sep 2004 17:57:49 +0200 + +gnome-panel (2.7.91.1-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Bumped libwnck build dependency as per configure.in. + * [debian/patches/02_relibtoolise.patch] Regenerated. + * [debian/gnome-panel-data.install] Removed + debian/tmp/usr/share/control-center-2.0 . + * [debian/rules] Ensure at build time that all symbols are resolvable; make + the linker work a bit harder to speed up dynamic loading. + + -- J.H.M. Dassen (Ray) Sat, 21 Aug 2004 13:22:47 +0200 + +gnome-panel (2.7.4.1-1) experimental; urgency=low + + * New upstream release : + + updated translations (Closes: #247982, #247984). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Wed, 21 Jul 2004 18:24:00 +0200 + +gnome-panel (2.7.3-1) experimental; urgency=low + + * New upstream release + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Tue, 6 Jul 2004 14:38:10 +0200 + +gnome-panel (2.7.1-1) experimental; urgency=low + + * New upstream release + + -- Marc Dequènes (Duck) Thu, 24 Jun 2004 20:30:55 +0200 + +gnome-panel (2.6.2-1) unstable; urgency=low + + * New upstream release. + * Updated some Build-Depends versions. + * Regenerated '02_relibtoolise.patch'. + + -- Marc Dequènes (Duck) Sat, 19 Jun 2004 11:14:06 +0200 + +gnome-panel (2.6.1-4) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + * debian/control.in: + + Don't Build-Depends on evolution-data-server since this package is + not in unstable + + -- Sebastien Bacher Wed, 26 May 2004 16:38:41 +0200 + +gnome-panel (2.6.1-3) experimental; urgency=low + + * GNOME Team Upload. + * Rebuilt with new evolution-data-server (Closes: #250807). + + -- Sebastien Bacher Tue, 25 May 2004 19:38:22 +0200 + +gnome-panel (2.6.1-2) experimental; urgency=low + + * Added missing Build-Depends on 'libxmu-dev' (Closes: #247285). + + -- Marc Dequènes (Duck) Thu, 20 May 2004 18:39:24 +0200 + +gnome-panel (2.6.1-1) experimental; urgency=low + + * New upstream release : + - fixed visibility problem with solid-color background + (Closes: #179871). + * Recreated and split relibtoolize patch. + * Improved tight versioning rules. + * Deactivated gtk-doc documentation regeneration (see GNOME Policy on + Alioth for details). + * Removing all remaining 'Makefile' files in clean rule. + + -- Marc Dequènes (Duck) Wed, 21 Apr 2004 02:47:43 +0200 + +gnome-panel (2.6.0-5) experimental; urgency=low + + * Gustavo Noronha Silva: + - debian/gnome-panel-data.postinst: + + add a call to gconftool-2 to --load the .entries file which + contains the default panel configuration + + -- Gustavo Noronha Silva Thu, 15 Apr 2004 22:14:40 -0300 + +gnome-panel (2.6.0-4) experimental; urgency=low + + * Added missing Replaces for 'libpanel-applet2-dev' on 'gnome-panel- + data' for 2.4->2.6 transition. + * J.H.M. Dassen (Ray): + - [debian/patches/01_relibtoolise.patch] New. Cut down direct + dependencies. + * Jordi Mallach: + - debian/control.in: build-depend on an epoched libglade2-dev. + - debian/rules: don't let clean fail if find returns error. + + -- Marc Dequènes (Duck) Fri, 9 Apr 2004 04:02:26 +0200 + +gnome-panel (2.6.0-3) experimental; urgency=low + + * Rebuilt to use 'evolution-data-server'. + + -- Marc Dequènes (Duck) Mon, 29 Mar 2004 23:56:27 +0200 + +gnome-panel (2.6.0-2) experimental; urgency=low + + * Corrected 'gnome-applet' tight dependency on 'libpanel-applet2-0'. + * Corrected missing Build-Depends on 'cdbs'. + * Updated Depends & Recommends. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:29:52 +0200 + +gnome-panel (2.6.0-1) experimental; urgency=low + + * New Maintainer (Closes: 238884). + * New upstream release: + + fix X resource leak (Closes: #235903). + + fix auto-open behaviour for drawers (Closes: #216577). + * Switched to CDBS. + * Updated Uploaders and using the 'gnome-pkg-tools' pkg. + * Added some Replaces/Conflicts for smoother upgrade. + * Compatibility level switched to 4, and old patches were deactivated. + * Cleaned dirty 'debian/*' made by CM, now using simple and clean CDBS + rules and '*.install' files. + * Improved 'debian/copyright'. + * Removed now unused 'go.uue' to genrate 'go.png'. + * 'debian/control', 'debian/changelog' and 'debian/copyright' are now + UTF-8 encoded. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:21:32 +0200 + +gnome-panel (2.4.2-4) unstable; urgency=low + + * the right + + -- Christian Marillat Fri, 19 Mar 2004 15:39:39 +0100 + +gnome-panel (2.4.2-3) unstable; urgency=low + + * Remove DTD hack and update scrollkeeper dependency to 0.3.14-5 + * Add outputencoding="UTF-8" in menu-method file (Closes: #230804) + + -- Christian Marillat Sun, 8 Feb 2004 11:09:26 +0100 + +gnome-panel (2.4.2-2) unstable; urgency=low + + * Suggests gnome-system-tools for gnome-panel, needed if you want to set + up the system time (Closes: #229043) + + -- Christian Marillat Fri, 23 Jan 2004 11:52:49 +0100 + +gnome-panel (2.4.2-1) unstable; urgency=low + + * New upstream release. + * Remove 05_manpage patch, included by upstream + + -- Christian Marillat Fri, 16 Jan 2004 10:22:17 +0100 + +gnome-panel (2.4.1-7) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + + -- Christian Marillat Fri, 9 Jan 2004 15:48:01 +0100 + +gnome-panel (2.4.1-6) unstable; urgency=low + + * Add a version (>= 2.4.0) to the gnome-applets recommends (Closes: #223550) + + -- Christian Marillat Wed, 31 Dec 2003 09:21:18 +0100 + +gnome-panel (2.4.1-5) unstable; urgency=low + + * Add a -dbg package for libpanel-applet2 library (Closes: #220734) + * Add missing manpages. + + -- Christian Marillat Sun, 7 Dec 2003 11:05:31 +0100 + +gnome-panel (2.4.1-4) unstable; urgency=low + + * Panel should conflicts with metacity <= 2.6.0 (Closes: #217122) + * Patch from bugzilla to fix duplicate entries in the help message (Closes: #183130) + * debian/control update build-dependecies to GNOME 2.4 packages (Closes: #217497) + + -- Christian Marillat Sat, 25 Oct 2003 09:54:07 +0200 + +gnome-panel (2.4.1-3) unstable; urgency=low + + * Register default panel configuration with gconftool (Closes: #216600) + + -- Christian Marillat Mon, 20 Oct 2003 01:19:20 +0200 + +gnome-panel (2.4.1-2) unstable; urgency=low + + * gnome-panel-data should replaces gnome-desktop-data (Closes: #216458) + * Rebuild to remove liblinc dependency in the -dev package + + -- Christian Marillat Sun, 19 Oct 2003 10:01:36 +0200 + +gnome-panel (2.4.1-1) unstable; urgency=low + + * New upstream release. + * Should suggest a terminal emulator for the run program dialog (Closes: #214650) + * Don't need to depends on xbase-clients + + -- Christian Marillat Sat, 18 Oct 2003 10:36:24 +0200 + +gnome-panel (2.2.2.2-2) unstable; urgency=low + + * Change userprefix in menu-method. You can access user generated Debian + menus with favorites:/// in nautilus + * Use theme folder icons for Debian menus (Closes: #207494) + * New patch to fix manpage entry for gnome-panel (Closes: #212037) + + -- Christian Marillat Sun, 21 Sep 2003 23:33:11 +0200 + +gnome-panel (2.2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 15 Jul 2003 15:28:51 +0200 + +gnome-panel (2.2.2.1-2) unstable; urgency=low + + * Patch 04_drawer.c to fix a panel crash when a new drawer is added + (Closes: #198695) + + -- Christian Marillat Sat, 28 Jun 2003 14:35:49 +0200 + +gnome-panel (2.2.2.1-1) unstable; urgency=low + + * New upstream release + * Add a gnome-control-center (>= 2.2.2) dependency (Closes: #198371) + * New patch (01) to fix broken translation in bn.po (Closes: #193635) + + -- Christian Marillat Sun, 22 Jun 2003 15:44:58 +0200 + +gnome-panel (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 16 May 2003 17:45:28 +0200 + +gnome-panel (2.2.1-2) unstable; urgency=low + + * Only add longtitle as tooltip in Debian menu (Closes: #186697) + * Update section + * Add go icon + + -- Christian Marillat Sun, 13 Apr 2003 08:29:10 +0200 + +gnome-panel (2.2.1-1.1) unstable; urgency=low + + * zero source change NMU to resolve problems on ia64 that binary NMU caused + + -- Bdale Garbee Fri, 11 Apr 2003 02:13:24 -0600 + +gnome-panel (2.2.1-1) unstable; urgency=low + + * New upstream release. + * Remove notification applet patch + + -- Christian Marillat Tue, 11 Mar 2003 15:51:00 +0100 + +gnome-panel (2.2.0.1-2) unstable; urgency=low + + * Patch to fix the notification applet crash (Closes: #180133) + + -- Christian Marillat Mon, 17 Feb 2003 16:04:23 +0100 + +gnome-panel (2.2.0.1-1) unstable; urgency=low + + * New upstream release. + * Remove replaces libpanel-applet-dev in the -dev package. + + -- Christian Marillat Tue, 4 Feb 2003 14:36:28 +0100 + +gnome-panel (2.2.0-2) unstable; urgency=low + + * Conflicts with system-tray-applet (Closes: #178278) + * Add versioned conflicts for gnome-core (Closes: #178401) + + -- Christian Marillat Sat, 25 Jan 2003 23:52:18 +0100 + +gnome-panel (2.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 21 Jan 2003 15:33:47 +0100 + +gnome-panel (2.1.90.1-1) unstable; urgency=low + + * New upstream release. + * Add a quick-lounge-applet (<= 0.98-1) conflicts, this applet crash the panel. + * Launcher are restored properly (Closes: #172385) + * Menu panel doesn't disappears (Closes: #172848) + * Fixes panel hogging the CPU when hide_delay and show_delay are zero (Closes: #174002) + * Fix inbox monitor randomly displays wildly inaccurate info (Closes: #168877) + * debian/control Add yelp and gnome2-user-guide in Suggests for the panel + + -- Christian Marillat Sat, 18 Jan 2003 17:12:02 +0100 + +gnome-panel (2.0.11-3) unstable; urgency=low + + * Bump Standards-Version to 3.5.8 + + -- Christian Marillat Sat, 28 Dec 2002 17:55:58 +0100 + +gnome-panel (2.0.11-2) unstable; urgency=low + + * Move libpanel documentation in a -doc package (Closes: #171007) + + -- Christian Marillat Fri, 20 Dec 2002 16:18:00 +0100 + +gnome-panel (2.0.11-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Nov 2002 14:40:58 +0100 + +gnome-panel (2.0.10-2) unstable; urgency=low + + * Upload to unstable + * Gnome-hints has been removed (Closes: #152335) + * Fix in clock update (Closes: #156401) + * Applets save their properties (Closes: #135569) + * No more buttons in the tasklist applet (Closes: #116205) + * Docklet has been removed (Closes: #137450) + * Launcher properties are now saved (Closes: #139827) + * Now menus are always sorted (Closes: #150649) + * kmail doesn't crash the panel (Closes: #146706) + * The tasklist isn't dynamic resizable (Closes: #89752) + * No more problem with windowmaker and the panel (Closes: #94592) + * No more duplicate entrie in the main menu (Closes: #97473) + * No more memory leak in the tasklist applet (Closes: #103880) + * Tasklist doen't display app titles (Closes: #112059) + * Netscape entry menu is fixed (Closes: #135992) + * No more "Fill window thumbnails" option in tasklist (Closes: #151134) + * Tooltips in the arrows panel are correctly displayed (Closes: #113642) + * Completion in run dialog work with ctrl-TAB (Closes: #75665) + * gmenu has been removed (Closes: #95014) + * menu have a mozilla entry (if mozilla is present) (Closes: #135993) + * Xemacs.desktop has been removed (Closes: #148500) + + -- Christian Marillat Mon, 28 Oct 2002 16:08:15 +0100 + +gnome-panel (2.0.10-1) experimental; urgency=low + + * New upstream release. + * gnome-panel should depends on xbase-clients for xrdb + * Add build-dependency for xbase-clients + + -- Christian Marillat Mon, 14 Oct 2002 16:47:55 +0200 + +gnome-panel (2.0.9-4) experimental; urgency=low + + * Upload with original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:45:08 +0200 + +gnome-panel2 (2.0.9-3) experimental; urgency=low + + * Upload without the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 18:46:17 +0200 + +gnome-panel2 (2.0.9-2) experimental; urgency=low + + * Add libmpg3-dev in build-depends (Closes: #160758) + * Update to standards version 3.5.7 + * -dev package should depends on the same lib version + + -- Christian Marillat Mon, 16 Sep 2002 11:35:00 +0200 + +gnome-panel2 (2.0.9-1) experimental; urgency=low + + * New upstream release. + * Update lignome-ui-dev dependencies to 2.0.5-2 + + -- Christian Marillat Fri, 6 Sep 2002 13:50:51 +0200 + +gnome-panel2 (2.0.8-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 5 Sep 2002 19:00:46 +0200 + +gnome-panel2 (2.0.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 27 Aug 2002 11:19:52 +0200 + +gnome-panel2 (2.0.6-2) experimental; urgency=low + + * Add scrollkeeper in build-depends + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:36:42 +0200 + +gnome-panel2 (2.0.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 12 Aug 2002 19:44:49 +0200 + +gnome-panel2 (2.0.5-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 8 Aug 2002 16:46:21 +0200 + +gnome-panel2 (2.0.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 5 Aug 2002 19:35:26 +0200 + +gnome-panel2 (2.0.3-2) experimental; urgency=low + + * Recompiled against the latest lignome-vfs to remove libssl dependency. + + -- Christian Marillat Fri, 2 Aug 2002 17:14:51 +0200 + +gnome-panel2 (2.0.3-1) experimental; urgency=low + + * New upstream release. + * Remove gmenu entry in menu file (Closes: #153213) + * debian/menu s/panel/gnome-panel/ + + -- Christian Marillat Tue, 30 Jul 2002 17:08:21 +0200 + +gnome-panel2 (2.0.2-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 15 Jul 2002 15:31:05 +0200 + +gnome-panel2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Jun 2002 16:07:40 +0200 + +gnome-panel2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + * Replace "Distribution menu" by "Debian menu" + + -- Christian Marillat Mon, 10 Jun 2002 16:51:50 +0200 + +gnome-panel2 (1.5.24-2) experimental; urgency=low + + * Build against the latest libraries. + + -- Christian Marillat Sun, 9 Jun 2002 18:29:23 +0200 + +gnome-panel2 (1.5.24-1) experimental; urgency=low + + * New upstream release. + * Remove call to Internet DTD (Closes: #148899) + * Call scrollkeeper-update in gnome-panel-data2.postrm + + -- Christian Marillat Tue, 4 Jun 2002 17:22:35 +0200 + +gnome-panel2 (1.5.23-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 28 May 2002 15:51:18 +0200 + +gnome-panel2 (1.5.22-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * gnome-panel2 should depends on gnome-desktop-data + * debian/gnome-panel-data2.postinst check if schemas files are present + before calling gconftool-2 + + -- Christian Marillat Mon, 27 May 2002 16:01:57 +0200 + +gnome-panel2 (1.5.22-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 20 May 2002 21:58:18 +0200 + +gnome-panel2 (1.5.21-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 20:39:24 +0200 + +gnome-panel2 (1.5.20-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:25:08 +0200 + +gnome-panel2 (1.5.19-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 20:51:20 +0200 + +gnome-panel2 (1.5.18-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 16:41:41 +0200 + +gnome-panel2 (1.5.17-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 17 Apr 2002 15:46:23 +0200 + +gnome-panel2 (1.5.16-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 1 Apr 2002 22:40:37 +0200 + +gnome-panel2 (1.5.15-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 29 Mar 2002 17:01:04 +0100 + +gnome-panel2 (1.5.12-2) experimental; urgency=low + + * Add libwnck-dev in build-depends (Closes: #137954) + + -- Christian Marillat Wed, 13 Mar 2002 10:51:00 +0100 + +gnome-panel2 (1.5.12-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Mar 2002 14:47:36 +0100 + +gnome-panel2 (1.5.11-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 26 Feb 2002 15:37:43 +0100 + +gnome-panel2 (1.5.10-2) experimental; urgency=low + + * Replace gettext by intltoo in build-depends + + -- Christian Marillat Mon, 25 Feb 2002 15:40:43 +0100 + +gnome-panel2 (1.5.10-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Mon, 18 Feb 2002 22:06:48 +0100 + +gnome-panel2 (1.5.9-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 15 Feb 2002 00:38:51 +0100 + +gnome-panel2 (1.5.7-1) experimental; urgency=low + + * New upstrema release. + + -- Christian Marillat Tue, 5 Feb 2002 14:41:01 +0100 + +gnome-core2 (1.5.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 16:21:40 +0100 + +gnome-core (1.4.0.4-16) unstable; urgency=low + + * Fix typo in gnome-terminal.wrapper (Closes: #127768) + * Remove gnome-hint patche (Closes: #121390, #129184) + * debian/control Replace libpng-dev by libpng2-dev in Build-Depends + (Closes: #128377) + + -- Christian Marillat Mon, 14 Jan 2002 15:04:52 +0100 + +gnome-core (1.4.0.4-15) unstable; urgency=low + + * Build against the latest gnome-libs to update the libzvt2 dependency + (Closes: #127309, #127271) + * debian/control Replace libpng2-dev by libpng-dev in Build-Depends. + * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9) + + -- Christian Marillat Tue, 1 Jan 2002 15:27:43 +0100 + +gnome-core (1.4.0.4-14) unstable; urgency=low + + * Fix typo in gnome-terminal.1 (Closes: #123073) + * Fix base page for doc-base in libpanel-applet-dev package. + * Fix typo in gnome-help documentation (Closes: #126566) + * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427) + + -- Christian Marillat Thu, 27 Dec 2001 14:47:36 +0100 + +gnome-core (1.4.0.4-13) unstable; urgency=low + + * Default font for gnome-terminal is "fixed" only (Closes: #117126) + * Patch against gnome-hint.c Don't use gettext for font descriptor + (Closes: #116606) + * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path + (Closes: #120312) + * Revert my change on logout.c Only root can shutdown/reboot from the + panel (Closes: #119316, #120127) + + -- Christian Marillat Tue, 20 Nov 2001 11:36:05 +0100 + +gnome-core (1.4.0.4-12) unstable; urgency=low + + * gnome-wm honour --default-wm (Closes: #115668) + * Build against the latest gnome-libs + + -- Christian Marillat Sun, 21 Oct 2001 14:11:19 +0200 + +gnome-core (1.4.0.4-11) unstable; urgency=low + + * debian/control lynx comeback in Recommends (Closes: #114142) + * debian/control replaces xml-i18n-tools by intltool (Closes: #115024) + * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369) + * Build against the latest orbit (Closes: #115309) + + -- Christian Marillat Fri, 12 Oct 2001 10:46:49 +0200 + +gnome-core (1.4.0.4-10) unstable; urgency=low + + * Fix typo in panel/panel.hints (Closes: #113590) + * Replace lynx by w3m (Closes: #113613) + * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736) + * Move gnome-help.desktop in gnome-help package + * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above + * Patch against gsm/logout.c Now you can reboot/halt your machine from the + panel. This only work for root, because shutdown doesn't understand the + -a option. Read README.debian in gnome-panel package. + * debian/rules Remove less files in clean target (Closes: #114020) + + -- Christian Marillat Mon, 1 Oct 2001 11:34:06 +0200 + +gnome-core (1.4.0.4-9) unstable; urgency=low + + * Add Debian menu for panel and gmenu (Closes: #112176) + * Remove /var/lib/gnome on purge (Closes: #113005) + * Remove /etc/gnome/config on purge (Closes: #112994) + * Remove /etc/gnome on purge (Closes: #112995) + * debian/control replace cygnus-stylesheets by docbook-utils + + -- Christian Marillat Mon, 24 Sep 2001 18:39:19 +0200 + +gnome-core (1.4.0.4-8) unstable; urgency=high + + * High urgency, because the current release in testing has a missing + dependency on libpanel-applet0 and the panel package doesn't work if + libpanel-applet0 isn't installed (Closes: #111517) + * debian/control for gnome-help, move lynx from depends to recommends + (Closes: #109652) + * debian/control gnome-panel suggests fortune-mod (Closes: #110865) + * debian/control gnome-help suggests gnome-users-guide not + gnome-users-guide-en (Closes: #111200) + * Don't change cursor color (Closes: #97697) + * Change default font for gnome-terminal (Closes: #111319) + + -- Christian Marillat Fri, 7 Sep 2001 15:06:07 +0200 + +gnome-core (1.4.0.4-7) unstable; urgency=low + + * Fix path in gnome-session.1 (Closes: #107724) + * debian/*.sgml Use docbook 4.1 + * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2) + (CLoses: #107948) + + -- Christian Marillat Wed, 8 Aug 2001 08:07:56 +0200 + +gnome-core (1.4.0.4-6) unstable; urgency=low + + * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0 + (Closes: #105772) + + -- Christian Marillat Wed, 18 Jul 2001 19:02:59 +0200 + +gnome-core (1.4.0.4-5) unstable; urgency=low + + * Patch against gnome-edit to use EDITOR if the default gnome editor is + unavailable. + * Remove gnome-wm patch, and move the patched file in debian/ + * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager + (Closes: #103430 + * New patch from Michael Urman to hide task names in tasklist_applet + (Closes: #104587) + + -- Christian Marillat Sat, 14 Jul 2001 16:58:12 +0200 + +gnome-core (1.4.0.4-4) unstable; urgency=low + + * Gnome-help Provides: man-browser, www-browser, info-browser + * Switch to debhelper V3 + * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest + package number. + * Build-depends on groff-base instead of groff + + -- Christian Marillat Fri, 22 Jun 2001 17:02:37 +0200 + +gnome-core (1.4.0.4-3) unstable; urgency=low + + * New patch: Allows to save/load the keyboard secure state (Closes: #83028) + * New patch: Remove a warning in configure + * gnome-help replace gnome-panel-data (Closes: #99499) + * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784) + + -- Christian Marillat Sat, 2 Jun 2001 14:41:45 +0200 + +gnome-core (1.4.0.4-2) unstable; urgency=low + + * New patch: Replace Distribution by Debian in configuration dialog box. + * New patch: Upstream patch to allow Debian menu in default configuration. + * New patch: Fix some wrong path. + * Move gnome-feedback doc from gnome-help-data to gnome-core. + + -- Christian Marillat Tue, 15 May 2001 15:36:51 +0200 + +gnome-core (1.4.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 9 May 2001 23:56:27 +0200 + +gnome-core (1.4.0.3-2) unstable; urgency=low + + * Remove debugging code (/tmp/languages file) + + -- Christian Marillat Mon, 7 May 2001 16:48:18 +0200 + +gnome-core (1.4.0.3-1) unstable; urgency=low + + * New upstream release. + * New: tooltips for long task names in tasklist_applet (Closes: #63898) + + -- Christian Marillat Thu, 3 May 2001 15:51:58 +0200 + +gnome-core (1.4.0.2-3) unstable; urgency=low + + * Fix wrong dif.gz file (Closes: #94499) + * Build against the latest lignome-dev (Closes: #95301, #95691) + * gnome-terminal should depends on gnome-bin (Closes: #95498) + * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187) + + -- Christian Marillat Tue, 1 May 2001 11:03:14 +0200 + +gnome-core (1.4.0.2-2) unstable; urgency=low + + * New/old patch against manpages, never applied by upstream. + * gnome-help depends on lynx. + * Use x-terminal-emulator in gnome-download instead of xterm. + * Move gnome-convert and gnome-download from gnome-core to gnome-help. + * Move gnome-login-check from gnome-core to gnome-session. + * Move gnome-panel-add-launcher from gnome-core to gnome-panel. + * Move sesion-properties* from gnome-core to gnome-session. + * debian/control Add Replaces for the changes above. + * Write manpages (Closes: #87085) + + -- Christian Marillat Tue, 17 Apr 2001 18:54:15 +0200 + +gnome-core (1.4.0.2-1) unstable; urgency=low + + * New upstream release. + * Build-depends on latest gettext (Closes: #93198) + * Icon box in menu editor is back (Closes: #91938) + * Build-depends on latest xml-i18n-tools and libgnome-dev + + -- Christian Marillat Wed, 11 Apr 2001 15:16:20 +0200 + +gnome-core (1.4.0.1-2) unstable; urgency=low + + * Build depends on versionned gettext 0.10.35-17 (Closes: #93198) + * Write manpage for gnome-session and add docbook-to-man in build-depnds + * Write manpages for gnome-help (Closes: #87089) + + -- Christian Marillat Sat, 7 Apr 2001 15:52:40 +0200 + +gnome-core (1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847) + * debian/gnome-session.README.debian remove references to .xsession. This + is now obsolete by the new x-session-manager scheme. + + -- Christian Marillat Sun, 1 Apr 2001 15:01:51 +0200 + +gnome-core (1.4.0-2) unstable; urgency=low + + * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416) + * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700) + + -- Christian Marillat Thu, 22 Mar 2001 16:44:12 +0100 + +gnome-core (1.4.0-1) unstable; urgency=low + + * New upstream release. + * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124) + * Remove manpages patche included by upstream. + * gnome-session don't always saves session on logout (Closes: #89630) + * Can add a launcher in the panel (Closes: #90018) + * Deskguide don't crashes on Fill with mini-images (Closes: #86952) + * Deskguide don't fail to run (Closes: #89769) + * Pager applet don't fail to run (Closes: #89025) + + -- Christian Marillat Mon, 19 Mar 2001 13:01:26 +0100 + +gnome-core (1.3.1-2) unstable; urgency=low + + * Remove taslisk-applet manpage (Closes: #88994) + * New patch against gnome-terminal.1 (Closes: #89005) + * Move /usr/lib/libtasklist_applet.so in libpanel-applet0 + (Closes: #89053, #89008, #89012, #89091, #89003) + * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910) + + -- Christian Marillat Sat, 10 Mar 2001 10:45:14 +0100 + +gnome-core (1.3.1-1) unstable; urgency=low + + * New upstream release. + * Removed default.session patch + * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because + the session-properties-capplet is now in this package. + * debian/{postinst,prerm} Call scrollkeeper + * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in + build-depends and scrollkeeper in depends for gnome-core + * Menu and laucnh keys works now (Closes: #86955) + * Dead keys work in gnome-terminal (Closes: #63102) + * Gnome-terminal isn't broken (Closes: #86752) + * New patch htmlurl.h (This file was broken by upstream author) + * XFMail doesn't crash the tasklist applet in this release (Closes: #88515) + * debian/gnome-core.menu New file for the session properties capplet + + -- Christian Marillat Mon, 5 Mar 2001 11:40:15 +0100 + +gnome-core (1.2.4-11) unstable; urgency=low + + * Update (again) the Build-depends field (Closes: #87419) + * Add a debian directory for the gnome-help-browser and add suggest doc-base + for gnome-help. Now we can watch debian documentation registered with doc-base. + * Add a lintian override file for libpanel-applet0 + + -- Christian Marillat Sun, 25 Feb 2001 16:14:09 +0100 + +gnome-core (1.2.4-10) unstable; urgency=low + + * Update the Build-depends field (Closes: #86441, #87419) + * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328) + + -- Christian Marillat Sat, 24 Feb 2001 18:03:20 +0100 + +gnome-core (1.2.4-9) unstable; urgency=low + + * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950) + * Build against the latest gnome-libs (1.2.11) (Close: #85932) + + -- Christian Marillat Wed, 14 Feb 2001 13:49:26 +0100 + +gnome-core (1.2.4-8) unstable; urgency=low + + * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for + gnome-help (Closes: #80974) + * debian/gnome-help.mime Rewrote (Closes: #82891) + * debian/control gnome-core depends on gnome-bin (Closes: #82951) + * Wrote gnome-panel.README.Debian (Closes: #82954) + + -- Christian Marillat Mon, 22 Jan 2001 16:04:58 +0100 + +gnome-core (1.2.4-7) unstable; urgency=low + + * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733) + + -- Christian Marillat Wed, 27 Dec 2000 19:24:08 +0100 + +gnome-core (1.2.4-6) unstable; urgency=low + + * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219) + * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405) + + -- Christian Marillat Sun, 24 Dec 2000 03:27:12 +0100 + +gnome-core (1.2.4-5) unstable; urgency=low + + * Install gnome-terminal.wrapper as x-terminal-emulator and remove + debian/patches/gnome-terminal.dpatch (Closes: 64326) + Thanks to Eric Gillespie, Jr. + * Add Recommends: gnome-applets on gnome-panel (Closes: #72208) + * gnome-sesion provides x-session-manager and install alternative (Closes: #60667) + * Added hints=Gnome for all menu files. + + -- Christian Marillat Wed, 20 Dec 2000 23:19:55 +0100 + +gnome-core (1.2.4-4) unstable; urgency=low + + * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils + for gnome-session. Thanks to Joseph Carter for the file + (Closes: #79776) + * Rewrote default.session patch + * Add patch form Doug Larrick for gwmthumbnail.c (Closes: #78550) + + -- Christian Marillat Sun, 17 Dec 2000 12:04:54 +0100 + +gnome-core (1.2.4-3) unstable; urgency=low + + * Change gnome-help.mime to call the right file (Closes: #77986) + Thanks Malcolm Parsons for the patch. + * Patch gsm/default.in (two entries with same id) (Closes: #78276) + Thanks to Normal User (Nice name) + * Move gnome-control-center from Depends to Suggests. + * Remove libgtkhtml-dev from Build-Depends (Closes: #79527) + + -- Christian Marillat Wed, 13 Dec 2000 18:01:34 +0100 + +gnome-core (1.2.4-2) unstable; urgency=low + + * Remove README and NEWS files (Closes: #77250) + * Disable thumbnails by default in deskguide_applet (Closes: #77205) + * debian/rules --with-window-manager is now sawfish (was x-window-manager) + and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401) + * Should close this old bug (Closes: #51198) + * Patch gnome-edit to use x-terminal-emulator instead of xterm. + + -- Christian Marillat Mon, 20 Nov 2000 11:35:55 +0100 + +gnome-core (1.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Thu, 16 Nov 2000 00:43:15 +0100 + +gnome-core (1.2.3.1-1) unstable; urgency=low + + * New upstream release. + * Add gnome-help example and manpage in gnome-help package (Closes: #49977) + * This release should close these old bugs (Closes: #60561, #60768, #45053) + * Gnome-panel don't use all CPU time (Closes: #75251, #60209) + * Remove gmenu patch included by upstream. + + -- Christian Marillat Wed, 8 Nov 2000 17:09:42 +0100 + +gnome-core (1.2.3-1) unstable; urgency=low + + * New upstream release. + * Debian menus aren't empty (Closes: #70470) + * Launcher can find icon (Closes: #62502) + + -- Christian Marillat Tue, 24 Oct 2000 15:51:11 +0200 + +gnome-core (1.2.2.1-3) unstable; urgency=low + + * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451) + * Patch gnome-terminal to accept -T option (Closes: #74450) + * Move README.debian in gnome-session package (Closes: #60440) + * mesg work in gnome-terminal (Closes: #71728) + * Upstream fix these old bugs in Gnome-terminal + Problem with menubar (Closes: #57516) + Problem with console-apt Closes: #60079) + Problem with screen (Closes: #50156) + * Binaries don't should go in /usr/X11R6/bin (Closes: #24031) + Quoting Debian policy : + "Packages using the X Window System should abide by the FHS standard" + "whenever possible; they should install binaries, libraries, manual" + "pages, and other files in FHS-mandated locations wherever possible." + "This means that files must not be installed into /usr/X11R6/bin/'" + * hostname isn't harcoded (Closes: #72536) + * Error messages mention Lynx (Closes: #62216) + * Display correctly deskuse.html (Closes: #49974) + * Add patch from malcolm (Closes: #64820) + + -- Christian Marillat Sat, 14 Oct 2000 23:39:49 +0200 + +gnome-core (1.2.2.1-2) unstable; urgency=low + + * Typo in debian/gnome-terminal.postinst + * Add gnome-terminal manpage (Closes: #69188) + * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog) + * Gnome-terminal write to /var/run/utmp (Closes: #59053) + * delete/backspace keys works (Closes: #57198) + * Install GnomeHelp file in /etc/gnome/config (Closes: #73012) + * Convert png icons in xpm for Debian menu. + * Rearange documentation for dhelp (Closes: #56672) + + -- Christian Marillat Thu, 5 Oct 2000 00:59:44 +0200 + +gnome-core (1.2.2.1-1) unstable; urgency=low + + * New upstream release. + * Patch all manpages (Closes: #70009) + * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570) + * gmenu don't jam up all translations (Closes: #46446) + * panel remember its configuration between session + (Closes: #47734, #54190) + * Icons are now centered (Closes: #63868) + * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755, + #58278, #61083, #69428)) + * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463) + * debian/control remove Conflicts: asclock (Closes: #52077) + * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356) + * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973) + * debian/control move gmc from Recommends to Suggests (Closes: #59415) + * The first search in gnome-wm search is x-window-manager + (Closes: #50940, #65969, #62143) + * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219) + * Bugs closed by previous NMU in gnome-terminal + (Closes: #64579, #63592, #63332, #56584, #55477, #54428) + * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225) + + -- Christian Marillat Wed, 27 Sep 2000 16:02:16 +0200 + +gnome-core (1.2.2-1) unstable; urgency=low + + * New maintainer, thanks James. + * New upstream release. + * Switch to debhelper V2 + * Move README.debian in gnome-session package (Closes: #65235) and + update this file (Closes: #71339) + * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483) + * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050) + * Remove gtkhtml patch. + * The desk guide show thumbnail (Closes: #72359) + * Missing package under sparc (Closes: #71438) + * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039) + * Added icons in Debian menu. + * Eject in drivemount check if '-u' is available (Closes: #63954) + * Patch gmenu to find Debian menu. + + -- Christian Marillat Tue, 26 Sep 2000 17:34:23 +0200 + +gnome-core (1.2.1-0.2) unstable; urgency=low + + * NMU. + * Install these libraries libfish_applet.so libgen_util_applet.so + libpanel_status.so (Closes: #69428, #69590) + * Copy latest gnome aclocal in macros/ and run macros/autogen.sh + This is needed to build gnome-help-browser against libgtkhtml4. + * In debian/control + gnome-session depends on gnome-panel (>= ${Source-Version}). + gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version. + gnome-terminal don't depends on gnome-core. + * URL's are clickable in gnome-terminal (Closes: 63103). + * debian/gnome-panel.undocumented removed printer_applet.1 + * Cut and paste work in gnome-terminal (Closes: #63592). + + -- Christian Marillat Wed, 23 Aug 2000 21:23:36 +0200 + +gnome-core (1.2.1-0.1) unstable; urgency=low + + * New upstream release (Closes: #58806, #66467) + * NMU. + * Standards-Version to 3.1.1.1 Added Build-depends field. + * Removed patches: dialer, drivemount-floppy, modemlights, term, + help-browser, debian-menu, url-match. + * Added patches: gtkhtml. + * Build against libgtkhtml3. Closes: #58679, #36806, #49734 + * Default manpath and infopath are wrong. Closes: #56081 + * gmenu segfaults. Close: #53764, #54050 + * gnome-panel: panel no longer works. Closes: #58278 + * gnome-panel: gnomepager-applet should put braces around. Closes: #52584 + * Backspace and delete work correctly. Closes: #54428 + * TERM never select xterm-debian. Closes: #56584, #55477, #64579 + * Disable arrows option is now saved. Closes: #54755 + * No more files in /usr/share. Closes: #61083 + * Show debian menus. Closes #66214 + * New help documentation for panel. Closes: #40036 + * Gnome-terminal write to /var/run/utmp. Closes #59053 + * gnome-terminal provide x-terminal-emulator. Closes #61805, #56225 + * README.Debian is here. Closes: #65235 + + -- Christian Marillat Tue, 25 Jul 2000 19:09:21 +0200 + +gnome-core (1.0.55-2) frozen unstable; urgency=low + + * Make x-window-manager run first by gnome-wm script to conform to + debian policy (Closes: #61617) (This is an important bug) + + -- James LewisMoss Sun, 21 May 2000 19:31:19 -0400 + +gnome-core (1.0.55-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Sun, 2 Jan 2000 07:32:36 -0500 + +gnome-core (1.0.54-2) unstable; urgency=low + + * Fix the gnome-pager forgets size settings bug (was saved to wrong + section). Closes: #49839, #46845. + + -- James LewisMoss Fri, 12 Nov 1999 07:54:46 -0500 + +gnome-core (1.0.54-1) unstable; urgency=low + + * New upstream. + + -- James LewisMoss Thu, 4 Nov 1999 23:20:14 -0500 + +gnome-core (1.0.53-4) unstable; urgency=low + + * New maintainer. + + -- James LewisMoss Mon, 25 Oct 1999 23:17:31 -0400 + +gnome-core (1.0.53-3) unstable; urgency=low + + * Ok, I made a mistake by setgiding gnome-terminal to + utmp. Reverted the change. Closes: #47960 + + -- Raphael Hertzog Mon, 18 Oct 1999 19:17:27 +0200 + +gnome-core (1.0.53-2) unstable; urgency=low + + * gnome-session does launch a default window-manager. It does launch + gnome-wm if no other information has been found. gnome-wm now + reads the list of window managers from /etc/X11/window-managers + once it has tried gnome compliant wm. Closes: #38347, #47370 + * Patched gnome-terminal. TERM=xterm-debian again ... actually this + closes: #47552, #44960, #41065 + * gnome-terminal is now setgid utmp and can thus register itself + in the UTMP database. Closes: #40507 + * The URL match does now accept % characters. Closes: #47281 + * libpanel-applet0.postinst check for the changelog.gz mysteriously + staying around. Closes: #45871 + * Unreproducable bugs without answer from the submitter. + Closes: #41195, #42865 + + -- Raphael Hertzog Sat, 16 Oct 1999 19:52:38 +0200 + +gnome-core (1.0.53-1) unstable; urgency=low + + * New upstream version. + * gnome-session does now depend on gnome-panel and recommends + gmc (both are needed for a full Gnome desktop). + * gnome-terminal does not have a border. Closes: #38972 + + -- Raphael Hertzog Tue, 12 Oct 1999 21:17:58 +0200 + +gnome-core (1.0.52-1) unstable; urgency=low + + * New maintainer. Steve said that he wanted to give away some of + his packages. I've asked to take gnome-core, he never replied, so + I'm taking it but I will give it back to him if he wanted to + keep it. In the meantime I can better manage bugs with my name + in the Maintainer field. + * New upstream version. + + -- Raphael Hertzog Mon, 4 Oct 1999 21:28:18 +0200 + +gnome-core (1.0.50-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Thu, 30 Sep 1999 22:10:03 +0200 + +gnome-core (1.0.41-0.1) unstable; urgency=low + + * New upstream version. + * NMU again. + + -- Raphael Hertzog Mon, 27 Sep 1999 13:10:31 +0200 + +gnome-core (1.0.9-0.1) unstable; urgency=low + + * New upstream version. Closes: #43253, #44098 + * Apply patches before configuring (and relaunch automake && autoconf + because one of the patches is applied on Makefile.am). + * NMU. Thanks to Christian Marillat for his work. + * Imlib bug corrected: closes: #39085 + * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031 + * The panel does start correctly wihout complaining about a + missing name service. Closes: #39380, #39634, #40478 + * The panel doesn't consume all CPU resources. Closes: #30654 + * The panel launches apps from where it has been launched itself. + Closes: #32319 + * The panel keeps the settings. Closes: #37052, #40579, #43496 + * Old core dump corrected upstream. Closes: #39400, #40328, #42167 + Closes: #44344, #44724, #44732, #44759, #44773 + * Bug in menu-method, not in gnome-panel. Already reported against + menu. Closes: #40089 + * cdplayer_applet works again. Closes: #42192 + * gnome pager works well: Closes: #42499, #42610 + * modem_lights draws itself correctly. Closes: #43861, #45055 + * The dialer applets doesn't exit when stopping while + not yet connected. Closes: #45287 + * No more Debian menu in the panel. Closes: #41040 + * GnomeICU works with this panel. Closes: #39626, #39515 + * gnome-panel-data conflicts with asclock. + Closes: #40712, #40715, #40808, #41430 + A better solution will be needed. Maybe put asclock in his own + package or create a asclock-data package that will be shared. + * Updated the modemlights patch. Closes: #43512 + * Added a patch for gnome-wm. Closes: #38366 + * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are + not libraries to be linked with, just simple modules). Closes: #38596 + * Asclock works well without xearth (the code still mentions xearth + however). Closes: #40530 + * New patch (help-browser) for changing the default MANPATH and INFOPATH in + gnome-help-browser.c Closes: #41452 + * Moved help-browser to the new "Help" menu section. + * Added gnome-help.mime. Closes: #42205 + * Gnome-session does launch gnome-panel ! (I suppose that it failed + to launch since panel was broken). Closes: #42937 + * gnome-sesion doesn't core dump. Closes: #36640 + * The terminal does remember the TERM var. Closes: #43067 + * The terminal keeps its size when dragging the manu bar in and out. + Closes: #44762 + * The menu section of gnome-terminal corrected. Closes: #37635 + + -- Raphael Hertzog Wed, 22 Sep 1999 13:24:34 +0200 + +gnome-core (1.0.7-1) unstable; urgency=low + + * New upstream version. + * Removed "term" patch + + -- Steve Haslam Mon, 28 Jun 1999 01:36:31 +0100 + +gnome-core (1.0.6-2) unstable; urgency=low + + * debian-menu.dpatch: created to fix guessing Debian menus + (/etc/menu-methods/gnome-panel now) and to make Debian menus the default + instead of GNOME system menus. + * gnome-help now suggests gnome-users-guide-en (closes: #35724) + * /etc/menu-methods/gnome-panel now creates .directory files and searches + /usr/X11R6/include/X11/pixmaps for menu icons + + -- Steve Haslam Sun, 13 Jun 1999 15:28:52 +0100 + +gnome-core (1.0.6-1) unstable; urgency=low + + * New upstream version. + + -- Steve Haslam Sat, 5 Jun 1999 12:57:08 +0100 + +gnome-core (1.0.5-3) unstable; urgency=low + + * debian/gnome-terminal.menu: managed to lose change mentioned in last + revision. Replaced. + * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in + gnome-session.undocumented too). + + -- Steve Haslam Mon, 31 May 1999 19:15:54 +0100 + +gnome-core (1.0.5-2) unstable; urgency=low + + * debian/gnome-terminal.menu: changed section to XShells (Bug#37635) + * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call + (Bug#37632) + * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928) + from Decklin Foster + * Call dh_strip when making libpanel-applet-dev (Closes Bug#31244) + * Removed /usr/share/gnome/apps/Debian symlink, (closes #38100) + * Sanified build system a la gnome-libs + * debian/control: made gnome-help, gnome-help-data and gnome-panel-data + packages. + + -- Steve Haslam Sun, 23 May 1999 14:35:44 +0100 + +gnome-core (1.0.5-1) unstable; urgency=low + + * New maintainer. + + -- Steve Haslam Tue, 11 May 1999 01:01:12 +0100 + +gnome-core (1.0.5-0.2) unstable; urgency=low + + * gnome-panel.files.in: added asclock themes, libgkb_applet.a + * gnome-core.files.in: added gnome-wm, gnome-edit + * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm + * gsm/Makefile.am: put default.session, default.wm in /etc/gnome + * debian/gnome-session.conffiles.in: added above two files + * debian/gnome-session.files.in: updated this too + + -- Steve Haslam Sun, 18 Apr 1999 16:47:23 +0100 + +gnome-core (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Thu, 15 Apr 1999 23:22:23 +0100 + +gnome-core (1.0.1-0.3) unstable; urgency=low + + * Weehay! More broken dependencies. This one libghttp -1.1, + a bogus package that only ever existed on my machine. + + -- Jules Bean Mon, 8 Mar 1999 08:24:00 +0000 + +gnome-core (1.0.1-0.2) unstable; urgency=low + + * Another NMU, this time to fix bogus dependencies on libgtop0 + and libglib1.1 + + -- Jules Bean Sun, 7 Mar 1999 14:21:12 +0000 + +gnome-core (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + * Hacked to patch SIGPIPE bug + * Don't delete GIFs in rules + + -- Jules Bean Fri, 5 Mar 1999 18:36:29 +0100 + +gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Fri, 26 Feb 1999 23:18:10 -0800 + +gnome-core (0.99.3.2-4) unstable; urgency=low + + * Recompiled yet again - dual dependency on libglib. + Fixes: BUG#32510 + + -- Jim Pick Thu, 28 Jan 1999 00:00:22 -0800 + +gnome-core (0.99.3.2-3) unstable; urgency=low + + * Recompiled again to due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:10:07 -0800 + +gnome-core (0.99.3.2-2) unstable; urgency=low + + * Recompiled with libgnome 0.99.4. + + -- Jim Pick Fri, 22 Jan 1999 16:44:45 -0800 + +gnome-core (0.99.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Wed, 20 Jan 1999 11:42:46 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 --- gnome-panel-2.20.0.1.orig/debian/control +++ gnome-panel-2.20.0.1/debian/control @@ -0,0 +1,123 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: Debian GNOME Maintainers +Standards-Version: 3.7.2 +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + intltool (>= 0.35.0), + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + scrollkeeper (>= 0.3.14-9.1), + libxmu-dev, + libxres-dev, + gnome-doc-utils, + libxau-dev, + libglib2.0-dev (>= 2.13.0), + libgtk2.0-dev (>= 2.11.3), + libgnomeui-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.11.1), + libglade2-dev (>= 1:2.5.0), + libgnome2-dev (>= 2.13.0), + libbonoboui2-dev (>= 2.1.1), + liborbit2-dev (>= 1:2.12.1-1), + libgnomevfs2-dev (>= 2.14.2), + libwnck-dev (>= 2.19.5), + libgconf2-dev (>= 2.6.1), + libecal1.2-dev (>= 1.6.0) [!hurd-i386], + libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], + libcairo2-dev (>= 1.0.0), + libdbus-glib-1-dev (>= 0.60), + gtk-doc-tools, + libgnome-menu-dev (>= 2.16.1-1), + libpango1.0-dev (>= 1.15.4), + libedataserver1.2-dev (>= 1.2.0), + liblpint-bonobo-dev, + liblaunchpad-integration-dev, + sharutils + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel-data (>= ${gnome:Version}), + gnome-panel-data (<< ${gnome:NextVersion}), + gnome-desktop-data (>= 2.10.0-1), + gnome-control-center (>= 1:2.8.2-3), + gnome-menus (>= 2.11.1-1), + gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), + gnome-session, + evolution-data-server, + menu-xdg (>= 0.2), + alacarte +Suggests: yelp, + fortunes-mod, + gnome2-user-guide, + gnome-terminal | x-terminal-emulator, + gnome-system-tools, + nautilus +Description: launcher and docking facility for GNOME 2 + This package contains toolbar-like “panels” which can be attached to + the sides of your X desktop, or left “floating”. It is designed to be + used in conjunction with the Gnome Desktop Environment. Many features + are provided for use with the panels – including an application menu, + clock, mail checker, network monitor, quick launch icons and the like. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: gnome-panel-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + gnome-panel (= ${binary:Version}), + libpanel-applet2-0 (= ${binary:Version}) +Description: GNOME panel and library for panel applets - debugging symbols + This package contains debugging symbols for gnome-panel and the + libpanel-applet library. It is provided to help debugging problem in + the panel itself or in the library. The debugging symbols are installed + in /usr/lib/debug and will automatically be used by gdb. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpanel-applet2-0 (= ${binary:Version}), + liborbit2-dev (>= 1:2.12.4-1), + libglib2.0-dev (>= 2.13.0), + libgtk2.0-dev (>= 2.11.3), + libgnomeui-dev (>= 2.5.4), + libglade2-dev (>= 1:2.5.0), + libbonoboui2-dev (>= 2.1.1) +Description: library for GNOME 2 panel applets - development files + This packages provides the include files and static library for the GNOME 2 + panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME 2 panel applets - documentation files + This packages provides the documentation files for the GNOME 2 panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: ${misc:Depends}, + scrollkeeper, + gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for GNOME 2 panel + This package includes some files that are needed by the GNOME 2 panel + (Pixmaps, .desktop files and internationalization files). --- gnome-panel-2.20.0.1.orig/debian/control.in +++ gnome-panel-2.20.0.1/debian/control.in @@ -0,0 +1,123 @@ +Source: gnome-panel +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.7.2 +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + intltool (>= 0.35.0), + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + scrollkeeper (>= 0.3.14-9.1), + libxmu-dev, + libxres-dev, + gnome-doc-utils, + libxau-dev, + libglib2.0-dev (>= 2.13.0), + libgtk2.0-dev (>= 2.11.3), + libgnomeui-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.11.1), + libglade2-dev (>= 1:2.5.0), + libgnome2-dev (>= 2.13.0), + libbonoboui2-dev (>= 2.1.1), + liborbit2-dev (>= 1:2.12.1-1), + libgnomevfs2-dev (>= 2.14.2), + libwnck-dev (>= 2.19.5), + libgconf2-dev (>= 2.6.1), + libecal1.2-dev (>= 1.6.0) [!hurd-i386], + libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386], + libcairo2-dev (>= 1.0.0), + libdbus-glib-1-dev (>= 0.60), + gtk-doc-tools, + libgnome-menu-dev (>= 2.16.1-1), + libpango1.0-dev (>= 1.15.4), + libedataserver1.2-dev (>= 1.2.0), + liblpint-bonobo-dev, + liblaunchpad-integration-dev, + sharutils + +Package: gnome-panel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel-data (>= ${gnome:Version}), + gnome-panel-data (<< ${gnome:NextVersion}), + gnome-desktop-data (>= 2.10.0-1), + gnome-control-center (>= 1:2.8.2-3), + gnome-menus (>= 2.11.1-1), + gnome-about (>= 2.10.0-1) +Recommends: gnome-applets (>= 2.12.1-1), + gnome-session, + evolution-data-server, + menu-xdg (>= 0.2), + alacarte +Suggests: yelp, + fortunes-mod, + gnome2-user-guide, + gnome-terminal | x-terminal-emulator, + gnome-system-tools, + nautilus +Description: launcher and docking facility for GNOME 2 + This package contains toolbar-like “panels” which can be attached to + the sides of your X desktop, or left “floating”. It is designed to be + used in conjunction with the Gnome Desktop Environment. Many features + are provided for use with the panels – including an application menu, + clock, mail checker, network monitor, quick launch icons and the like. + +Package: libpanel-applet2-0 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: library for GNOME 2 panel applets + This library is used by GNOME 2 panel applets. + +Package: gnome-panel-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, + gnome-panel (= ${binary:Version}), + libpanel-applet2-0 (= ${binary:Version}) +Description: GNOME panel and library for panel applets - debugging symbols + This package contains debugging symbols for gnome-panel and the + libpanel-applet library. It is provided to help debugging problem in + the panel itself or in the library. The debugging symbols are installed + in /usr/lib/debug and will automatically be used by gdb. + +Package: libpanel-applet2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpanel-applet2-0 (= ${binary:Version}), + liborbit2-dev (>= 1:2.12.4-1), + libglib2.0-dev (>= 2.13.0), + libgtk2.0-dev (>= 2.11.3), + libgnomeui-dev (>= 2.5.4), + libglade2-dev (>= 1:2.5.0), + libbonoboui2-dev (>= 2.1.1) +Description: library for GNOME 2 panel applets - development files + This packages provides the include files and static library for the GNOME 2 + panel applet library functions. + +Package: libpanel-applet2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: doc-base +Description: library for GNOME 2 panel applets - documentation files + This packages provides the documentation files for the GNOME 2 panel applet + library functions. + +Package: gnome-panel-data +Section: gnome +Architecture: all +Depends: ${misc:Depends}, + scrollkeeper, + gconf2 (>= 2.14.0-2) +Recommends: gnome-panel +Description: common files for GNOME 2 panel + This package includes some files that are needed by the GNOME 2 panel + (Pixmaps, .desktop files and internationalization files). --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-doc.links +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-doc.links @@ -0,0 +1 @@ +usr/share/doc/libpanel-applet2-doc/html/ usr/share/gtk-doc/html/panel-applet --- gnome-panel-2.20.0.1.orig/debian/gnome-panel-data.install +++ gnome-panel-2.20.0.1/debian/gnome-panel-data.install @@ -0,0 +1,10 @@ +debian/tmp/etc/gconf/ usr/share/ +debian/tmp/usr/lib/bonobo/ usr/lib/ +debian/tmp/usr/share/gnome-panelrc usr/share/gnome/ +debian/tmp/usr/share/gnome-panel +debian/tmp/usr/share/gnome +debian/tmp/usr/share/applications +debian/tmp/usr/share/gnome-2.0/ debian/tmp/usr/share/locale/ debian/tmp/usr/share/omf/ debian/tmp/usr/share/icons/ debian/tmp/usr/share/gnome-panel usr/share/ +debian/applications.template etc/gnome-vfs-2.0/vfolders/ +debian/gnome-vfolder-user etc/menu-methods/ +debian/ubuntu-about.desktop usr/share/applications/ --- gnome-panel-2.20.0.1.orig/debian/panel-test-applets.1 +++ gnome-panel-2.20.0.1/debian/panel-test-applets.1 @@ -0,0 +1,21 @@ +.TH "panel-test-applets" "1" +.SH "NAME" +panel-test-applets \(em display installed applets +.SH "SYNOPSIS" +.PP +\fBpanel-test-applets\fR [\fB\-\-help \fP] +.SH "DESCRIPTION" +.PP +\fBpanel-test-applets\fR display installed applets in a +dialog box and does nothing else. +.SH "OPTIONS" +.IP "\fB\-\-help\fP" 10 +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat marillat@debian.org for +the \fBDebian GNU/Linux\fP system (but may be used by others). +.\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24 --- gnome-panel-2.20.0.1.orig/debian/gnome-panel-data.menu-method.experimental +++ gnome-panel-2.20.0.1/debian/gnome-panel-data.menu-method.experimental @@ -0,0 +1,71 @@ +#!/usr/bin/install-menu +compat="menu-1" + +!include menu.h + +function findicon($filename)= \ + ifelsefile($filename, $filename, \ + iffile("/usr/X11R6/include/X11/pixmaps/" $filename, \ + "/usr/X11R6/include/X11/pixmaps/" $filename)) + +function AppEntry($var)= \ + "[Desktop Entry]\n" \ + "Encoding=UTF-8\n" \ + "Name=" title() "\n" \ + "Comment=" ifelse($longtitle,$longtitle,"") "\n" \ + "Exec=" $command "\n" \ + $var \ + ifnempty($icon,"Icon=" findicon($icon) "\n") \ + "Type=Application\n" \ + "Categories=Application" replacewith($basesection, "/", ";") ";\n" + +# To add a default icon if no icon are provided (ugly) +# ifelse($icon,"Icon="findicon($icon) "\n","Icon=gnome-debian.png\n") \ + +#function SubmenuEntry()= \ +# "[Desktop Entry]\n" \ +# "Name=" $title "\n" \ +# "Icon=gnome-fs-directory\n" \ +# "Type=Directory\n" + +supported + x11= AppEntry("Terminal=false\n") + text= AppEntry("Terminal=true\n") +endsupported + +#genmenu=ifeqelse(parent($title),"",parent($section),parent(parent($section))) "/" replacewith($title,"/","_") ifeqelse($needs, "", "/.directory", ".desktop") "" + +#genmenu=ifeqelse(parent($title),"",parent($section),\ +#parent(parent($section))) "/" replacewith($title,"/","_")\ +#ifeqelse($needs, "", +# "/.directory", +# ".desktop") "" + +#genmenu=ifelse($needs, "Debian_"$title".desktop", "") + +genmenu=ifelse($needs, $title".desktop", "") + +startmenu="" +endmenu="" + +rootsection="" + +rootprefix="/var/lib/gnome/Debian/" + +#rootprefix="/usr/share/applications/" + +userprefix=".gnome/apps" + +treewalk="M" + +#submenutitle="SUBMENUTITLE section=[" $section "] title=[" $title "]" + +#submenutitle=SubmenuEntry() + +prerun="rm -f " prefix() "/*" + +#prerun="rm -f " prefix() "/Debian_*" + +preoutput="" + +outputencoding="UTF-8" --- gnome-panel-2.20.0.1.orig/debian/gnome-vfolder-user +++ gnome-panel-2.20.0.1/debian/gnome-vfolder-user @@ -0,0 +1,43 @@ +#!/usr/bin/install-menu +# gnome-vfolder based on: +# Also used as /etc/menu-methods/menu-xdg +# Copyright 2004 - Chris Cheney +# Licensed under the GNU General Public License, version 2. + +!include menu.h + +compat="menu-2" +outputencoding="UTF-8"; +outputlanguage="C"; + +function DirEntry() = + " " translate("",title()) "\n" + " " "debian" replacewith(tolower($section),"/","-") ".directory" "\n"; + +function desktop() = prefix() "/../../.local/share/applications/menu-xdg/X-Debian" replacewith($basesection,"/","-") "-" tolower(replacewith($title,"/ ","__") ".desktop"); + +supported; + x11 = "" desktop() "\n"; + text = "" desktop() "\n"; +endsupported; + +startmenu = " \n" DirEntry(); +endmenu = " \n"; +submenutitle = ""; + +treewalk = "(M)"; + +genmenu = "applications.debmenu"; +rcfile = "applications.vfolder-info"; +examplercfile="applications.template"; +mainmenutitle="Debian-user"; + +rootsection = ""; + +onlyrunasuser=true; +userprefix = ".gnome2/vfolders"; +rootprefix = "/etc/gnome-vfs-2.0/vfolders"; + +preoutput = ""; +postoutput = ""; + --- gnome-panel-2.20.0.1.orig/debian/README.Debian +++ gnome-panel-2.20.0.1/debian/README.Debian @@ -0,0 +1,18 @@ +gnome-panel for Debian +---------------------- + + +--- vfolder user menu --- +(Thanks to Bill Allombert) + +If you want to get a customisable copy of the Debian menu, +you just need to to the following : + 1) apt-get install menu-xdg + 2) chmod +x /etc/menu-methods/gnome-vfolder-user + 3) put your custom menu file in ~/.menu/ + 4) run update-menus as user (and rerun it each time you + make modifications to your menu files) + + + -- Marc Dequènes (Duck) Fri, 11 Mar 2005 02:59:43 +0100 + --- gnome-panel-2.20.0.1.orig/debian/gnome-desktop-item-edit.1 +++ gnome-panel-2.20.0.1/debian/gnome-desktop-item-edit.1 @@ -0,0 +1,22 @@ +.TH "gnome-desktop-item-edit" "1" +.SH "NAME" +gnome-desktop-item-edit \(em tool to edit .desktop file +.SH "SYNOPSIS" +.PP +\fBgnome-desktop-item-edit\fR [\fB\-\-create-new \fP] [\fB\-\-help \fP] +.SH "DESCRIPTION" +.PP +\fBgnome-desktop-item-edit\fR allows you to edit .desktop file. +.SH "OPTIONS" +.IP "\fB\-\-create-new\fP" 10 +Create new file in the given directory. +.IP "\fB\-\-help\fP" 10 +Display help +.SH "SEE ALSO" +.PP +gnome-options(7) +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat marillat@debian.org for +the \fBDebian GNU/Linux\fP system (but may be used by others). +.\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24 --- gnome-panel-2.20.0.1.orig/debian/compat +++ gnome-panel-2.20.0.1/debian/compat @@ -0,0 +1 @@ +5 --- gnome-panel-2.20.0.1.orig/debian/gnome-panel-data.postinst +++ gnome-panel-2.20.0.1/debian/gnome-panel-data.postinst @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +self="$(basename "$0")" + +action="$1" + +#DEBHELPER# + +case "$action" in + configure) + version="$2" + + if [ -n "$version" ] \ + && dpkg --compare-versions "$version" lt "2.16.2-0ubuntu1"; then + config_source=$(gconftool-2 --get-default-source) + tmp_dir=$(mktemp -t -d gconf.XXXXXXXXXX) + HOME="$tmp_dir" gconftool-2 --direct \ + --config-source="$config_source" \ + --recursive-unset \ + /apps/panel/default_setup \ + >/dev/null + kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true + rm -rf "$tmp_dir" + fi + update-gconf-defaults + ;; + abort-upgrade|abort-remove|abort-remove|abort-deconfigure) + ;; + *) + echo "$self: W: unknown action \`$action'" >&2 + ;; +esac --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-0.install +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/ --- gnome-panel-2.20.0.1.orig/debian/gnome-panel.install +++ gnome-panel-2.20.0.1/debian/gnome-panel.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin +debian/tmp/usr/lib/gnome-panel/*.so --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-dev.install +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/ usr/ +debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/libpanel-applet-2.{a,la,so} usr/lib/ +debian/tmp/usr/share/idl/ usr/share/ --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-doc.install +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-doc.install @@ -0,0 +1 @@ +doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/ --- gnome-panel-2.20.0.1.orig/debian/ubuntu-about.desktop.in +++ gnome-panel-2.20.0.1/debian/ubuntu-about.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=About Ubuntu +_Comment=Learn more about Ubuntu +Exec=yelp ghelp:about-ubuntu +Icon=distributor-logo +Terminal=false +Type=Application +Categories=GNOME;Application;Core; +StartupNotify=true --- gnome-panel-2.20.0.1.orig/debian/ubuntu-about.desktop +++ gnome-panel-2.20.0.1/debian/ubuntu-about.desktop @@ -0,0 +1,50 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=About Ubuntu +Name[ca]=Quant a Ubuntu +Name[da]=Om Ubuntu +Name[de]=Über Ubuntu +Name[el]=Περί Ubuntu +Name[es]=Acerca de Ubuntu +Name[fa]=درباره Ubuntu +Name[fi]=Tietoja Ubuntusta +Name[fr]=À propos d'Ubuntu +Name[he]=אודות אובונטו +Name[hu]=Az Ubuntu névjegye +Name[is]=Um Ubuntu +Name[it]=Informazioni su Ubuntu +Name[nl]=Over Ubuntu +Name[pt]=Sobre o Ubuntu +Name[pt_BR]=Sobre o Ubuntu +Name[ro]=Despre Ubuntu +Name[sk]=O Ubuntu +Name[sv]=Om Ubuntu +Name[xh]=Malunga ne-Ubuntu +Name[zh_CN]=关于 Ubuntu +Comment=Learn more about Ubuntu +Comment[ca]=Conegueu més sobre Ubuntu +Comment[da]=Lær mere om Ubuntu +Comment[de]=Mehr über Ubuntu erfahren +Comment[el]=Μάθετε περισσότερα για το Ubuntu +Comment[es]=Sepa más acerca de ubuntu +Comment[fa]=راجع به Ubuntu بیشتر بدانید +Comment[fi]=Näytä tietoja Ubuntu-järjestelmästä +Comment[fr]=En savoir plus à propos d'Ubuntu +Comment[he]=קרא דואר באמצעות אבולושיין +Comment[hu]=Tudjon meg többet az Ubunturól +Comment[is]=Lærðu meira um Ubuntu +Comment[it]=Sapere di più circa Ubuntu +Comment[nl]=Kom meer te weten over Ubunt +Comment[pt]=Aprenda mais sobre o Ubuntu +Comment[pt_BR]=Aprenda mais sobre o Ubuntu +Comment[ro]=Aflaţi mai multe despre Ubuntu +Comment[sk]=Dozvedieť sa viac o Ubuntu +Comment[sv]=Lär dig mer om Ubuntu +Comment[xh]=Funda ngaphezulu nge-Ubuntu +Comment[zh_CN]=更多有关 Ubuntu 的信息 +Exec=yelp ghelp:about-ubuntu +Icon=distributor-logo +Terminal=false +Type=Application +Categories=GNOME;Application;Core; +StartupNotify=true --- gnome-panel-2.20.0.1.orig/debian/applications.template +++ gnome-panel-2.20.0.1/debian/applications.template @@ -0,0 +1,9 @@ + + + + Root + applications-all-users:/// + +include-menu-defs + + --- gnome-panel-2.20.0.1.orig/debian/gnome-panel-data.postrm +++ gnome-panel-2.20.0.1/debian/gnome-panel-data.postrm @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +self="$(basename "$0")" + +action="$1" + +case "$action" in + remove) + [ -x /usr/sbin/update-gconf-defaults ] && update-gconf-defaults + ;; + purge) + # FIXME I am probably a very old cleanup snippet, check whether you can + # remove me! + rm -rf /var/lib/gnome + ;; + upgrade|failed-upgrade|abort-install|abort-install|abort-upgrade|disappear) + ;; + *) + echo "$self: W: unknown action \`$action'" >&2 + ;; +esac + +#DEBHELPER# --- gnome-panel-2.20.0.1.orig/debian/gnome-panel.manpages +++ gnome-panel-2.20.0.1/debian/gnome-panel.manpages @@ -0,0 +1,2 @@ +man/*.1 +debian/*.1 --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-doc.doc-base +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-doc.doc-base @@ -0,0 +1,11 @@ +Document: libpanel-applet2-doc +Title: Panel Applet Writer's Reference Manual +Author: Mark McLoughlin +Abstract: This manual documents the interfaces of the panel applet writing + library for GNOME 2.x and a short guide to porting applets from the GNOME + 1.x interfaces. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libpanel-applet2-doc/html/index.html +Files: /usr/share/doc/libpanel-applet2-doc/html/*.html --- gnome-panel-2.20.0.1.orig/debian/gnome-desktop-item-edit.sgml +++ gnome-panel-2.20.0.1/debian/gnome-desktop-item-edit.sgml @@ -0,0 +1,107 @@ +Christian"> + Marillat"> + december 7, 2003"> + 1"> + marillat@debian.org"> + + gnome-desktop-item-edit"> + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + tool to edit .desktop file + + + + &dhpackage; + + + + + + + + DESCRIPTION + + &dhpackage; allows you to edit .desktop file. + + + + + OPTIONS + + + + + + + Create new file in the given directory. + + + + + + + Display help + + + + + + + SEE ALSO + + gnome-options(7) + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + + --- gnome-panel-2.20.0.1.orig/debian/libpanel-applet2-dbg.install +++ gnome-panel-2.20.0.1/debian/libpanel-applet2-dbg.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/debug/ --- gnome-panel-2.20.0.1.orig/debian/watch +++ gnome-panel-2.20.0.1/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/([\d\.]+)[02468]/gnome-panel-(.*)\.tar\.gz \ + debian uupdate --- gnome-panel-2.20.0.1.orig/debian/rules +++ gnome-panel-2.20.0.1/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --with-in-process-applets=all --with-clock-time-utility="gksu time-admin" +ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds +endif + +# debug lib +DEB_DH_STRIP_ARGS += --dbg-package=gnome-panel-dbg + +DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 += -V"libpanel-applet2-0 (>= 2.19.3)" + +binary-install/gnome-panel:: + chmod a+x debian/gnome-panel/usr/lib/gnome-panel/* + cd po; intltool-update -p --verbose + +binary-install/gnome-panel-data:: + chmod a+x debian/gnome-panel-data/etc/menu-methods/gnome-panel-data + find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \; + cd debian/gnome-panel-data/usr/share/gconf && \ + mkdir defaults && \ + mv schemas/panel-default-setup.entries \ + defaults/05_panel-default-setup.entries + uudecode debian/application-default-icon.png.uue -o debian/application-default-icon.png + mkdir -p debian/gnome-panel-data/usr/share/icons + cp debian/application-default-icon.png debian/gnome-panel-data/usr/share/icons/ + +binary-install/libpanel-applet2-doc:: + find debian/libpanel-applet2-doc/usr/share/doc/libpanel-applet2-doc/ -name ".arch-ids" -depth -exec rm -rf {} \; + +clean:: + -rm -f debian/application-default-icon.png --- gnome-panel-2.20.0.1.orig/debian/application-default-icon.png.uue +++ gnome-panel-2.20.0.1/debian/application-default-icon.png.uue @@ -0,0 +1,17 @@ +begin 644 application-default-icon.png +MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`^`#U +M`/)ANX+H````"7!(67,```L3```+$P$`FIP8````!W1)344'U0,7#B4`YB3/ +M)P```@!)1$%42,?ME;UNU%`0A;\9>Z,D)!)%1$,7*BAYD!1(O!*T=$B\`$*( +MAL<)-%0@(44BFV03^\X<"J^]3EAO$`JB823[_LCWG/&9<^^%__&OPP#V]_=U +MU\#S^?P!<%+W$^\^?.33EZ\LFH*Y81@IH4PR"Q%)1*`,,A.IRZEO`91)"VBZPX;P)W!P,E2$:D$T5D&)*1:4@@6+ZZR#3:UOKA(V!K +M(+BX;+AJ6IK28.88AB2D)#/)*$0&DLA,D)8$PCJER4PB$X"JJJJ(\('@Z9-# +M#A\>T$8`X&;#0HQ5'S`S1D,,!R"R,#\]Y>WKE\QF,T6$!H*]W6UJ[[(PLQ40 +M=)*-P4?MN!\1;-=VK3;U+[8:`8R!-X&/Y_M^*<4!KB'T@'\"?C,BP@"K[RKS +M-6L-4'T3:)W>4^#K"$;?:6T--H%/@4ZLER3Y;;\\]6S(O-\'#M2^R453#OF= +MNE15E8!\2IY-;KE-GE$-5D4^.SNC;5LD;=3YMHVV6"S&+JH&@N/C8THIPPZ< +M\OBZ^7Z`':!(*DMP7Q:N[?4U +JLRU@V\SJ[F@79G8N:2[I.W#RU^_DGR$L`JH&B.Y>`````$E%3D2N0F"" +` +end --- gnome-panel-2.20.0.1.orig/debian/copyright +++ gnome-panel-2.20.0.1/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar +1998 20:12:23 -0800. Taken over by Raphael Hertzog + on Wed, 22 Sep 1999 13:24:34 +0200, and taken +over again by James LewisMoss on October 26, 1999. +and again by Marc Dequènes (Duck) on 2003-03-26. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/ + +Upstream Authors and Copyright holders: + Too many to list here, but the full list is in: + /usr/share/doc/gnome-panel/AUTHORS + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gnome-panel-2.20.0.1.orig/debian/gnome-panel-data.menu-method +++ gnome-panel-2.20.0.1/debian/gnome-panel-data.menu-method @@ -0,0 +1,52 @@ +#!/usr/bin/install-menu +compat="menu-1" + +!include menu.h + +function findicon($filename)= \ + ifelsefile($filename, $filename, \ + iffile("/usr/X11R6/include/X11/pixmaps/" $filename, \ + "/usr/X11R6/include/X11/pixmaps/" $filename)) + +function AppEntry($var)= \ + "[Desktop Entry]\n" \ + "Encoding=UTF-8\n" \ + "Name=" title() "\n" \ + "Comment=" ifelse($longtitle,$longtitle,"") "\n" \ + "Exec=" $command "\n" \ + $var \ + ifnempty($icon,"Icon=" findicon($icon) "\n") \ + "Type=Application\n" + +# To add a default icon if no icon are provided (ugly) +# ifelse($icon,"Icon="findicon($icon) "\n","Icon=gnome-debian.png\n") \ + +function SubmenuEntry()= \ + "[Desktop Entry]\n" \ + "Name=" $title "\n" \ + "Icon=gnome-fs-directory\n" \ + "Type=Directory\n" + +supported + x11= AppEntry("Terminal=false\n") + text= AppEntry("Terminal=true\n") +endsupported + +genmenu=ifeqelse(parent($title),"",parent($section),parent(parent($section))) "/" replacewith($title,"/","_") ifeqelse($needs, "", "/.directory", ".desktop") "" +startmenu="" +endmenu="" + +rootsection="" + +rootprefix="/var/lib/gnome/Debian/" +userprefix=".gnome/apps" + +treewalk="M" +submenutitle=SubmenuEntry() + +prerun="rm -rf " prefix() "/*" + +preoutput="" + +outputencoding="UTF-8" + --- gnome-panel-2.20.0.1.orig/debian/panel-test-applets.sgml +++ gnome-panel-2.20.0.1/debian/panel-test-applets.sgml @@ -0,0 +1,99 @@ +Christian"> + Marillat"> + december 7, 2003"> + 1"> + marillat@debian.org"> + + panel-test-applets"> + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2001 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + display installed applets + + + + &dhpackage; + + + + + + + DESCRIPTION + + &dhpackage; display installed applets in a + dialog box and does nothing else. + + + + + OPTIONS + + + + + + Display help + + + + + + + SEE ALSO + + gnome-options(7) + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + +