diff -Nru libxfcegui4-4.8.1/aclocal.m4 libxfcegui4-4.10.0/aclocal.m4 --- libxfcegui4-4.8.1/aclocal.m4 2011-02-10 09:33:42.000000000 +0000 +++ libxfcegui4-4.10.0/aclocal.m4 2012-04-28 20:10:45.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -13,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -260,6 +261,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -460,6 +465,7 @@ dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -487,6 +493,11 @@ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) @@ -516,7 +527,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -529,13 +540,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] 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.]) @@ -548,25 +557,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) 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 $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -612,7 +644,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -711,8 +743,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -721,8 +753,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -856,6 +888,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1341,7 +1375,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1505,6 +1539,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1526,6 +1561,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1556,6 +1614,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1658,7 +1720,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1666,6 +1734,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1677,6 +1746,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1694,7 +1764,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1739,8 +1811,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1751,6 +1823,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -2034,14 +2108,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2118,13 +2205,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2304,6 +2391,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -2343,7 +2435,7 @@ # 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. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2889,7 +2981,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2898,7 +2990,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2963,7 +3055,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -3102,7 +3194,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3110,10 +3202,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -3121,7 +3209,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3139,7 +3227,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3159,17 +3247,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3230,7 +3319,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3246,7 +3335,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3283,9 +3372,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3348,7 +3437,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3417,7 +3506,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3442,7 +3531,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3466,7 +3555,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3497,7 +3586,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3507,7 +3596,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3929,7 +4018,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4349,6 +4438,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4933,7 +5023,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -5025,18 +5117,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5196,7 +5303,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -5221,7 +5330,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5472,8 +5580,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5768,6 +5875,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_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' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5814,10 +5922,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_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 @@ -5830,7 +5934,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5869,7 +5973,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -6311,9 +6414,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -6467,7 +6567,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6837,7 +6936,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7598,12 +7697,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7800,7 +7905,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7933,7 +8037,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -8116,6 +8219,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8185,6 +8355,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -8849,9 +9026,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -9023,15 +9215,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -9196,7 +9388,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9242,7 +9435,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9290,9 +9484,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -9316,7 +9510,7 @@ _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -9326,12 +9520,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -9341,7 +9538,7 @@ [am__api_version='1.11' 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.11.1], [], +m4_if([$1], [1.11.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9357,19 +9554,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 1 + # 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/../..'. @@ -9451,14 +9650,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 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 10 +# serial 12 # 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, @@ -9498,6 +9697,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -9562,7 +9762,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -9627,10 +9827,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -9864,12 +10067,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 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 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -9909,8 +10115,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9930,7 +10136,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -10041,12 +10247,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -10069,13 +10278,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -10083,13 +10293,13 @@ [[_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) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -10165,13 +10375,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 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 1 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -10186,18 +10396,50 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -10220,13 +10462,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 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 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -10235,13 +10477,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10263,10 +10505,11 @@ # 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]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -10342,19 +10585,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -10380,11 +10623,23 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) + m4_ifdef([PKG_PROG_PKG_CONFIG], + [ + PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION]) - if test x"$PKG_CONFIG" = x"no"; then + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + ], + [ + echo echo "*** The pkg-config utility could not be found on your system." echo "*** Make sure it is in your path, or set the PKG_CONFIG" echo "*** environment variable to the full path to pkg-config." @@ -10394,25 +10649,7 @@ echo "*** http://www.freedesktop.org/software/pkgconfig" echo "***" exit 1 - fi - - # check pkg-config version - AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION]) - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION]) - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi - fi + ]) ]) @@ -10545,30 +10782,6 @@ -dnl BM_DEPEND(varname, package, version) -dnl -dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept -dnl for backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND], -[ - XDT_CHECK_PACKAGE([$1], [$2], [$3]) -]) - - - -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) -dnl -dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND_CHECK], -[ - XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6]) -]) - - - dnl XDT_CHECK_LIBX11() dnl dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS @@ -10705,66 +10918,6 @@ ]) - -dnl BM_LIBX11() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) -]) - - - -dnl BM_LIBX11_REQUIRE() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) -]) - - - -dnl BM_LIBSM() -dnl -dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBSM], -[ - AC_REQUIRE([XDT_CHECK_LIBSM]) -]) - - - -dnl BM_LIBXPM -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM]) -]) - - - -dnl BM_LIBXPM_REQUIRE -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for -dnl backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE]) -]) - - dnl $Id$ dnl dnl Copyright (c) 2002-2006 @@ -10772,19 +10925,19 @@ dnl dnl Written for Xfce by Benedikt Meurer . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-depends dnl ----------- @@ -10841,17 +10994,25 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" - + + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + dnl # signal.h inline is crapy on openbsd + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi + if test x"$enable_debug" = x"full"; then AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" AC_MSG_RESULT([full]) else @@ -10878,7 +11039,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" AC_MSG_RESULT([no]) else AC_MSG_RESULT([minimum]) @@ -10931,7 +11092,11 @@ if test "x$have_gnuc_visibility" = "xyes"; then CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY" - XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + xdt_vis_hidden_cflags="" + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden]) + if test "x$xdt_vis_hidden_cflags" = "x"; then + XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden]) + fi CFLAGS="$CFLAGS $xdt_vis_hidden_cflags" fi @@ -10950,16 +11115,18 @@ [enable_linker_opts=$enableval], [enable_linker_opts=yes]) if test "x$enable_linker_opts" != "xno"; then - AC_MSG_CHECKING([whether $LD accepts --as-needed]) - case `$LD --as-needed -v 2>&1 &1 &1 &1 . dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU General Public License as published by the Free -dnl Software Foundation; either version 2 of the License, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -dnl more details. -dnl -dnl You should have received a copy of the GNU General Public License along with -dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple -dnl Place, Suite 330, Boston, MA 02111-1307 USA +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License along +dnl with this program; if not, write to the Free Software Foundation, Inc., +dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. dnl dnl xdt-i18n dnl -------- @@ -11129,16 +11218,3 @@ ]) - -dnl BM_I18N(PACKAGE, LINGUAS) -dnl -dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for -dnl backward compatibility. Will be removed in the -dnl future. -dnl -AC_DEFUN([BM_I18N], -[ - XDT_I18N([$2], [$1]) -]) - - diff -Nru libxfcegui4-4.8.1/ChangeLog libxfcegui4-4.10.0/ChangeLog --- libxfcegui4-4.8.1/ChangeLog 2011-02-10 09:34:14.000000000 +0000 +++ libxfcegui4-4.10.0/ChangeLog 2012-04-28 20:10:52.000000000 +0000 @@ -1,9 +1,495 @@ -commit 6f05239f7f95cb89217f9a5f3751757900db946f +commit 83e7bc639ffae88faea51bd5ee0567fc23364dc6 Author: Nick Schermer -Date: Thu Feb 10 10:33:17 2011 +0100 +Date: Sat Apr 28 22:10:41 2012 +0200 Updates for release. +commit f47cd2ee52bf91cf12bf901c869ad0b0d717d87e +Author: Chipong Luo +Date: Fri Apr 20 14:52:15 2012 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 37af67a03f37a25dffda7fd61e603d9299edaa13 +Author: Pjotr Anon +Date: Tue Apr 17 12:22:26 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ccf57e168539efa5744300dd08e28afae04e2b4b +Author: Henrique P. Machado +Date: Sat Apr 14 22:39:08 2012 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ad30dd62d2e964a2ff964af385b0667c9e8dbac6 +Author: Nick Schermer +Date: Sat Apr 14 17:04:47 2012 +0200 + + Use exo-open in xfce_exec (bug #4048). + +commit 90122708fdfab88fc1811eba56154dca9a2485a5 +Author: Yves-Alexis Perez +Date: Sat Apr 14 16:54:43 2012 +0200 + + Fix link against libm (bug #8698). + +commit 01d11dd85ddff6e5826a5dc7fb02c6bdef6f30f0 +Author: Nick Schermer +Date: Fri Apr 13 23:44:58 2012 +0200 + + Post release tag bump. + +commit fb2f043e901870f7746f8d4582be2f34fcc3cf18 +Author: Nick Schermer +Date: Fri Apr 13 23:37:16 2012 +0200 + + Updates for release. + +commit 3df9d5d06edd489147786969514ed9e7173534e0 +Author: Seong-ho Cho +Date: Thu Apr 5 12:34:45 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 28396c14464c037a3f355ed9011999378a01c735 +Author: Seong-ho Cho +Date: Thu Apr 5 11:02:57 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 96d39cc30fd4adb36240b7ebb499c1a9b8084b37 +Author: Seong-ho Cho +Date: Wed Apr 4 23:48:47 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2d90bf94476b54d3d397242cf243b272f0030782 +Author: Pjotr Anon +Date: Sun Apr 1 23:34:05 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c1058837682ad0d370e0c817c6406c9538ea7208 +Author: Seong-ho Cho +Date: Sun Apr 1 11:33:05 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c7cddb0577d569a80399f92b7e256a2e6c6b0045 +Author: Mario Blättermann +Date: Thu Mar 29 12:53:48 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8ba4f86d20447c3202ecbf5492c0964ed3f98aaf +Author: Chipong Luo +Date: Sun Mar 11 05:16:31 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9d90505e548f7aaa1d66f6dc7bdeaac831e978ab +Author: Seong-ho Cho +Date: Thu Mar 8 21:56:49 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 03356511e03b9e1baafbb3d566b65af4be9c8fea +Author: Seong-ho Cho +Date: Thu Mar 1 20:08:36 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 190e2bc0b4bbbd9e73f89ae30572335f3296a7b6 +Author: Seong-ho Cho +Date: Tue Feb 28 18:18:10 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit fd60cec44af4f7062b55d132952c3597a121b923 +Author: Seong-ho Cho +Date: Sun Feb 26 14:11:10 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b651f9a9a7105fdfc3961b20d8e1630b3db679f6 +Author: Chipong Luo +Date: Wed Feb 8 10:19:03 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6046be0b12657d9762bd5373b53352c103950c22 +Author: Chipong Luo +Date: Wed Feb 8 07:34:13 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 01e03a6243e62e1101d904973699a7f793398efa +Author: Chipong Luo +Date: Tue Feb 7 02:45:08 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dc1a0ac6c0a44574e3333e28b9e14bd471d891ef +Author: Algimantas Margevičius +Date: Fri Jan 27 15:23:11 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 316ea6f56016d0246c653e420b2616ffca41f9df +Author: Sergio Marques +Date: Wed Jan 18 15:37:35 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6950f168e10c93936d6da1e6324dcb353c8464a3 +Author: Algimantas Margevičius +Date: Sun Jan 15 14:23:23 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e2eb9e198a789e72e9f2172cfd1833854daac4ea +Author: Algimantas Margevičius +Date: Sat Jan 7 14:47:24 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2688acf1f5b8c4d4c12e50962c5081fce7475488 +Author: Eivind Ødegård +Date: Sat Jan 7 01:34:18 2012 +0100 + + l10n: Added Norwegian nynorsk translation + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 21824b4d7aba95dd217a02ee05ecad91c4a903c5 +Author: Chipong Luo +Date: Thu Dec 29 14:56:34 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7ce1fbecb888fbd25343c3c49b12411f4b07bdb9 +Author: Chipong Luo +Date: Fri Dec 9 15:15:17 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4dbfb2474f96e72db3c73694c9e4a0a390b3c9d1 +Author: Sveinn í Felli +Date: Wed Dec 7 08:37:21 2011 +0100 + + l10n: Updated Icelandic (is) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9d6e6b41f8caeae103e46f8b0156b621c8b572b1 +Author: Chipong Luo +Date: Fri Dec 2 15:54:13 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b51423cb8e66f57abef55bcd5edb8c5fe43a2884 +Author: Chipong Luo +Date: Tue Nov 29 10:43:04 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f31bcfe972313f35149180a1254552b8e488bc7c +Author: Sveinn í Felli +Date: Tue Nov 29 09:40:03 2011 +0100 + + l10n: fyrsta yfirferð + + New status: 19 messages complete with 0 fuzzies and 25 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a0fae564fb987856ca4560371131cb09154ac74e +Author: Ivica Kolić +Date: Sun Oct 30 03:28:54 2011 +0100 + + l10n: Updated Croatian (hr) translation to 61% + + New status: 27 messages complete with 0 fuzzies and 17 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 94cdd9ff704a7379be626d10fea668813350f867 +Author: Allar Kiristaja +Date: Tue Oct 25 18:54:19 2011 +0200 + + l10n: Updated Estonian (et) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e436baf279dd40c0c927c4555e245bc2dc4fe450 +Author: Jarno Liimatainen +Date: Sat Oct 8 07:39:45 2011 +0200 + + l10n: Updated Finnish (fi) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b451f67e527ff7cf11d7af754a198291693b600f +Author: Ivica Kolić +Date: Mon Oct 3 00:33:52 2011 +0200 + + l10n: Updated Croatian (hr) translation to 56% + + New status: 25 messages complete with 0 fuzzies and 19 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1636a843e74fed3b5ebd1550849136e4d42ae79b +Author: Pjotr Anon +Date: Thu Sep 8 23:37:52 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9f9e99dbf84918d042cabdf70a872d571e00806e +Author: كريم أولاد الشلحة +Date: Wed Aug 24 04:37:29 2011 +0200 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 09b72bc669f13ef42244ccf2196f932a93eae100 +Author: Praveen Illa +Date: Wed Jul 13 18:29:38 2011 +0200 + + l10n: first update to Indian telugu translation + + New status: 27 messages complete with 0 fuzzies and 17 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9042e70bf7c8266aef059114d27ec1764fc41466 +Author: Nick Schermer +Date: Tue Jun 21 21:55:19 2011 +0200 + + Drop XfceDesktopEntry usage. + +commit 971f757dd5d73f493674dd9a0b0ff36d532b521f +Author: Ivica Kolić +Date: Tue Jun 21 09:29:18 2011 +0200 + + l10n: Updated Croatian (hr) translation to 54% + + New status: 24 messages complete with 0 fuzzies and 20 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7e943c1c118162da620d862fc2fc5b0fb3d7b4e5 +Author: Pjotr Anon +Date: Fri Jun 17 12:18:39 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dc5a9eec8824e35ea7a9712b4f2ef28f272884b0 +Author: Pjotr Anon +Date: Fri May 27 14:59:12 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e47f2d0f2562999288003932490d893069c8412d +Author: Ivica Kolić +Date: Sat May 21 02:49:19 2011 +0200 + + l10n: Initial Croatian (hr) translation + + New status: 20 messages complete with 0 fuzzies and 24 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 282e716d1dba6058f54fb54bec2fb3923123e2e5 +Author: Pjotr Anon +Date: Thu May 12 18:02:16 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 42e70ef5f5dd6573b217c7158939b5ef50be94fa +Author: Pjotr Anon +Date: Wed May 11 17:26:08 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cbda9da2fc08a9d9b477fd6ebed767dabdbec147 +Author: Leandro Regueiro +Date: Thu May 5 13:40:11 2011 +0200 + + l10n: Updated Galician (gl) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e214a0fb4b23186d25d5d3daeb8520d06d7e2e13 +Author: sssilver +Date: Thu Apr 21 17:35:01 2011 +0200 + + l10n: Updated Armenian (hy) translation to 100% + + New status: 44 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 64d5a074aea2e3f4d46a7c26fc5a419d20646d9f +Author: sssilver +Date: Thu Apr 21 17:26:29 2011 +0200 + + l10n: Updated Armenian (hy) translation to 84% + + New status: 37 messages complete with 0 fuzzies and 7 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 82487f33bff020075e9dba33a37b9cb77ee39a81 +Author: sssilver +Date: Thu Apr 21 17:21:22 2011 +0200 + + l10n: Updated Armenian (hy) translation to 61% + + New status: 27 messages complete with 4 fuzzies and 13 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 16ebf318d430f72eb0f2ec80b3fd505ef7f61bc4 +Author: Jérôme Guelfucci +Date: Sun Feb 27 17:21:11 2011 +0100 + + Add missing flag to linking. + commit c6f578502ca8ebce5b4b9bdc9e21bfb289a3dd30 Author: Nick Schermer Date: Thu Feb 10 10:31:06 2011 +0100 diff -Nru libxfcegui4-4.8.1/config.guess libxfcegui4-4.10.0/config.guess --- libxfcegui4-4.8.1/config.guess 2011-02-10 09:33:48.000000000 +0000 +++ libxfcegui4-4.10.0/config.guess 2012-04-28 20:10:46.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -857,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1275,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1321,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru libxfcegui4-4.8.1/config.sub libxfcegui4-4.10.0/config.sub --- libxfcegui4-4.8.1/config.sub 2011-02-10 09:33:48.000000000 +0000 +++ libxfcegui4-4.10.0/config.sub 2012-04-28 20:10:46.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -75,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -156,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -245,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +290,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +332,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,21 +361,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +405,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +452,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +522,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +567,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +782,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +897,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +985,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1082,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1212,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1312,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1352,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1401,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1450,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1495,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1519,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1534,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1564,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1595,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru libxfcegui4-4.8.1/configure libxfcegui4-4.10.0/configure --- libxfcegui4-4.8.1/configure 2011-02-10 09:33:54.000000000 +0000 +++ libxfcegui4-4.10.0/configure 2012-04-28 20:10:47.000000000 +0000 @@ -1,16 +1,14 @@ #! /bin/sh # From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libxfcegui4 4.8.1. +# Generated by GNU Autoconf 2.69 for libxfcegui4 4.10.0. # # Report bugs to . # # Copyright (c) 2002-2011 The Xfce development team. All rights reserved. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -139,6 +137,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -172,7 +195,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -225,21 +249,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -342,6 +370,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -463,6 +499,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -497,16 +537,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -518,28 +558,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - 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 -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -573,8 +593,8 @@ # Identity of this package. PACKAGE_NAME='libxfcegui4' PACKAGE_TARNAME='libxfcegui4' -PACKAGE_VERSION='4.8.1' -PACKAGE_STRING='libxfcegui4 4.8.1' +PACKAGE_VERSION='4.10.0' +PACKAGE_STRING='libxfcegui4 4.10.0' PACKAGE_BUGREPORT='xfce4-dev@xfce.org' PACKAGE_URL='' @@ -631,8 +651,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -667,6 +687,8 @@ GTK_LIBS GTK_CFLAGS GTK_VERSION +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG LIBSM_LIBS LIBSM_LDFLAGS @@ -718,6 +740,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -757,6 +785,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -776,6 +805,8 @@ LIBXFCEGUI4_VERINFO AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -880,7 +911,9 @@ XMKMF PKG_CONFIG PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR' +PKG_CONFIG_LIBDIR +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -1336,8 +1369,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1423,7 +1454,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxfcegui4 4.8.1 to adapt to many kinds of systems. +\`configure' configures libxfcegui4 4.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1528,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxfcegui4 4.8.1:";; + short | recursive ) echo "Configuration of libxfcegui4 4.10.0:";; esac cat <<\_ACEOF @@ -1538,7 +1569,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1573,6 +1604,10 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1640,10 +1675,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxfcegui4 configure 4.8.1 -generated by GNU Autoconf 2.68 +libxfcegui4 configure 4.10.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1922,7 +1957,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2057,8 +2092,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxfcegui4 $as_me 4.8.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by libxfcegui4 $as_me 4.10.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2408,7 +2443,7 @@ -LIBXFCEGUI4_VERSION=4.8.1 +LIBXFCEGUI4_VERSION=4.10.0 am__api_version='1.11' ac_aux_dir= @@ -2477,7 +2512,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_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$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. @@ -2646,7 +2681,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2686,7 +2721,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2737,7 +2772,7 @@ 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 + as_fn_executable_p "$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) '* | \ @@ -2790,7 +2825,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2906,11 +2941,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2951,6 +2986,33 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -2958,8 +3020,8 @@ LIBXFCEGUI4_VERSION_MAJOR=4 -LIBXFCEGUI4_VERSION_MINOR=8 -LIBXFCEGUI4_VERSION_MICRO=1 +LIBXFCEGUI4_VERSION_MINOR=10 +LIBXFCEGUI4_VERSION_MICRO=0 @@ -3016,6 +3078,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3048,7 +3111,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3088,7 +3151,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3141,7 +3204,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3182,7 +3245,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$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 @@ -3240,7 +3303,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3284,7 +3347,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3730,8 +3793,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3829,6 +3891,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3888,7 +3951,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4098,7 +4161,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_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$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 @@ -4164,7 +4227,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_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$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 @@ -4371,8 +4434,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -4491,7 +4554,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4531,7 +4594,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4584,7 +4647,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4625,7 +4688,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$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 @@ -4683,7 +4746,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4727,7 +4790,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4923,8 +4986,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5022,6 +5084,7 @@ # 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'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5081,7 +5144,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -5145,8 +5208,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5324,7 +5387,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5403,7 +5466,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5659,7 +5722,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5703,7 +5766,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5861,6 +5924,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -5900,7 +5968,7 @@ # 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. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6122,7 +6190,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6162,7 +6230,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6329,7 +6397,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6468,7 +6536,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6508,7 +6576,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6611,7 +6679,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6655,7 +6723,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6780,7 +6848,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6820,7 +6888,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6879,7 +6947,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6919,7 +6987,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6969,13 +7037,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -7122,6 +7190,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7510,7 +7579,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7521,7 +7590,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7554,7 +7636,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7594,7 +7676,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7674,7 +7756,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7714,7 +7796,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7766,7 +7848,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7806,7 +7888,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7858,7 +7940,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7898,7 +7980,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7950,7 +8032,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7990,7 +8072,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8042,7 +8124,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8082,7 +8164,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8161,7 +8243,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -8172,6 +8260,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -8204,6 +8293,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -8225,7 +8315,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8363,7 +8455,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8441,6 +8548,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8896,7 +9007,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8987,18 +9100,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # 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='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9360,7 +9488,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9610,8 +9737,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9990,6 +10116,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10035,6 +10162,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10063,10 +10191,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=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 @@ -10079,7 +10203,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10118,7 +10242,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10742,11 +10865,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10836,7 +10954,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10845,7 +10963,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10910,7 +11028,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -11049,7 +11167,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11057,10 +11175,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11068,7 +11182,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11086,7 +11200,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11106,17 +11220,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11177,7 +11292,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11193,7 +11308,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11230,9 +11345,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11314,7 +11429,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11383,7 +11498,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11408,7 +11523,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11432,7 +11547,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11463,7 +11578,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11473,7 +11588,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -12255,6 +12370,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -12287,14 +12404,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.31"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.31" >&5 $as_echo_n "checking for intltool >= 0.31... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -12319,7 +12434,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12359,7 +12474,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12399,7 +12514,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12425,25 +12540,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 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 $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -12560,7 +12698,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12600,7 +12738,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12640,7 +12778,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12680,7 +12818,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12731,7 +12869,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12762,7 +12900,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -12980,7 +13118,7 @@ - ALL_LINGUAS="am ar ast be bn_IN ca cs cy da de dz el en_GB eo es et eu fa fi fr gl gu he hu hy id it ja ka kk ko ku lt lv mk mr nb nl pa pl pt_BR pt ro ru si sk sq sv ta tl_PH tr ug uk ur_PK ur zh_CN zh_TW " + ALL_LINGUAS="am ar ast be bn_IN ca cs cy da de dz el en_GB eo es et eu fa fi fr gl gu he hr hu hy id is it ja ka kk ko ku lt lv mk mr nb nl nn pa pl pt_BR pt ro ru si sk sq sv ta te tl_PH tr ug uk ur_PK ur zh_CN zh_TW " for ac_header in locale.h do : @@ -13479,7 +13617,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13566,6 +13704,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -14545,10 +14687,18 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -14565,7 +14715,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14574,7 +14724,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -14588,39 +14737,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.10.0" >&5 @@ -14683,10 +14882,18 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -14703,7 +14910,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14712,7 +14919,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -14726,44 +14932,94 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 +$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 $as_echo "$LIBXFCE4UTIL_VERSION" >&6; } @@ -14835,10 +15091,18 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -14855,7 +15119,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14864,7 +15128,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -14878,39 +15141,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0 >= 0.5" >&5 @@ -15003,10 +15316,18 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -15023,7 +15344,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15032,7 +15353,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -15046,39 +15366,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libglade-2.0 >= 2.0.0" >&5 @@ -15164,10 +15534,18 @@ # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 - # lookup pkg-config utility - if test x"$PKG_CONFIG" = x""; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -15184,7 +15562,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15193,7 +15571,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -15207,39 +15584,89 @@ fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test x"$PKG_CONFIG" = x"no"; then - echo "*** The pkg-config utility could not be found on your system." - echo "*** Make sure it is in your path, or set the PKG_CONFIG" - echo "*** environment variable to the full path to pkg-config." - echo "*** You can download pkg-config from the freedesktop.org" - echo "*** software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # check pkg-config version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5 -$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - else - xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5 -$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; } - echo "*** Your version of pkg-config is too old. You need atleast" - echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config " - echo "*** from the freedesktop.org software repository at" - echo "***" - echo "*** http://www.freedesktop.org/software/pkgconfig" - echo "***" - exit 1 - fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gladeui-1.0 >= 3.0.0" >&5 @@ -15384,124 +15811,6 @@ - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -15520,7 +15829,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15562,7 +15871,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15606,7 +15915,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15659,6 +15968,99 @@ else as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_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 +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -15749,19 +16151,26 @@ -Wno-missing-field-initializers \ -Wno-unused-parameter -Wold-style-definition \ -Wdeclaration-after-statement \ - -Wmissing-declarations -Wredundant-decls \ + -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs \ - -fstack-protector" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" + fi + + if test x`uname` != x"OpenBSD"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls" + fi + if test x"$enable_debug" = x"full"; then $as_echo "#define DEBUG_TRACE 1" >>confdefs.h - xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5 $as_echo "full" >&6; } @@ -15807,7 +16216,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -15827,19 +16236,21 @@ if test "x$enable_linker_opts" != "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 + if test x`uname` != x"OpenBSD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5 $as_echo_n "checking whether $LD accepts --as-needed... " >&6; } - case `$LD --as-needed -v 2>&1 &5 + case `$LD --as-needed -v 2>&1 &5 $as_echo "yes" >&6; } - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ;; - esac + ;; + esac + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5 $as_echo_n "checking whether $LD accepts -O1... " >&6; } case `$LD -O1 -v 2>&1 /dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16418,28 +16829,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - 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 -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -16460,8 +16859,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxfcegui4 $as_me 4.8.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by libxfcegui4 $as_me 4.10.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16526,11 +16925,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxfcegui4 config.status 4.8.1 -configured by $0, generated by GNU Autoconf 2.68, +libxfcegui4 config.status 4.10.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16621,7 +17020,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -16663,6 +17062,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -16745,7 +17145,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -16801,6 +17200,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -16851,7 +17251,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -17663,8 +18062,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17718,6 +18117,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -18019,10 +18421,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator diff -Nru libxfcegui4-4.8.1/configure.in libxfcegui4-4.10.0/configure.in --- libxfcegui4-4.8.1/configure.in 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/configure.in 2012-04-28 20:10:43.000000000 +0000 @@ -14,10 +14,10 @@ dnl *************************** m4_define([libxfcegui4_verinfo], [7:0:3]) m4_define([libxfcegui4_version_major], [4]) -m4_define([libxfcegui4_version_minor], [8]) -m4_define([libxfcegui4_version_micro], [1]) +m4_define([libxfcegui4_version_minor], [10]) +m4_define([libxfcegui4_version_micro], [0]) m4_define([libxfcegui4_version_nano], []) dnl leave this empty to have no nano version -m4_define([libxfcegui4_version_build], [6f05239]) +m4_define([libxfcegui4_version_build], [83e7bc6]) m4_define([libxfcegui4_version_tag], []) m4_define([libxfcegui4_version], [libxfcegui4_version_major().libxfcegui4_version_minor().libxfcegui4_version_micro()ifelse(libxfcegui4_version_nano(), [], [], [.libxfcegui4_version_nano()])ifelse(libxfcegui4_version_tag(), [git], [libxfcegui4_version_tag()-libxfcegui4_version_build()], [libxfcegui4_version_tag()])]) @@ -91,7 +91,7 @@ dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** -XDT_I18N([am ar ast be bn_IN ca cs cy da de dz el en_GB eo es et eu fa fi fr gl gu he hu hy id it ja ka kk ko ku lt lv mk mr nb nl pa pl pt_BR pt ro ru si sk sq sv ta tl_PH tr ug uk ur_PK ur zh_CN zh_TW ]) +XDT_I18N([am ar ast be bn_IN ca cs cy da de dz el en_GB eo es et eu fa fi fr gl gu he hr hu hy id is it ja ka kk ko ku lt lv mk mr nb nl nn pa pl pt_BR pt ro ru si sk sq sv ta te tl_PH tr ug uk ur_PK ur zh_CN zh_TW ]) dnl ******************************************* dnl *** Check for X Window System installed *** diff -Nru libxfcegui4-4.8.1/debian/changelog libxfcegui4-4.10.0/debian/changelog --- libxfcegui4-4.8.1/debian/changelog 2011-12-05 16:16:56.000000000 +0000 +++ libxfcegui4-4.10.0/debian/changelog 2015-06-17 12:07:33.000000000 +0000 @@ -1,8 +1,80 @@ -libxfcegui4 (4.8.1-5ubuntu1) precise; urgency=low +libxfcegui4 (4.10.0-3~ubuntu12.04.1) precise; urgency=low - * Fix build failure with glade multiarch locations. + * No-change backport to precise - -- Matthias Klose Mon, 05 Dec 2011 17:16:25 +0100 + -- Pavel Sofishchenko Wed, 17 Jun 2015 17:07:33 +0500 + +libxfcegui4 (4.10.0-3) unstable; urgency=low + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * Bump standards version to 3.9.6 + * debian/control: Add build depend on dh-autoreconf + * debian/rules: + - Add --with autoreconf + - Add disable-silent-rules + * Create debian/source/options + * debian/watch: Add support for more file formats + + [ Mateusz Łukasik ] + * Update debian/watch. + + [ Yves-Alexis Perez ] + * debian/patches: + - 03_libxfce4util7-support added, replace xfce_setenv by g_setenv, fix + FTBFS with libxfce4util 4.12. + * debian/control: + - fix typo. + + -- Yves-Alexis Perez Tue, 05 May 2015 21:57:27 +0200 + +libxfcegui4 (4.10.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/rules: + - enable all hardening flags. + + -- Yves-Alexis Perez Wed, 22 May 2013 00:31:06 +0200 + +libxfcegui4 (4.10.0-1) experimental; urgency=low + + * New upstream stable release. + * debian/patches: + - 01_xfce-exec-use-thunar.patch: dropped, now use exo-open. + - 03_fix-link-lm.patch: dropped, included upstream. + * debian/control: revert to unversioned libxfce4util-dev, bump required + version to >= 4.10.0. + + -- Lionel Le Folgoc Sat, 05 May 2012 14:21:58 +0200 + +libxfcegui4 (4.9.0-1) experimental; urgency=low + + [ Lionel Le Folgoc ] + * debian/patches: add missing DEP3 headers. + * debian/control: switch to libxfce4util6-dev for the new api. + + [ Yves-Alexis Perez ] + * New upstream development release. + * debian/rules: + - build with --parallel. + - use debhelper 9 / dpkg-dev 1.16.1 hardening support. + - use --fail-missing in dh_install. + * debian/control: + - bump debhelper build-dep to 9. + - add build-dep on dpkg-dev 1.16.1. + - drop hardening-includes build-dep. + - update standards version to 3.9.3. + - add Pre-Depends on ${misc:Pre-Depends} in libxfcegui4-4 for multiarch. + * debian/compat bumped to 9. + * Use multi-arch paths in install files. + * debian/libxfcegui4-4.install: + - stop installing glade files since they are gone. + * debian/libxfcegui4-dev: + - don't install static libs, we don't build them anymore. + + -- Yves-Alexis Perez Sun, 15 Apr 2012 16:28:07 +0200 libxfcegui4 (4.8.1-5) unstable; urgency=low diff -Nru libxfcegui4-4.8.1/debian/compat libxfcegui4-4.10.0/debian/compat --- libxfcegui4-4.8.1/debian/compat 2009-03-15 14:15:41.000000000 +0000 +++ libxfcegui4-4.10.0/debian/compat 2013-05-21 22:30:34.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libxfcegui4-4.8.1/debian/control libxfcegui4-4.10.0/debian/control --- libxfcegui4-4.8.1/debian/control 2011-09-05 19:18:59.000000000 +0000 +++ libxfcegui4-4.10.0/debian/control 2015-05-05 19:57:24.000000000 +0000 @@ -4,19 +4,19 @@ Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc -Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6), - libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>=4.8.0), - libstartup-notification0-dev, libglade2-dev, intltool, hardening-includes, - xfce4-dev-tools, libtool, gtk-doc-tools -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.10.6), + libxfce4util-dev (>= 4.10), libxfconf-0-dev (>= 4.10), + libstartup-notification0-dev, libglade2-dev, intltool, dpkg-dev (>= 1.16.1), + xfce4-dev-tools, libtool, gtk-doc-tools, dh-autoreconf +Standards-Version: 3.9.6 Homepage: http://www.xfce.org/ -Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/ +Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/libxfcegui4/ Package: libxfcegui4-dev Section: libdevel Architecture: any -Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.8.0), +Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.10.0), libgtk2.0-dev, ${misc:Depends} Suggests: devhelp Description: Development files for libxfcegui4-4 @@ -31,6 +31,7 @@ Package: libxfcegui4-4 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts Breaks: xfwm4 (<< 4.8), xfce4-settings (<< 4.8) Description: Basic GUI C functions for Xfce4 @@ -45,6 +46,6 @@ Priority: extra Depends: ${shlibs:Depends}, libxfcegui4-4 (= ${binary:Version}), ${misc:Depends} -Description: debugging informations for libxfcegui4 +Description: debugging information for libxfcegui4 This package contains debugging symbols for libxfcegui4, which provides the very basic GUI functions used by the Xfce4 desktop suite. diff -Nru libxfcegui4-4.8.1/debian/libxfcegui4-4.install libxfcegui4-4.10.0/debian/libxfcegui4-4.install --- libxfcegui4-4.8.1/debian/libxfcegui4-4.install 2011-12-05 16:16:11.000000000 +0000 +++ libxfcegui4-4.10.0/debian/libxfcegui4-4.install 2013-05-21 22:30:34.000000000 +0000 @@ -1,4 +1,3 @@ -usr/lib/lib*.so.* -usr/lib/*/libglade/2.0/libxfce4.so +usr/lib/*/lib*.so.* usr/share/locale/* usr/share/icons/hicolor/* diff -Nru libxfcegui4-4.8.1/debian/libxfcegui4-dev.install libxfcegui4-4.10.0/debian/libxfcegui4-dev.install --- libxfcegui4-4.8.1/debian/libxfcegui4-dev.install 2011-12-05 16:14:59.000000000 +0000 +++ libxfcegui4-4.10.0/debian/libxfcegui4-dev.install 2013-05-21 22:30:34.000000000 +0000 @@ -1,6 +1,4 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*/libglade/2.0/*.a -usr/lib/pkgconfig/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* usr/share/gtk-doc/html/libxfcegui4/* diff -Nru libxfcegui4-4.8.1/debian/patches/01_xfce-exec-use-thunar.patch libxfcegui4-4.10.0/debian/patches/01_xfce-exec-use-thunar.patch --- libxfcegui4-4.8.1/debian/patches/01_xfce-exec-use-thunar.patch 2008-05-04 13:12:27.000000000 +0000 +++ libxfcegui4-4.10.0/debian/patches/01_xfce-exec-use-thunar.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff --git xfce_4_4/libxfcegui4/xfce-exec.c b/branches/xfce_4_4/libxfcegui4/xfce-exec.c -index 3d58cf4..bcfad09 100644 ---- xfce_4_4/libxfcegui4/xfce-exec.c -+++ xfce_4_4/libxfcegui4/xfce-exec.c -@@ -218,7 +218,7 @@ xfce_exec_create_argv (const char *cmd, gboolean in_terminal, GError **error) - if (in_terminal) - argv[0] = g_strdup ("xfterm4"); - else -- argv[0] = g_strdup ("xftree4"); -+ argv[0] = g_strdup ("thunar"); - - argv[1] = realcmd; - argv[2] = NULL; diff -Nru libxfcegui4-4.8.1/debian/patches/02_fix-menu-icons.patch libxfcegui4-4.10.0/debian/patches/02_fix-menu-icons.patch --- libxfcegui4-4.8.1/debian/patches/02_fix-menu-icons.patch 2011-09-05 19:06:05.000000000 +0000 +++ libxfcegui4-4.10.0/debian/patches/02_fix-menu-icons.patch 2012-02-20 20:47:12.000000000 +0000 @@ -1,10 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_fix-menu-icons.dpatch by -## -## DP: Allows the icon to show up even if there is a dot in its name -## DP: Fixes Xfce #3614 +Description: fix missing icon for launchers that have a period (dot, '.') in their icon's base name +Author: Gauvain Pocentek +Bug: https://bugzilla.xfce.org/show_bug.cgi?id=3614 -@DPATCH@ Index: libxfcegui4-4.8.1/libxfcegui4/icons.c =================================================================== --- libxfcegui4-4.8.1.orig/libxfcegui4/icons.c 2011-02-10 10:33:27.000000000 +0100 diff -Nru libxfcegui4-4.8.1/debian/patches/03_fix-link-lm.patch libxfcegui4-4.10.0/debian/patches/03_fix-link-lm.patch --- libxfcegui4-4.8.1/debian/patches/03_fix-link-lm.patch 2011-09-05 19:08:04.000000000 +0000 +++ libxfcegui4-4.10.0/debian/patches/03_fix-link-lm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Index: libxfcegui4-4.8.1/libxfcegui4/Makefile.am -=================================================================== ---- libxfcegui4-4.8.1.orig/libxfcegui4/Makefile.am 2011-09-05 21:06:48.451070643 +0200 -+++ libxfcegui4-4.8.1/libxfcegui4/Makefile.am 2011-09-05 21:07:08.935197556 +0200 -@@ -183,7 +183,8 @@ - $(LIBX11_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ - $(LIBSTARTUP_NOTIFICATION_LIBS) \ -- $(PLATFORM_LIBS) -+ $(PLATFORM_LIBS) \ -+ -lm - - libxfcegui4_la_CFLAGS = \ - $(NETK_CFLAGS) \ diff -Nru libxfcegui4-4.8.1/debian/patches/03_libxfce4util7-support.patch libxfcegui4-4.10.0/debian/patches/03_libxfce4util7-support.patch --- libxfcegui4-4.8.1/debian/patches/03_libxfce4util7-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/debian/patches/03_libxfce4util7-support.patch 2015-05-04 13:58:54.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Discard deprecated functions + libxfce4util dropped functions that libxfcegui4 depended on. This patch + fixes building with the latest library. +Author: Sean Davis +Origin: vendor +Forwarded: not-needed +Last-Update: 2015-03-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/libxfcegui4/xfce-exec.c ++++ b/libxfcegui4/xfce-exec.c +@@ -79,7 +79,7 @@ + #ifndef G_OS_WIN32 + gchar *dpyname = user_data; + +- xfce_setenv ("DISPLAY", dpyname, TRUE); ++ g_setenv ("DISPLAY", dpyname, TRUE); + #endif + } + diff -Nru libxfcegui4-4.8.1/debian/patches/series libxfcegui4-4.10.0/debian/patches/series --- libxfcegui4-4.8.1/debian/patches/series 2011-09-05 19:08:04.000000000 +0000 +++ libxfcegui4-4.10.0/debian/patches/series 2015-05-04 13:58:54.000000000 +0000 @@ -1,3 +1,2 @@ -01_xfce-exec-use-thunar.patch 02_fix-menu-icons.patch -03_fix-link-lm.patch +03_libxfce4util7-support.patch diff -Nru libxfcegui4-4.8.1/debian/rules libxfcegui4-4.10.0/debian/rules --- libxfcegui4-4.8.1/debian/rules 2011-09-05 19:18:59.000000000 +0000 +++ libxfcegui4-4.10.0/debian/rules 2013-09-19 23:10:22.000000000 +0000 @@ -1,19 +1,14 @@ #!/usr/bin/make -f -include /usr/share/hardening-includes/hardening.make -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1 -CFLAGS+=$(HARDENING_CFLAGS) - -export CFLAGS LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ + dh $@ --parallel --with autoreconf override_dh_strip: dh_strip --dbg-package=libxfcegui4-4-dbg override_dh_auto_configure: NOCONFIGURE=1 xdt-autogen - dh_auto_configure + dh_auto_configure -- --disable-silent-rules diff -Nru libxfcegui4-4.8.1/debian/source/options libxfcegui4-4.10.0/debian/source/options --- libxfcegui4-4.8.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/debian/source/options 2013-08-18 08:10:09.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile)$" \ No newline at end of file diff -Nru libxfcegui4-4.8.1/debian/watch libxfcegui4-4.10.0/debian/watch --- libxfcegui4-4.8.1/debian/watch 2010-01-05 17:07:29.000000000 +0000 +++ libxfcegui4-4.10.0/debian/watch 2015-03-16 19:35:48.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -http://archive.xfce.org/src/xfce/libxfcegui4/([\d\.]+)/ \ - libxfcegui4-([\d\.]+)\.tar\.(?:gz|bz2) +http://archive.xfce.org/src/xfce/libxfcegui4/([\d\.]+)/ libxfcegui4-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz)) diff -Nru libxfcegui4-4.8.1/depcomp libxfcegui4-4.10.0/depcomp --- libxfcegui4-4.8.1/depcomp 2011-02-10 09:33:50.000000000 +0000 +++ libxfcegui4-4.10.0/depcomp 2012-04-28 20:10:47.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. # 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 @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +40,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +96,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +168,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +430,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +580,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru libxfcegui4-4.8.1/docs/html/index.html libxfcegui4-4.10.0/docs/html/index.html --- libxfcegui4-4.8.1/docs/html/index.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/index.html 2012-04-28 20:11:34.000000000 +0000 @@ -6,15 +6,15 @@ - + -
+
-

for libxfcegui4 4.8.1 +

for libxfcegui4 4.10.0

@@ -46,7 +46,7 @@ XfceAboutDialog — display information about a project.
-XfceAppMenuItem — a GtkMenuItem for app launchers. +XfceAppMenuItem — a GtkMenuItem for app launchers.
XfceFileChooser — a wrapper around GtkFileSelection and GtkFileChooserDialog @@ -68,6 +68,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/index.sgml libxfcegui4-4.10.0/docs/html/index.sgml --- libxfcegui4-4.8.1/docs/html/index.sgml 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/index.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -153,8 +153,6 @@ - - diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-core.html libxfcegui4-4.10.0/docs/html/libxfcegui4-core.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-core.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-core.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ libxfcegui4 Reference Manual Next -
+

Xfce GUI Core Reference

@@ -30,7 +30,7 @@ XfceAboutDialog — display information about a project.
-XfceAppMenuItem — a GtkMenuItem for app launchers. +XfceAppMenuItem — a GtkMenuItem for app launchers.
XfceFileChooser — a wrapper around GtkFileSelection and GtkFileChooserDialog @@ -51,6 +51,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4.devhelp libxfcegui4-4.10.0/docs/html/libxfcegui4.devhelp --- libxfcegui4-4.8.1/docs/html/libxfcegui4.devhelp 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4.devhelp2 libxfcegui4-4.10.0/docs/html/libxfcegui4.devhelp2 --- libxfcegui4-4.8.1/docs/html/libxfcegui4.devhelp2 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4.devhelp2 2012-04-28 20:11:34.000000000 +0000 @@ -63,7 +63,7 @@ - + @@ -124,8 +124,6 @@ - - @@ -140,7 +138,7 @@ - + diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-dialogs.html libxfcegui4-4.10.0/docs/html/libxfcegui4-dialogs.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-dialogs.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-dialogs.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,54 +35,54 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-void                xfce_err                            (const gchar *format,
+void                xfce_err                            (const gchar *format,
                                                          ...);
-void                xfce_verr                           (const gchar *format,
+void                xfce_verr                           (const gchar *format,
                                                          va_list ap);
-void                xfce_warn                           (const gchar *format,
+void                xfce_warn                           (const gchar *format,
                                                          ...);
-void                xfce_vwarn                          (const gchar *format,
+void                xfce_vwarn                          (const gchar *format,
                                                          va_list ap);
-void                xfce_info                           (const gchar *format,
+void                xfce_info                           (const gchar *format,
                                                          ...);
-void                xfce_vinfo                          (const gchar *format,
+void                xfce_vinfo                          (const gchar *format,
                                                          va_list ap);
-gboolean            xfce_confirm                        (const gchar *text,
-                                                         const gchar *stock_id,
-                                                         const gchar *action);
-gint                xfce_message_dialog                 (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *icon_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_type,
+gboolean            xfce_confirm                        (const gchar *text,
+                                                         const gchar *stock_id,
+                                                         const gchar *action);
+gint                xfce_message_dialog                 (GtkWindow *parent,
+                                                         const gchar *title,
+                                                         const gchar *icon_id,
+                                                         const gchar *primary_text,
+                                                         const gchar *secondary_text,
+                                                         const gchar *first_button_type,
                                                          ...);
-GtkWidget *         xfce_create_header                  (GdkPixbuf *icon,
-                                                         const gchar *text);
-GtkWidget *         xfce_create_header_with_image       (GtkWidget *image,
-                                                         const gchar *text);
-GtkWidget *         xfce_create_mixed_button            (const gchar *stock,
-                                                         const gchar *text);
-GtkWidget *         xfce_create_small_label             (const gchar *text);
+GtkWidget *         xfce_create_header                  (GdkPixbuf *icon,
+                                                         const gchar *text);
+GtkWidget *         xfce_create_header_with_image       (GtkWidget *image,
+                                                         const gchar *text);
+GtkWidget *         xfce_create_mixed_button            (const gchar *stock,
+                                                         const gchar *text);
+GtkWidget *         xfce_create_small_label             (const gchar *text);
-
+

Description

Provides simple user interaction functions, like error, warning and confirm dialogs.

-
+

Details

-
+

xfce_err ()

-
void                xfce_err                            (const gchar *format,
+
void                xfce_err                            (const gchar *format,
                                                          ...);

 

 Displays a modal error dialog to the user and blocks until the users
@@ -90,24 +90,16 @@
 

 
-
-
+
-
-
-
-
-
-
-
+
+

 


 
format :
printf-style format string.
-
... :
argument list.
-
printf-style format string.
-
+

xfce_verr ()

-
void                xfce_verr                           (const gchar *format,
+
void                xfce_verr                           (const gchar *format,
                                                          va_list ap);

 

 Displays a modal error dialog to the user and blocks until the users
@@ -118,21 +110,19 @@
 
 
 
format :

-printf-style format string.
-
+printf-style format string.
 
 
 
ap :

-variable argument list pointer.
-
+variable argument list pointer.
-
+

xfce_warn ()

-
void                xfce_warn                           (const gchar *format,
+
void                xfce_warn                           (const gchar *format,
                                                          ...);

 

 Displays a modal warning dialog to the user and blocks until the users
@@ -140,24 +130,16 @@
 

 
-
-
+
-
-
-
-
-
-
-
+
+

 


 
format :
printf-style format string.
-
... :
argument list.
-
printf-style format string.
-
+

xfce_vwarn ()

-
void                xfce_vwarn                          (const gchar *format,
+
void                xfce_vwarn                          (const gchar *format,
                                                          va_list ap);

 

 Displays a modal warning dialog to the user and blocks until the users
@@ -168,21 +150,19 @@
 
 
 
format :

-printf-style format string.
-
+printf-style format string.
 
 
 
ap :

-variable argument list pointer.
-
+variable argument list pointer.
-
+

xfce_info ()

-
void                xfce_info                           (const gchar *format,
+
void                xfce_info                           (const gchar *format,
                                                          ...);

 

 Displays a modal info dialog to the user and blocks until the users
@@ -190,24 +170,16 @@
 

 
-
-
+
-
-
-
-
-
-
-
+
+

 


 
format :
printf-style format string.
-
... :
argument list.
-
printf-style format string.
-
+

xfce_vinfo ()

-
void                xfce_vinfo                          (const gchar *format,
+
void                xfce_vinfo                          (const gchar *format,
                                                          va_list ap);

 

 Displays a modal info dialog to the user and blocks until the users
@@ -218,23 +190,21 @@
 
 
 
format :

-printf-style format string.
-
+printf-style format string.
 
 
 
ap :

-variable argument list pointer.
-
+variable argument list pointer.
-
+

xfce_confirm ()

-
gboolean            xfce_confirm                        (const gchar *text,
-                                                         const gchar *stock_id,
-                                                         const gchar *action);
+
gboolean            xfce_confirm                        (const gchar *text,
+                                                         const gchar *stock_id,
+                                                         const gchar *action);

Runs a modal confirmation dialog, that has a 'cancel' and a 'confirm' button. The 'confirm' button text can be set by action if given. @@ -247,37 +217,33 @@

text :

-a question text - +a question text

stock_id :

-a stock item name - +a stock item name

action :

if non-NULL, this text is used on the confirm button together - with the stock icon. - +with the stock icon.

Returns :

- TRUE if the user confirms, else FALSE. - +TRUE if the user confirms, else FALSE.
-
+

xfce_message_dialog ()

-
gint                xfce_message_dialog                 (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *icon_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_type,
+
gint                xfce_message_dialog                 (GtkWindow *parent,
+                                                         const gchar *title,
+                                                         const gchar *icon_id,
+                                                         const gchar *primary_text,
+                                                         const gchar *secondary_text,
+                                                         const gchar *first_button_type,
                                                          ...);

 

 xfce_message_dialog() creates a dialog widget as in
@@ -292,53 +258,43 @@
 
 
 
parent :

-Transient parent of the dialog, or NULL
+Transient parent of the dialog, or NULL
 
 
 
 
title :

-Title of the dialog, or NULL
+Title of the dialog, or NULL
 
 
 
 
icon_id :

-Gtk stock icon to show in the dialog
-
+Gtk stock icon to show in the dialog
 
 
 
primary_text :

-Text shown in large bold font
-
+Text shown in large bold font
 
 
 
secondary_text :

-Text shown in normal font
-
+Text shown in normal font
 
 
 
first_button_type :

-Type of the first button, or NULL
-
-
-
-
... :

-
-NULL ended list of parameters and response ID
+Type of the first button, or NULL
 
 
 
 
Returns :

- The selected response id.
-
+The selected response id.
-
+

xfce_create_header ()

-
GtkWidget *         xfce_create_header                  (GdkPixbuf *icon,
-                                                         const gchar *text);
+
GtkWidget *         xfce_create_header                  (GdkPixbuf *icon,
+                                                         const gchar *text);

Creates a header with an optional icon (may be NULL) in larger bold font. Background and foreground colors are taken from Gtk+ style. @@ -348,27 +304,24 @@

icon :

-a GdkPixbuf or NULL if no icon should be displayed in the header. - +a GdkPixbuf or NULL if no icon should be displayed in the header.

text :

-a text to be displayed in the header. - +a text to be displayed in the header.

Returns :

- the container widget that contains the header widgets. - +the container widget that contains the header widgets.
-
+

xfce_create_header_with_image ()

-
GtkWidget *         xfce_create_header_with_image       (GtkWidget *image,
-                                                         const gchar *text);
+
GtkWidget *         xfce_create_header_with_image       (GtkWidget *image,
+                                                         const gchar *text);

Creates a header with an optional image (may be NULL) in larger bold font. Background and foreground colors are taken from Gtk+ style. @@ -378,27 +331,24 @@

image :

-a GtkImage or NULL if no image should be displayed in the header. - +a GtkImage or NULL if no image should be displayed in the header.

text :

-the text to be displayed in the header. - +the text to be displayed in the header.

Returns :

- the container widget that contains the header widgets. - +the container widget that contains the header widgets.
-
+

xfce_create_mixed_button ()

-
GtkWidget *         xfce_create_mixed_button            (const gchar *stock,
-                                                         const gchar *text);
+
GtkWidget *         xfce_create_mixed_button            (const gchar *stock,
+                                                         const gchar *text);

Creates a button with both stock icon and text.

@@ -407,26 +357,23 @@

stock :

-a stock item name. - +a stock item name.

text :

-a text to display. - +a text to display.

Returns :

- the newly created mixed button widget. - +the newly created mixed button widget.
-
+

xfce_create_small_label ()

-
GtkWidget *         xfce_create_small_label             (const gchar *text);
+
GtkWidget *         xfce_create_small_label             (const gchar *text);

Creates a small italic label using Gtk's markup functionality.

@@ -435,13 +382,11 @@

text :

-label text. - +label text.

Returns :

- the newly created label. - +the newly created label.
@@ -450,6 +395,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-fundamentals.html libxfcegui4-4.10.0/docs/html/libxfcegui4-fundamentals.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-fundamentals.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-fundamentals.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ libxfcegui4 Reference Manual Next -
+

Xfce GUI Fundamentals

@@ -39,6 +39,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-netk.html libxfcegui4-4.10.0/docs/html/libxfcegui4-netk.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-netk.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-netk.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -19,10 +19,10 @@ libxfcegui4 Reference Manual Next -

+

Xfce GUI Netk Reference

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18

\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-Standard-Macros.html libxfcegui4-4.10.0/docs/html/libxfcegui4-Standard-Macros.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-Standard-Macros.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-Standard-Macros.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,7 +35,7 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
@@ -48,16 +48,16 @@
                                                          micro)
-
+

Description

These macros provide version information and a version check for the libxfcegui4.

-
+

Details

-
+

LIBXFCEGUI4_MAJOR_VERSION

#define LIBXFCEGUI4_MAJOR_VERSION 4
@@ -66,25 +66,25 @@

-
+

LIBXFCEGUI4_MINOR_VERSION

-
#define LIBXFCEGUI4_MINOR_VERSION 8
+
#define LIBXFCEGUI4_MINOR_VERSION 10
 

 

 The minor version number of the libxfcegui4.
-
+

LIBXFCEGUI4_MICRO_VERSION

-
#define LIBXFCEGUI4_MICRO_VERSION 1
+
#define LIBXFCEGUI4_MICRO_VERSION 0
 

 

 The micro version number of the libxfcegui4.
-
+

LIBXFCEGUI4_CHECK_VERSION()

#define             LIBXFCEGUI4_CHECK_VERSION(major,minor,micro)

@@ -92,7 +92,7 @@ libxfcegui4 library is the same or newer than the given version.

-

Example 1. Checking the version of the libxfcegui4 library

+

Example 1. Checking the version of the libxfcegui4 library

   if (!LIBXFCEGUI4_CHECK_VERSION (4, 1, 6))
     g_error ("libxfcegui4 version 4.1.6 or above is required.");
@@ -105,24 +105,21 @@
 
 
 
major :

-the major version number.
-
+the major version number.
 
 
 
minor :

-the minor version number.
-
+the minor version number.
 
 
 
micro :

-the micro version number.
-
+the micro version number.
-
+

See Also

libxfce4util Standard Macros @@ -131,6 +128,6 @@

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-xfce-exec.html libxfcegui4-4.10.0/docs/html/libxfcegui4-xfce-exec.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-xfce-exec.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-xfce-exec.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,23 +35,23 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-gboolean            xfce_exec                           (const char *cmd,
-                                                         gboolean in_terminal,
-                                                         gboolean use_sn,
-                                                         GError **error);
-gboolean            xfce_exec_with_envp                 (const char *cmd,
-                                                         gboolean in_terminal,
-                                                         gboolean use_sn,
-                                                         GError **error,
+gboolean            xfce_exec                           (const char *cmd,
+                                                         gboolean in_terminal,
+                                                         gboolean use_sn,
+                                                         GError **error);
+gboolean            xfce_exec_with_envp                 (const char *cmd,
+                                                         gboolean in_terminal,
+                                                         gboolean use_sn,
+                                                         GError **error,
                                                          char **envp);
-
+

Description

The xfce-exec module provides functions to execute other applications from @@ -60,14 +60,14 @@ line interface) in an X terminal.

-
+

Details

-
+

xfce_exec ()

-
gboolean            xfce_exec                           (const char *cmd,
-                                                         gboolean in_terminal,
-                                                         gboolean use_sn,
-                                                         GError **error);
+
gboolean            xfce_exec                           (const char *cmd,
+                                                         gboolean in_terminal,
+                                                         gboolean use_sn,
+                                                         GError **error);

Use xfce_exec_with_envp if you want to specify the environment.

@@ -76,39 +76,34 @@

cmd :

-command line to run - +command line to run

in_terminal :

-whether to run cmd in a terminal - +whether to run cmd in a terminal

use_sn :

-whether to use startup notification - +whether to use startup notification

error :

-location for a GError or NULL - +location for a GError or NULL

Returns :

- TRUE on success, FALSE on failure. - +TRUE on success, FALSE on failure.
-
+

xfce_exec_with_envp ()

-
gboolean            xfce_exec_with_envp                 (const char *cmd,
-                                                         gboolean in_terminal,
-                                                         gboolean use_sn,
-                                                         GError **error,
+
gboolean            xfce_exec_with_envp                 (const char *cmd,
+                                                         gboolean in_terminal,
+                                                         gboolean use_sn,
+                                                         GError **error,
                                                          char **envp);

 

 See also xfce_exec.
@@ -118,33 +113,27 @@
 
 
 
cmd :

-command line to run
-
+command line to run
 
 
 
in_terminal :

-whether to run cmd in a terminal
-
+whether to run cmd in a terminal
 
 
 
use_sn :

-whether to use startup notification
-
+whether to use startup notification
 
 
 
error :

-location for a GError or NULL
-
+location for a GError or NULL
 
 
 
envp :

-the environment
-
+the environment
 
 
 
Returns :

- TRUE on success, FALSE on failure. 
-
+TRUE on success, FALSE on failure.
@@ -153,6 +142,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-XfceFileChooser.html libxfcegui4-4.10.0/docs/html/libxfcegui4-XfceFileChooser.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-XfceFileChooser.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-XfceFileChooser.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,7 +35,7 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
@@ -43,53 +43,53 @@
 typedef             XfceFileChooser;
 enum                XfceFileChooserAction;
 void                (*PreviewUpdateFunc)                (XfceFileChooser *chooser,
-                                                         gpointer user_data);
-GtkWidget *         xfce_file_chooser_dialog_new        (const gchar *title,
-                                                         GtkWindow *parent,
+                                                         gpointer user_data);
+GtkWidget *         xfce_file_chooser_dialog_new        (const gchar *title,
+                                                         GtkWindow *parent,
                                                          XfceFileChooserAction action,
-                                                         const gchar *first_button_text,
+                                                         const gchar *first_button_text,
                                                          ...);
-GtkWidget *         xfce_file_chooser_new               (const gchar *title,
-                                                         GtkWindow *parent,
+GtkWidget *         xfce_file_chooser_new               (const gchar *title,
+                                                         GtkWindow *parent,
                                                          XfceFileChooserAction action,
-                                                         const gchar *first_button_text,
+                                                         const gchar *first_button_text,
                                                          ...);
 void                xfce_file_chooser_set_select_multiple
                                                         (XfceFileChooser *chooser,
-                                                         gboolean select_multiple);
-gboolean            xfce_file_chooser_get_select_multiple
+                                                         gboolean select_multiple);
+gboolean            xfce_file_chooser_get_select_multiple
                                                         (XfceFileChooser *chooser);
 void                xfce_file_chooser_set_current_name  (XfceFileChooser *chooser,
-                                                         const gchar *name);
-gchar *             xfce_file_chooser_get_filename      (XfceFileChooser *chooser);
-gboolean            xfce_file_chooser_set_filename      (XfceFileChooser *chooser,
-                                                         const gchar *filename);
-GSList *            xfce_file_chooser_get_filenames     (XfceFileChooser *chooser);
-gboolean            xfce_file_chooser_set_current_folder
+                                                         const gchar *name);
+gchar *             xfce_file_chooser_get_filename      (XfceFileChooser *chooser);
+gboolean            xfce_file_chooser_set_filename      (XfceFileChooser *chooser,
+                                                         const gchar *filename);
+GSList *            xfce_file_chooser_get_filenames     (XfceFileChooser *chooser);
+gboolean            xfce_file_chooser_set_current_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *filename);
-gchar *             xfce_file_chooser_get_current_folder
+                                                         const gchar *filename);
+gchar *             xfce_file_chooser_get_current_folder
                                                         (XfceFileChooser *chooser);
 void                xfce_file_chooser_set_preview_widget
                                                         (XfceFileChooser *chooser,
-                                                         GtkWidget *preview_widget);
-GtkWidget *         xfce_file_chooser_get_preview_widget
+                                                         GtkWidget *preview_widget);
+GtkWidget *         xfce_file_chooser_get_preview_widget
                                                         (XfceFileChooser *chooser);
 void                xfce_file_chooser_set_preview_callback
                                                         (XfceFileChooser *chooser,
                                                          PreviewUpdateFunc func,
-                                                         gpointer user_data);
+                                                         gpointer user_data);
 void                xfce_file_chooser_set_preview_widget_active
                                                         (XfceFileChooser *chooser,
-                                                         gboolean active);
-gboolean            xfce_file_chooser_get_preview_widget_active
+                                                         gboolean active);
+gboolean            xfce_file_chooser_get_preview_widget_active
                                                         (XfceFileChooser *chooser);
 void                xfce_file_chooser_set_use_preview_label
                                                         (XfceFileChooser *chooser,
-                                                         gboolean use_label);
+                                                         gboolean use_label);
 void                xfce_file_chooser_set_extra_widget  (XfceFileChooser *chooser,
-                                                         GtkWidget *extra_widget);
-GtkWidget *         xfce_file_chooser_get_extra_widget  (XfceFileChooser *chooser);
+                                                         GtkWidget *extra_widget);
+GtkWidget *         xfce_file_chooser_get_extra_widget  (XfceFileChooser *chooser);
 void                xfce_file_chooser_add_filter        (XfceFileChooser *chooser,
                                                          XfceFileFilter *filter);
 void                xfce_file_chooser_remove_filter     (XfceFileChooser *chooser,
@@ -97,27 +97,27 @@
 void                xfce_file_chooser_set_filter        (XfceFileChooser *chooser,
                                                          XfceFileFilter *filter);
 void                xfce_file_chooser_set_local_only    (XfceFileChooser *chooser,
-                                                         gboolean local_only);
-gboolean            xfce_file_chooser_get_local_only    (XfceFileChooser *chooser);
-gboolean            xfce_file_chooser_add_shortcut_folder
+                                                         gboolean local_only);
+gboolean            xfce_file_chooser_get_local_only    (XfceFileChooser *chooser);
+gboolean            xfce_file_chooser_add_shortcut_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *folder,
-                                                         GError **error);
-gboolean            xfce_file_chooser_remove_shortcut_folder
+                                                         const gchar *folder,
+                                                         GError **error);
+gboolean            xfce_file_chooser_remove_shortcut_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *folder,
-                                                         GError **error);
+                                                         const gchar *folder,
+                                                         GError **error);
 typedef             XfceFileFilter;
 XfceFileFilter *    xfce_file_filter_new                (void);
 void                xfce_file_filter_set_name           (XfceFileFilter *filter,
-                                                         const gchar *name);
+                                                         const gchar *name);
 void                xfce_file_filter_add_mime_type      (XfceFileFilter *filter,
-                                                         const gchar *mime_type);
+                                                         const gchar *mime_type);
 void                xfce_file_filter_add_pattern        (XfceFileFilter *filter,
-                                                         const gchar *pattern);
+                                                         const gchar *pattern);
-
+

Description

XfceFileChooser is meant to be used as a gtk-version-neutral file selector. @@ -133,9 +133,9 @@ API.

-
+

Details

-
+

XfceFileChooser

typedef GtkDialog XfceFileChooser;
@@ -143,15 +143,15 @@

-
+

enum XfceFileChooserAction

-
typedef enum { /*< prefix=XFCE_FILE_CHOOSER_ACTION_ >*/
+
typedef enum {
+ /*< prefix=XFCE_FILE_CHOOSER_ACTION_ >*/
 	XFCE_FILE_CHOOSER_ACTION_OPEN,
 	XFCE_FILE_CHOOSER_ACTION_SAVE,
 	XFCE_FILE_CHOOSER_ACTION_SELECT_FOLDER,
 	XFCE_FILE_CHOOSER_ACTION_CREATE_FOLDER
-} 
-XfceFileChooserAction;
+} XfceFileChooserAction;
 

 

       Describes whether a XfceFileChooser is being used to open
@@ -191,10 +191,10 @@
-
+

PreviewUpdateFunc ()

void                (*PreviewUpdateFunc)                (XfceFileChooser *chooser,
-                                                         gpointer user_data);
+ gpointer user_data);

Use this function prototype for functions to be passed to xfce_file_chooser_set_preview_callback(). @@ -204,26 +204,24 @@

chooser :

-The XfceFileChooser where the signal occurred. - +The XfceFileChooser where the signal occurred.

user_data :

-The user_data passed to xfce_file_chooser_set_preview_callback(). - +The user_data passed to xfce_file_chooser_set_preview_callback().
-
+

xfce_file_chooser_dialog_new ()

-
GtkWidget *         xfce_file_chooser_dialog_new        (const gchar *title,
-                                                         GtkWindow *parent,
+
GtkWidget *         xfce_file_chooser_dialog_new        (const gchar *title,
+                                                         GtkWindow *parent,
                                                          XfceFileChooserAction action,
-                                                         const gchar *first_button_text,
+                                                         const gchar *first_button_text,
                                                          ...);

-

+

 
Warning

 
xfce_file_chooser_dialog_new is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

 

@@ -232,47 +230,41 @@
 
 
 
title :

-The dialog's window title, or NULL.
-
+The dialog's window title, or NULL.
 
 
 
parent :

-The dialog's transient parent window, or NULL.
-
+The dialog's transient parent window, or NULL.
 
 
 
action :

-Open or save mode for dialog.
-
+Open or save mode for dialog.
 
 
 
first_button_text :

-Stock ID or text for the first button.
-
+Stock ID or text for the first button.
 
 
 
... :

 Response ID for the first button, followed by additional (button, ID)
-      pairs, terminated with a NULL argument.
-
+pairs, terminated with a NULL argument.
 
 
 
Returns :

- a new XfceFileChooser dialog widget.
-
+a new XfceFileChooser dialog widget.
-
+

xfce_file_chooser_new ()

-
GtkWidget *         xfce_file_chooser_new               (const gchar *title,
-                                                         GtkWindow *parent,
+
GtkWidget *         xfce_file_chooser_new               (const gchar *title,
+                                                         GtkWindow *parent,
                                                          XfceFileChooserAction action,
-                                                         const gchar *first_button_text,
+                                                         const gchar *first_button_text,
                                                          ...);

-

+

 
Warning

 
xfce_file_chooser_new is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.
 

@@ -291,45 +283,39 @@
 
 
 
title :

-The dialog's window title, or NULL.
-
+The dialog's window title, or NULL.
 
 
 
parent :

-The dialog's transient parent window, or NULL.
-
+The dialog's transient parent window, or NULL.
 
 
 
action :

-Open or save mode for dialog.
-
+Open or save mode for dialog.
 
 
 
first_button_text :

-Stock ID or text for the first button.
-
+Stock ID or text for the first button.
 
 
 
... :

 Response ID for the first button, followed by additional (button, ID)
-      pairs, terminated with a NULL argument.
-
+pairs, terminated with a NULL argument.
 
 
 
Returns :

- a new XfceFileChooser dialog widget.
-
+a new XfceFileChooser dialog widget.
 
 
 

 

 

-

+

 
xfce_file_chooser_set_select_multiple ()

 
void                xfce_file_chooser_set_select_multiple
                                                         (XfceFileChooser *chooser,
-                                                         gboolean select_multiple);

-

+                                                         gboolean select_multiple);
+

Warning

xfce_file_chooser_set_select_multiple is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -344,24 +330,22 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

select_multiple :

-TRUE it multiple files can be selected. - +TRUE it multiple files can be selected.
-
+

xfce_file_chooser_get_select_multiple ()

-
gboolean            xfce_file_chooser_get_select_multiple
+
gboolean            xfce_file_chooser_get_select_multiple
                                                         (XfceFileChooser *chooser);

-

+

 
Warning

 
xfce_file_chooser_get_select_multiple is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.
 

@@ -377,23 +361,22 @@
 
 
 
chooser :

-An XfceFileChooser.
-
+An XfceFileChooser.
 
 
 
Returns :

- TRUE if multiple files can be selected, FALSE otherwise.
-
+
+TRUE if multiple files can be selected, FALSE otherwise.
 
 
 

 

 

-

+

 
xfce_file_chooser_set_current_name ()

 
void                xfce_file_chooser_set_current_name  (XfceFileChooser *chooser,
-                                                         const gchar *name);

-

+                                                         const gchar *name);
+

Warning

xfce_file_chooser_set_current_name is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -414,22 +397,20 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

name :

-The filename to use (UTF-8 only). - +The filename to use (UTF-8 only).
-
+

xfce_file_chooser_get_filename ()

-
gchar *             xfce_file_chooser_get_filename      (XfceFileChooser *chooser);
-
+
gchar *             xfce_file_chooser_get_filename      (XfceFileChooser *chooser);
+

Warning

xfce_file_chooser_get_filename is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -445,25 +426,23 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

Returns :

- The currently selected filename, or NULL if no file is - selected. This string is allocated by libxfcegui4 and should - be released with g_free() when it is no longer needed. - +The currently selected filename, or NULL if no file is +selected. This string is allocated by libxfcegui4 and should +be released with g_free() when it is no longer needed.
-
+

xfce_file_chooser_set_filename ()

-
gboolean            xfce_file_chooser_set_filename      (XfceFileChooser *chooser,
-                                                         const gchar *filename);
-
+
gboolean            xfce_file_chooser_set_filename      (XfceFileChooser *chooser,
+                                                         const gchar *filename);
+

Warning

xfce_file_chooser_set_filename is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -484,27 +463,25 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

filename :

-A filename to set. - +A filename to set.

Returns :

- TRUE if the file exists and was selected, FALSE otherwise. - + +TRUE if the file exists and was selected, FALSE otherwise.
-
+

xfce_file_chooser_get_filenames ()

-
GSList *            xfce_file_chooser_get_filenames     (XfceFileChooser *chooser);
-
+
GSList *            xfce_file_chooser_get_filenames     (XfceFileChooser *chooser);
+

Warning

xfce_file_chooser_get_filenames is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -521,27 +498,25 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

Returns :

- A GSList - containing the filenames of all selected files in the file - chooser. Release the list with g_slist_free() and the - filenames with g_free() when they are no longer needed. - +A GSList +containing the filenames of all selected files in the file +chooser. Release the list with g_slist_free() and the +filenames with g_free() when they are no longer needed.
-
+

xfce_file_chooser_set_current_folder ()

-
gboolean            xfce_file_chooser_set_current_folder
+
gboolean            xfce_file_chooser_set_current_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *filename);

-

+                                                         const gchar *filename);
+

Warning

xfce_file_chooser_set_current_folder is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -556,29 +531,27 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

filename :

-The full path of the new current folder. - +The full path of the new current folder.

Returns :

- TRUE if the folder exists and could be changed, FALSE - otherwise. - + +TRUE if the folder exists and could be changed, FALSE +otherwise.
-
+

xfce_file_chooser_get_current_folder ()

-
gchar *             xfce_file_chooser_get_current_folder
+
gchar *             xfce_file_chooser_get_current_folder
                                                         (XfceFileChooser *chooser);

-

+

 
Warning

 
xfce_file_chooser_get_current_folder is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.
 

@@ -593,25 +566,23 @@
 
 
 
chooser :

-An XfceFileChooser.
-
+An XfceFileChooser.
 
 
 
Returns :

- The currently-selected folder.  Release with g_free() when no
-              longer needed.
-
+The currently-selected folder.  Release with g_free() when no
+longer needed.
 
 
 

 

 

-

+

 
xfce_file_chooser_set_preview_widget ()

 
void                xfce_file_chooser_set_preview_widget
                                                         (XfceFileChooser *chooser,
-                                                         GtkWidget *preview_widget);

-

+                                                         GtkWidget *preview_widget);
+

Warning

xfce_file_chooser_set_preview_widget is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -631,23 +602,21 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

preview_widget :

-A widget used to preview file data. - +A widget used to preview file data.
-
+

xfce_file_chooser_get_preview_widget ()

-
GtkWidget *         xfce_file_chooser_get_preview_widget
+
GtkWidget *         xfce_file_chooser_get_preview_widget
                                                         (XfceFileChooser *chooser);

-

+

 
Warning

 
xfce_file_chooser_get_preview_widget is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.
 

@@ -662,26 +631,24 @@
 
 
 
chooser :

-An XfceFileChooser.
-
+An XfceFileChooser.
 
 
 
Returns :

- A GtkWidget,
-              or NULL if no preview widget was set.
-
+A GtkWidget,
+or NULL if no preview widget was set.
 
 
 

 

 

-

+

 
xfce_file_chooser_set_preview_callback ()

 
void                xfce_file_chooser_set_preview_callback
                                                         (XfceFileChooser *chooser,
                                                          PreviewUpdateFunc func,
-                                                         gpointer user_data);

-

+                                                         gpointer user_data);
+

Warning

xfce_file_chooser_set_preview_callback is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -698,29 +665,26 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

func :

-A callback function. - +A callback function.

user_data :

-Data to be passed to func. - +Data to be passed to func.
-
+

xfce_file_chooser_set_preview_widget_active ()

void                xfce_file_chooser_set_preview_widget_active
                                                         (XfceFileChooser *chooser,
-                                                         gboolean active);
-
+ gboolean active); +

Warning

xfce_file_chooser_set_preview_widget_active is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -738,25 +702,23 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

active :

-TRUE or FALSE depending on whether or not the preview should be - shown. - +TRUE or FALSE depending on whether or not the preview should be +shown.
-
+

xfce_file_chooser_get_preview_widget_active ()

-
gboolean            xfce_file_chooser_get_preview_widget_active
+
gboolean            xfce_file_chooser_get_preview_widget_active
                                                         (XfceFileChooser *chooser);

-

+

 
Warning

 
xfce_file_chooser_get_preview_widget_active is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.
 

@@ -772,24 +734,23 @@
 
 
 
chooser :

-An XfceFileChooser.
-
+An XfceFileChooser.
 
 
 
Returns :

- TRUE if the preview widget is active, FALSE otherwise.
-
+
+TRUE if the preview widget is active, FALSE otherwise.
 
 
 

 

 

-

+

 
xfce_file_chooser_set_use_preview_label ()

 
void                xfce_file_chooser_set_use_preview_label
                                                         (XfceFileChooser *chooser,
-                                                         gboolean use_label);

-

+                                                         gboolean use_label);
+

Warning

xfce_file_chooser_set_use_preview_label is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -805,24 +766,22 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

use_label :

Whether to display a stock label with the name of the previewed - file. - +file.
-
+

xfce_file_chooser_set_extra_widget ()

void                xfce_file_chooser_set_extra_widget  (XfceFileChooser *chooser,
-                                                         GtkWidget *extra_widget);
-
+ GtkWidget *extra_widget); +

Warning

xfce_file_chooser_set_extra_widget is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -838,22 +797,20 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

extra_widget :

-An extra widget to display. - +An extra widget to display.
-
+

xfce_file_chooser_get_extra_widget ()

-
GtkWidget *         xfce_file_chooser_get_extra_widget  (XfceFileChooser *chooser);
-
+
GtkWidget *         xfce_file_chooser_get_extra_widget  (XfceFileChooser *chooser);
+

Warning

xfce_file_chooser_get_extra_widget is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -868,23 +825,21 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

Returns :

- The extra GtkWidget. - +The extra GtkWidget.
-
+

xfce_file_chooser_add_filter ()

void                xfce_file_chooser_add_filter        (XfceFileChooser *chooser,
                                                          XfceFileFilter *filter);
-
+

Warning

xfce_file_chooser_add_filter is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -904,23 +859,21 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

filter :

-An XfceFileFilter created with xfce_file_filter_new(). - +An XfceFileFilter created with xfce_file_filter_new().
-
+

xfce_file_chooser_remove_filter ()

void                xfce_file_chooser_remove_filter     (XfceFileChooser *chooser,
                                                          XfceFileFilter *filter);
-
+

Warning

xfce_file_chooser_remove_filter is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -939,23 +892,21 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

filter :

-An XfceFileFilter. - +An XfceFileFilter.
-
+

xfce_file_chooser_set_filter ()

void                xfce_file_chooser_set_filter        (XfceFileChooser *chooser,
                                                          XfceFileFilter *filter);
-
+

Warning

xfce_file_chooser_set_filter is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -975,23 +926,21 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

filter :

-An XfceFileFilter. - +An XfceFileFilter.
-
+

xfce_file_chooser_set_local_only ()

void                xfce_file_chooser_set_local_only    (XfceFileChooser *chooser,
-                                                         gboolean local_only);
-
+ gboolean local_only); +

Warning

xfce_file_chooser_set_local_only is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -1007,22 +956,20 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

local_only :

-Whether to only allow the display of local files. - +Whether to only allow the display of local files.
-
+

xfce_file_chooser_get_local_only ()

-
gboolean            xfce_file_chooser_get_local_only    (XfceFileChooser *chooser);
-
+
gboolean            xfce_file_chooser_get_local_only    (XfceFileChooser *chooser);
+

Warning

xfce_file_chooser_get_local_only is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -1038,25 +985,24 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

Returns :

- TRUE if non-local files are allowed, FALSE otherwise. - + +TRUE if non-local files are allowed, FALSE otherwise.
-
+

xfce_file_chooser_add_shortcut_folder ()

-
gboolean            xfce_file_chooser_add_shortcut_folder
+
gboolean            xfce_file_chooser_add_shortcut_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *folder,
-                                                         GError **error);

-

+                                                         const gchar *folder,
+                                                         GError **error);
+

Warning

xfce_file_chooser_add_shortcut_folder is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -1076,36 +1022,33 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

folder :

-The full path to a folder name. - +The full path to a folder name.

error :

-Location to store any errors, or NULL. - +Location to store any errors, or NULL.

Returns :

- TRUE if the folder given is valid, FALSE otherwise. If - error is non-NULL, it will be set with any error that occurs. - + +TRUE if the folder given is valid, FALSE otherwise. If +error is non-NULL, it will be set with any error that occurs.
-
+

xfce_file_chooser_remove_shortcut_folder ()

-
gboolean            xfce_file_chooser_remove_shortcut_folder
+
gboolean            xfce_file_chooser_remove_shortcut_folder
                                                         (XfceFileChooser *chooser,
-                                                         const gchar *folder,
-                                                         GError **error);

-

+                                                         const gchar *folder,
+                                                         GError **error);
+

Warning

xfce_file_chooser_remove_shortcut_folder is deprecated and should not be used in newly-written code. Use GtkFileChooser instead.

@@ -1124,30 +1067,27 @@

chooser :

-An XfceFileChooser. - +An XfceFileChooser.

folder :

-The full path to an existing shortcut folder name. - +The full path to an existing shortcut folder name.

error :

-Location to store any errors, or NULL. - +Location to store any errors, or NULL.

Returns :

- TRUE if the removal succeeded, FALSE otherwise. If error is - non-NULL, it will be set with any error that occurs. - + +TRUE if the removal succeeded, FALSE otherwise. If error is +non-NULL, it will be set with any error that occurs.
-
+

XfceFileFilter

typedef GtkObject XfceFileFilter;
@@ -1155,16 +1095,16 @@ With GTK+ 2.4, this object is mapped to a GtkFileFilter. However, with GTK+ 2.0 or 2.2, this object doesn't exist, so functions that use -it will return and expect a NULL value. As such, pointers to an +it will return and expect a NULL value. As such, pointers to an XfceFileFilter should be treated as opaque, and no attempt should be made to dereference them.

-
+

xfce_file_filter_new ()

XfceFileFilter *    xfce_file_filter_new                (void);
-
+

Warning

xfce_file_filter_new is deprecated and should not be used in newly-written code. Use GtkFileFilter instead.

@@ -1175,24 +1115,23 @@ Create a new empty file filter.

-Note: this will always return NULL when libxfcegui4 is compiled against GTK+ +Note: this will always return NULL when libxfcegui4 is compiled against GTK+ 2.2 or below, as file filters are not supported.

- +

Returns :

 An XfceFileFilter, or NULL (GTK+ 2.2 and below). -An XfceFileFilter, or NULL (GTK+ 2.2 and below).
-
+

xfce_file_filter_set_name ()

void                xfce_file_filter_set_name           (XfceFileFilter *filter,
-                                                         const gchar *name);
-
+ const gchar *name); +

Warning

xfce_file_filter_set_name is deprecated and should not be used in newly-written code. Use GtkFileFilter instead.

@@ -1212,23 +1151,21 @@

filter :

-An XfceFileFilter. - +An XfceFileFilter.

name :

-The name of the filter. - +The name of the filter.
-
+

xfce_file_filter_add_mime_type ()

void                xfce_file_filter_add_mime_type      (XfceFileFilter *filter,
-                                                         const gchar *mime_type);
-
+ const gchar *mime_type); +

Warning

xfce_file_filter_add_mime_type is deprecated and should not be used in newly-written code. Use GtkFileFilter instead.

@@ -1248,23 +1185,21 @@

filter :

-An XfceFileFilter. - +An XfceFileFilter.

mime_type :

-A registered MIME type. - +A registered MIME type.
-
+

xfce_file_filter_add_pattern ()

void                xfce_file_filter_add_pattern        (XfceFileFilter *filter,
-                                                         const gchar *pattern);
-
+ const gchar *pattern); +

Warning

xfce_file_filter_add_pattern is deprecated and should not be used in newly-written code. Use GtkFileFilter instead.

@@ -1285,13 +1220,11 @@

filter :

-An XfceFileFilter. - +An XfceFileFilter.

pattern :

-A file pattern. - +A file pattern.
@@ -1300,6 +1233,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-Xfce-Gdk-extensions.html libxfcegui4-4.10.0/docs/html/libxfcegui4-Xfce-Gdk-extensions.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-Xfce-Gdk-extensions.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-Xfce-Gdk-extensions.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,53 +35,53 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-gchar*              xfce_gdk_display_get_fullname       (GdkDisplay *display);
-GdkScreen*          xfce_gdk_display_locate_monitor_with_pointer
-                                                        (GdkDisplay *display,
-                                                         gint *monitor_return);
-gchar *             xfce_gdk_screen_get_fullname        (GdkScreen *screen);
-gboolean            xfce_gdk_spawn_on_screen            (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         GSpawnChildSetupFunc child_setup,
-                                                         gpointer user_data,
-                                                         gint *child_pid,
-                                                         GError **error);
-gboolean            xfce_gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         GSpawnChildSetupFunc child_setup,
-                                                         gpointer user_data,
-                                                         gint *child_pid,
-                                                         gint *standard_input,
-                                                         gint *standard_output,
-                                                         gint *standard_error,
-                                                         GError **error);
-gboolean            xfce_gdk_spawn_command_line_on_screen
-                                                        (GdkScreen *screen,
-                                                         const gchar *command_line,
-                                                         GError **error);
+gchar *             xfce_gdk_display_get_fullname       (GdkDisplay *display);
+GdkScreen *         xfce_gdk_display_locate_monitor_with_pointer
+                                                        (GdkDisplay *display,
+                                                         gint *monitor_return);
+gchar *             xfce_gdk_screen_get_fullname        (GdkScreen *screen);
+gboolean            xfce_gdk_spawn_on_screen            (GdkScreen *screen,
+                                                         const gchar *working_directory,
+                                                         gchar **argv,
+                                                         gchar **envp,
+                                                         GSpawnFlags flags,
+                                                         GSpawnChildSetupFunc child_setup,
+                                                         gpointer user_data,
+                                                         gint *child_pid,
+                                                         GError **error);
+gboolean            xfce_gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
+                                                         const gchar *working_directory,
+                                                         gchar **argv,
+                                                         gchar **envp,
+                                                         GSpawnFlags flags,
+                                                         GSpawnChildSetupFunc child_setup,
+                                                         gpointer user_data,
+                                                         gint *child_pid,
+                                                         gint *standard_input,
+                                                         gint *standard_output,
+                                                         gint *standard_error,
+                                                         GError **error);
+gboolean            xfce_gdk_spawn_command_line_on_screen
+                                                        (GdkScreen *screen,
+                                                         const gchar *command_line,
+                                                         GError **error);
-
+

Description

-
+

Details

-
+

xfce_gdk_display_get_fullname ()

-
gchar*              xfce_gdk_display_get_fullname       (GdkDisplay *display);
+
gchar *             xfce_gdk_display_get_fullname       (GdkDisplay *display);

Determines the full qualified name of display. The full name includes both the hostname of the Xserver node and the display number @@ -92,28 +92,25 @@

display :

-A valid Gdk display. - +A valid Gdk display.

Returns :

- The full qualified name of display. - - +The full qualified name of display.

Since 4.2

-
+

xfce_gdk_display_locate_monitor_with_pointer ()

-
GdkScreen*          xfce_gdk_display_locate_monitor_with_pointer
-                                                        (GdkDisplay *display,
-                                                         gint *monitor_return);
+
GdkScreen *         xfce_gdk_display_locate_monitor_with_pointer
+                                                        (GdkDisplay *display,
+                                                         gint *monitor_return);

Locates the monitor and the screen which contains the pointer. If -it is not possible to determine the current pointer position, NULL +it is not possible to determine the current pointer position, NULL is returned.

@@ -121,28 +118,24 @@ - + - + - +

display :

A Gdk display or NULL to choose the default display. -A Gdk display or NULL to choose the default display.

monitor_return :

Address to store the monitor number to or NULL. -Address to store the monitor number to or NULL.

Returns :

 The screen that contains the pointer. - -The screen that contains the pointer.

Since 4.2

-
+

xfce_gdk_screen_get_fullname ()

-
gchar *             xfce_gdk_screen_get_fullname        (GdkScreen *screen);
+
gchar *             xfce_gdk_screen_get_fullname        (GdkScreen *screen);

Like xfce_gdk_display_get_fullname(), but also includes the screen number. @@ -152,35 +145,32 @@

screen :

-A Gdk screen. - +A Gdk screen.

Returns :

- The full qualified name of screen. - - +The full qualified name of screen.

Since 4.2

-
+

xfce_gdk_spawn_on_screen ()

-
gboolean            xfce_gdk_spawn_on_screen            (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         GSpawnChildSetupFunc child_setup,
-                                                         gpointer user_data,
-                                                         gint *child_pid,
-                                                         GError **error);
-

-Like g_spawn_async(), except the child process is spawned in such -an environment that on calling gdk_display_open() it would be -returned a GdkDisplay with screen as the default screen. +

gboolean            xfce_gdk_spawn_on_screen            (GdkScreen *screen,
+                                                         const gchar *working_directory,
+                                                         gchar **argv,
+                                                         gchar **envp,
+                                                         GSpawnFlags flags,
+                                                         GSpawnChildSetupFunc child_setup,
+                                                         gpointer user_data,
+                                                         gint *child_pid,
+                                                         GError **error);
+

+Like g_spawn_async(), except the child process is spawned in such +an environment that on calling gdk_display_open() it would be +returned a GdkDisplay with screen as the default screen.

This is useful for applications which wish to launch an application @@ -191,28 +181,25 @@

screen :

-a GdkScreen +a GdkScreen

working_directory :

-child's current working directory, or NULL to - inherit parent's - +child's current working directory, or NULL to +inherit parent's

argv :

-child's argument vector - +child's argument vector

envp :

-child's environment, or NULL to inherit parent's - +child's environment, or NULL to inherit parent's

flags :

-flags from GSpawnFlags +flags from GSpawnFlags @@ -227,43 +214,41 @@

child_pid :

-return location for child process ID, or NULL +return location for child process ID, or NULL

error :

-return location for error - +return location for error

Returns :

- TRUE on success, FALSE if error is set - - + +TRUE on success, FALSE if error is set

Since 4.2

-
+

xfce_gdk_spawn_on_screen_with_pipes ()

-
gboolean            xfce_gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         GSpawnChildSetupFunc child_setup,
-                                                         gpointer user_data,
-                                                         gint *child_pid,
-                                                         gint *standard_input,
-                                                         gint *standard_output,
-                                                         gint *standard_error,
-                                                         GError **error);
-

-Like g_spawn_async_with_pipes(), except the child process is -spawned in such an environment that on calling gdk_display_open() -it would be returned a GdkDisplay with screen as the default +

gboolean            xfce_gdk_spawn_on_screen_with_pipes (GdkScreen *screen,
+                                                         const gchar *working_directory,
+                                                         gchar **argv,
+                                                         gchar **envp,
+                                                         GSpawnFlags flags,
+                                                         GSpawnChildSetupFunc child_setup,
+                                                         gpointer user_data,
+                                                         gint *child_pid,
+                                                         gint *standard_input,
+                                                         gint *standard_output,
+                                                         gint *standard_error,
+                                                         GError **error);
+

+Like g_spawn_async_with_pipes(), except the child process is +spawned in such an environment that on calling gdk_display_open() +it would be returned a GdkDisplay with screen as the default screen.

@@ -275,28 +260,25 @@

screen :

-a GdkScreen +a GdkScreen

working_directory :

-child's current working directory, or NULL to - inherit parent's - +child's current working directory, or NULL to +inherit parent's

argv :

-child's argument vector - +child's argument vector

envp :

-child's environment, or NULL to inherit parent's - +child's environment, or NULL to inherit parent's

flags :

-flags from GSpawnFlags +flags from GSpawnFlags @@ -311,53 +293,51 @@

child_pid :

-return location for child process ID, or NULL +return location for child process ID, or NULL

standard_input :

-return location for file descriptor to write to - child's stdin, or NULL +return location for file descriptor to write to +child's stdin, or NULL

standard_output :

-return location for file descriptor to read child's - stdout, or NULL +return location for file descriptor to read child's +stdout, or NULL

standard_error :

-return location for file descriptor to read child's - stderr, or NULL +return location for file descriptor to read child's +stderr, or NULL

error :

-return location for error - +return location for error

Returns :

- TRUE on success, FALSE if an error was set - - + +TRUE on success, FALSE if an error was set

Since 4.2

-
+

xfce_gdk_spawn_command_line_on_screen ()

-
gboolean            xfce_gdk_spawn_command_line_on_screen
-                                                        (GdkScreen *screen,
-                                                         const gchar *command_line,
-                                                         GError **error);
-

-Like g_spawn_command_line_async(), except the child process is -spawned in such an environment that on calling gdk_display_open() -it would be returned a GdkDisplay with screen as the default +

gboolean            xfce_gdk_spawn_command_line_on_screen
+                                                        (GdkScreen *screen,
+                                                         const gchar *command_line,
+                                                         GError **error);
+

+Like g_spawn_command_line_async(), except the child process is +spawned in such an environment that on calling gdk_display_open() +it would be returned a GdkDisplay with screen as the default screen.

@@ -369,31 +349,28 @@

screen :

-a GdkScreen +a GdkScreen

command_line :

-a command line - +a command line

error :

-return location for errors - +return location for errors

Returns :

- TRUE on success, FALSE if error is set. - - + +TRUE on success, FALSE if error is set.

Since 4.2

-
+

See Also

Gdk reference manual @@ -402,6 +379,6 @@

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/libxfcegui4-Xfce-Gtk+-extensions.html libxfcegui4-4.10.0/docs/html/libxfcegui4-Xfce-Gtk+-extensions.html --- libxfcegui4-4.8.1/docs/html/libxfcegui4-Xfce-Gtk+-extensions.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/libxfcegui4-Xfce-Gtk+-extensions.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ Description -
+
@@ -35,30 +35,30 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-void                xfce_gtk_window_center_on_monitor   (GtkWindow *window,
-                                                         GdkScreen *screen,
-                                                         gint monitor);
+void                xfce_gtk_window_center_on_monitor   (GtkWindow *window,
+                                                         GdkScreen *screen,
+                                                         gint monitor);
 void                xfce_gtk_window_center_on_monitor_with_pointer
-                                                        (GtkWindow *window);
+                                                        (GtkWindow *window);
-
+

Description

-
+

Details

-
+

xfce_gtk_window_center_on_monitor ()

-
void                xfce_gtk_window_center_on_monitor   (GtkWindow *window,
-                                                         GdkScreen *screen,
-                                                         gint monitor);
+
void                xfce_gtk_window_center_on_monitor   (GtkWindow *window,
+                                                         GdkScreen *screen,
+                                                         gint monitor);

Centers window on monitor of screen. monitor has to reference a valid monitor of screen. @@ -68,28 +68,25 @@

window :

-The Gtk window to center. - +The Gtk window to center.

screen :

-The screen on which the window should be centered. - +The screen on which the window should be centered.

monitor :

-The monitor of the screen on which window should be centered. - +The monitor of the screen on which window should be centered.

Since 4.2

-
+

xfce_gtk_window_center_on_monitor_with_pointer ()

void                xfce_gtk_window_center_on_monitor_with_pointer
-                                                        (GtkWindow *window);
+ (GtkWindow *window);

Determines the monitor that contains the pointer and centers the window on it. If it failes to determine the current pointer position, @@ -100,13 +97,12 @@

window :

-The Gtk window to center. - +The Gtk window to center.
-
+

See Also

Gtk+ reference manual @@ -115,6 +111,6 @@

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/reference.html libxfcegui4-4.10.0/docs/html/reference.html --- libxfcegui4-4.8.1/docs/html/reference.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/reference.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ libxfcegui4 Reference Manual Next -
+

libxfcegui4 Overview

@@ -29,6 +29,6 @@

- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/style.css libxfcegui4-4.10.0/docs/html/style.css --- libxfcegui4-4.8.1/docs/html/style.css 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/style.css 2012-04-28 20:11:34.000000000 +0000 @@ -32,8 +32,9 @@ /* this is needed so that the local anchors are displayed below the naviagtion */ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] { + display: inline-block; position: relative; - padding-top:4.5em; + top:-5em; } /* this seems to be a bug in the xsl style sheets when generating indexes */ div.index div.index diff -Nru libxfcegui4-4.8.1/docs/html/XfceAboutDialog.html libxfcegui4-4.10.0/docs/html/XfceAboutDialog.html --- libxfcegui4-4.8.1/docs/html/XfceAboutDialog.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceAboutDialog.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,7 +32,7 @@ Properties -
+
@@ -41,7 +41,7 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
@@ -50,71 +50,71 @@
                     XfceAboutDialog;
 #define             XFCE_COPYRIGHT_TEXT                 (years,
                                                          owner)
-XfceAboutInfo *     xfce_about_info_new                 (const gchar *program,
-                                                         const gchar *version,
-                                                         const gchar *description,
-                                                         const gchar *copyright,
-                                                         const gchar *license);
+XfceAboutInfo *     xfce_about_info_new                 (const gchar *program,
+                                                         const gchar *version,
+                                                         const gchar *description,
+                                                         const gchar *copyright,
+                                                         const gchar *license);
 void                xfce_about_info_free                (XfceAboutInfo *info);
 void                xfce_about_info_set_homepage        (XfceAboutInfo *info,
-                                                         const gchar *homepage);
+                                                         const gchar *homepage);
 void                xfce_about_info_add_credit          (XfceAboutInfo *info,
-                                                         const gchar *name,
-                                                         const gchar *mail,
-                                                         const gchar *task);
-GtkWidget*          xfce_about_dialog_new               (GtkWindow *parent,
+                                                         const gchar *name,
+                                                         const gchar *mail,
+                                                         const gchar *task);
+GtkWidget *         xfce_about_dialog_new               (GtkWindow *parent,
                                                          const XfceAboutInfo *info,
-                                                         GdkPixbuf *icon);
+                                                         GdkPixbuf *icon);
-
+

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkWindow
-                                       +----GtkDialog
+  GObject
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkWindow
+                                       +----GtkDialog
                                              +----XfceAboutDialog
-
+

Implemented Interfaces

XfceAboutDialog implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

-
+

Properties

-  "copyright"                gchar*                : Read / Write
-  "description"              gchar*                : Read / Write
-  "homepage"                 gchar*                : Read / Write
-  "icon"                     GdkPixbuf*            : Read / Write
-  "license"                  gchar*                : Read / Write
-  "program"                  gchar*                : Read / Write
-  "version"                  gchar*                : Read / Write
+  "copyright"                gchar*                : Read / Write
+  "description"              gchar*                : Read / Write
+  "homepage"                 gchar*                : Read / Write
+  "icon"                     GdkPixbuf*            : Read / Write
+  "license"                  gchar*                : Read / Write
+  "program"                  gchar*                : Read / Write
+  "version"                  gchar*                : Read / Write
-
+

Description

A dialog box widget containing all of the relevant credit information.

-
+

Details

-
+

XfceAboutInfo

typedef struct _XfceAboutInfo XfceAboutInfo;

-
+

XfceAboutDialog

typedef struct _XfceAboutDialog XfceAboutDialog;

@@ -123,7 +123,7 @@

-
+

XFCE_COPYRIGHT_TEXT()

#define XFCE_COPYRIGHT_TEXT(years, owner) ("Copyright (c) " years "\n" owner "\nAll rights reserved.")
@@ -135,70 +135,62 @@

years :

-year information (e.g. "2002-2004"). - +year information (e.g. "2002-2004").

owner :

-the copyright owner. - +the copyright owner.
-
+

xfce_about_info_new ()

-
XfceAboutInfo *     xfce_about_info_new                 (const gchar *program,
-                                                         const gchar *version,
-                                                         const gchar *description,
-                                                         const gchar *copyright,
-                                                         const gchar *license);
+
XfceAboutInfo *     xfce_about_info_new                 (const gchar *program,
+                                                         const gchar *version,
+                                                         const gchar *description,
+                                                         const gchar *copyright,
+                                                         const gchar *license);
- + - + - + +parameter is optional. If set to NULL, a default copyright +text will be choosen. +or can be one of the builtin license constants, which are +limited to XFCE_LICENSE_BSD, XFCE_LICENSE_GPL and +XFCE_LICENSE_LGPL currently. If NULL, no license text will +be displayed. - +

program :

program name (e.g. "xfce4-session") -program name (e.g. "xfce4-session")

version :

application version. -application version.

description :

short descriptive text (e.g. "Xfce session manager"). -short descriptive text (e.g. "Xfce session manager").

copyright :

 copyright text, use the XFCE_COPYRIGHT_TEXT macro. This - parameter is optional. If set to NULL, a default copyright - text will be choosen. -

license :

 optional license text, can either be the text of a license - or can be one of the builtin license constants, which are - limited to XFCE_LICENSE_BSD, XFCE_LICENSE_GPL and - XFCE_LICENSE_LGPL currently. If NULL, no license text will - be displayed. -

Returns :

 the new XfceAboutInfo object or NULL on error. The result - needs to be freed using xfce_about_info_free(). -the new XfceAboutInfo object or NULL on error. The result +needs to be freed using xfce_about_info_free().
-
+

xfce_about_info_free ()

void                xfce_about_info_free                (XfceAboutInfo *info);

@@ -208,16 +200,15 @@

info :

-an XfceAboutInfo. - +an XfceAboutInfo.
-
+

xfce_about_info_set_homepage ()

void                xfce_about_info_set_homepage        (XfceAboutInfo *info,
-                                                         const gchar *homepage);
+ const gchar *homepage);

Associates a homepage with the info object.

@@ -226,25 +217,23 @@

info :

-an XfceAboutInfo. - +an XfceAboutInfo.

homepage :

the URL of the projects website, has to be a valid URL, that - can be loaded by a webbrowser. - +can be loaded by a webbrowser.
-
+

xfce_about_info_add_credit ()

void                xfce_about_info_add_credit          (XfceAboutInfo *info,
-                                                         const gchar *name,
-                                                         const gchar *mail,
-                                                         const gchar *task);
+ const gchar *name, + const gchar *mail, + const gchar *task);

Adds a credit to the info object.

@@ -253,109 +242,99 @@

info :

-an XfceAboutInfo. - +an XfceAboutInfo.

name :

-the full name of the person. - +the full name of the person.

mail :

-the persons email address. - +the persons email address.

task :

-the persons task in the project. - +the persons task in the project.
-
+

xfce_about_dialog_new ()

-
GtkWidget*          xfce_about_dialog_new               (GtkWindow *parent,
+
GtkWidget *         xfce_about_dialog_new               (GtkWindow *parent,
                                                          const XfceAboutInfo *info,
-                                                         GdkPixbuf *icon);

+                                                         GdkPixbuf *icon);
- + - + - + - +

parent :

parent window or NULL. -parent window or NULL.

info :

an XfceAboutInfo object with the about info. -an XfceAboutInfo object with the about info.

icon :

an optional icon, if NULL, no icon will be displayed. -an optional icon, if NULL, no icon will be displayed.

Returns :

 the newly allocated dialog widget. - -Deprecated: Use xfce_about_dialog_new_with_values instead. - -the newly allocated dialog widget. +Deprecated: Use xfce_about_dialog_new_with_values instead.
-
+

Property Details

-
+

The "copyright" property

-
  "copyright"                gchar*                : Read / Write
+
  "copyright"                gchar*                : Read / Write

Program Copyright.

Default value: NULL

-
+

The "description" property

-
  "description"              gchar*                : Read / Write
+
  "description"              gchar*                : Read / Write

Program Description.

Default value: NULL

-
+

The "homepage" property

-
  "homepage"                 gchar*                : Read / Write
+
  "homepage"                 gchar*                : Read / Write

Program Homepage.

Default value: NULL

-
+

The "icon" property

-
  "icon"                     GdkPixbuf*            : Read / Write
+
  "icon"                     GdkPixbuf*            : Read / Write

icon to use, if any.

-
+

The "license" property

-
  "license"                  gchar*                : Read / Write
+
  "license"                  gchar*                : Read / Write

Program License.

Default value: NULL

-
+

The "program" property

-
  "program"                  gchar*                : Read / Write
+
  "program"                  gchar*                : Read / Write

Program Name.

Default value: NULL

-
+

The "version" property

-
  "version"                  gchar*                : Read / Write
+
  "version"                  gchar*                : Read / Write

Program Version.

Default value: NULL

@@ -363,6 +342,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/XfceAppMenuItem.html libxfcegui4-4.10.0/docs/html/XfceAppMenuItem.html --- libxfcegui4-4.8.1/docs/html/XfceAppMenuItem.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceAppMenuItem.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,114 +32,114 @@ Properties -
+

XfceAppMenuItem

-

XfceAppMenuItem — a GtkMenuItem for app launchers.

+

XfceAppMenuItem — a GtkMenuItem for app launchers.
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-                    XfceAppMenuItem;
-GtkWidget *         xfce_app_menu_item_new              (void);
-GtkWidget *         xfce_app_menu_item_new_with_label   (const gchar *label);
-GtkWidget *         xfce_app_menu_item_new_with_mnemonic
-                                                        (const gchar *label);
-GtkWidget *         xfce_app_menu_item_new_with_command (const gchar *label,
-                                                         const gchar *command);
-GtkWidget *         xfce_app_menu_item_new_full         (const gchar *label,
-                                                         const gchar *command,
-                                                         const gchar *icon_filename,
-                                                         gboolean needs_term,
-                                                         gboolean snotify);
-GtkWidget *         xfce_app_menu_item_new_from_desktop_entry
-                                                        (XfceDesktopEntry *entry,
-                                                         gboolean show_icon);
+struct              XfceAppMenuItem;
+GtkWidget *         xfce_app_menu_item_new              (void);
+GtkWidget *         xfce_app_menu_item_new_with_label   (const gchar *label);
+GtkWidget *         xfce_app_menu_item_new_with_mnemonic
+                                                        (const gchar *label);
+GtkWidget *         xfce_app_menu_item_new_with_command (const gchar *label,
+                                                         const gchar *command);
+GtkWidget *         xfce_app_menu_item_new_full         (const gchar *label,
+                                                         const gchar *command,
+                                                         const gchar *icon_filename,
+                                                         gboolean needs_term,
+                                                         gboolean snotify);
+GtkWidget *         xfce_app_menu_item_new_from_desktop_entry
+                                                        (gpointer *entry,
+                                                         gboolean show_icon);
 void                xfce_app_menu_item_set_name         (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *name);
+                                                         const gchar *name);
 void                xfce_app_menu_item_set_icon_name    (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *filename);
+                                                         const gchar *filename);
 void                xfce_app_menu_item_set_command      (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *command);
+                                                         const gchar *command);
 void                xfce_app_menu_item_set_needs_term   (XfceAppMenuItem *app_menu_item,
-                                                         gboolean needs_term);
+                                                         gboolean needs_term);
 void                xfce_app_menu_item_set_startup_notification
                                                         (XfceAppMenuItem *app_menu_item,
-                                                         gboolean snotify);
+                                                         gboolean snotify);
 #define             xfce_app_menu_item_set_image        (mi,
                                                          img)
-const gchar *       xfce_app_menu_item_get_name         (XfceAppMenuItem *app_menu_item);
-const gchar *       xfce_app_menu_item_get_icon_name    (XfceAppMenuItem *app_menu_item);
-const gchar *       xfce_app_menu_item_get_command      (XfceAppMenuItem *app_menu_item);
-gboolean            xfce_app_menu_item_get_needs_term   (XfceAppMenuItem *app_menu_item);
-gboolean            xfce_app_menu_item_get_startup_notification
+const gchar *       xfce_app_menu_item_get_name         (XfceAppMenuItem *app_menu_item);
+const gchar *       xfce_app_menu_item_get_icon_name    (XfceAppMenuItem *app_menu_item);
+const gchar *       xfce_app_menu_item_get_command      (XfceAppMenuItem *app_menu_item);
+gboolean            xfce_app_menu_item_get_needs_term   (XfceAppMenuItem *app_menu_item);
+gboolean            xfce_app_menu_item_get_startup_notification
                                                         (XfceAppMenuItem *app_menu_item);
 #define             xfce_app_menu_item_get_image        (mi)
-void                xfce_app_menu_item_set_icon_size    (guint icon_size);
+void                xfce_app_menu_item_set_icon_size    (guint icon_size);
 void                xfce_app_menu_item_set_icon_theme_name
-                                                        (const gchar *theme_name);
+                                                        (const gchar *theme_name);
-
+

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkItem
-                                       +----GtkMenuItem
-                                             +----GtkImageMenuItem
+  GObject
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkItem
+                                       +----GtkMenuItem
+                                             +----GtkImageMenuItem
                                                    +----XfceAppMenuItem
-
+

Implemented Interfaces

XfceAppMenuItem implements - AtkImplementorIface, GtkBuildable and GtkActivatable.

+ AtkImplementorIface, GtkBuildable and GtkActivatable.

-
+

Properties

-  "command"                  gchar*                : Read / Write
-  "icon-name"                gchar*                : Read / Write
-  "label"                    gchar*                : Read / Write
-  "needs-term"               gboolean              : Read / Write
-  "snotify"                  gboolean              : Read / Write
-  "use-underline"            gboolean              : Read / Write
+  "command"                  gchar*                : Read / Write
+  "icon-name"                gchar*                : Read / Write
+  "label"                    gchar*                : Read / Write
+  "needs-term"               gboolean              : Read / Write
+  "snotify"                  gboolean              : Read / Write
+  "use-underline"            gboolean              : Read / Write
-
+

Description

-XfceAppMenuItem is a direct subclass of GtkImageMenuItem, and is intended for +XfceAppMenuItem is a direct subclass of GtkImageMenuItem, and is intended for use in application menus. XfceAppMenuItem essentially wraps an application: it knows how to run the application, what it is called, and what icon is used to represent it. An XfceAppMenuItem can also be generated directly from an XfceDesktopEntry.

-
+

Details

-
-

XfceAppMenuItem

-
typedef struct _XfceAppMenuItem XfceAppMenuItem;
+
+

struct XfceAppMenuItem

+
struct XfceAppMenuItem;

-
+

xfce_app_menu_item_new ()

-
GtkWidget *         xfce_app_menu_item_new              (void);
+
GtkWidget *         xfce_app_menu_item_new              (void);

Creates a new XfceAppMenuItem with an empty label.

@@ -150,15 +150,14 @@

Returns :

-A new XfceAppMenuItem. - +A new XfceAppMenuItem.
-
+

xfce_app_menu_item_new_with_label ()

-
GtkWidget *         xfce_app_menu_item_new_with_label   (const gchar *label);
+
GtkWidget *         xfce_app_menu_item_new_with_label   (const gchar *label);

Creates a new XfceAppMenuItem containing a label.

@@ -170,25 +169,23 @@

label :

-The text of the menu item. - +The text of the menu item.

Returns :

-A new XfceAppMenuItem. - +A new XfceAppMenuItem.
-
+

xfce_app_menu_item_new_with_mnemonic ()

-
GtkWidget *         xfce_app_menu_item_new_with_mnemonic
-                                                        (const gchar *label);
+
GtkWidget *         xfce_app_menu_item_new_with_mnemonic
+                                                        (const gchar *label);

Creates a new XfceAppMenuItem containing a label. The label -will be created using gtk_label_new_with_mnemonic(), so underscores +will be created using gtk_label_new_with_mnemonic(), so underscores in label indicate the mnemonic for the menu item.

@@ -200,22 +197,20 @@

label :

The text of the menu item, with an underscore in front of the - mnemonic character. - +mnemonic character.

Returns :

-A new XfceAppMenuItem. - +A new XfceAppMenuItem.
-
+

xfce_app_menu_item_new_with_command ()

-
GtkWidget *         xfce_app_menu_item_new_with_command (const gchar *label,
-                                                         const gchar *command);
+
GtkWidget *         xfce_app_menu_item_new_with_command (const gchar *label,
+                                                         const gchar *command);

Creates a new XfceAppMenuItem containing a label. The item's activate signal will be connected such that command will run when it is clicked. @@ -228,30 +223,27 @@

label :

-The text of the menu item. - +The text of the menu item.

command :

-The command associated with the menu item. - +The command associated with the menu item.

Returns :

-A new XfceAppMenuItem. - +A new XfceAppMenuItem.
-
+

xfce_app_menu_item_new_full ()

-
GtkWidget *         xfce_app_menu_item_new_full         (const gchar *label,
-                                                         const gchar *command,
-                                                         const gchar *icon_filename,
-                                                         gboolean needs_term,
-                                                         gboolean snotify);
+
GtkWidget *         xfce_app_menu_item_new_full         (const gchar *label,
+                                                         const gchar *command,
+                                                         const gchar *icon_filename,
+                                                         gboolean needs_term,
+                                                         gboolean snotify);

Single-function interface to create an XfceAppMenuItem. Has the effect of calling xfce_app_menu_item_new_with_label() followed by all the @@ -265,44 +257,38 @@

label :

-The text of the menu item. - +The text of the menu item.

command :

-The command associated with the menu item. - +The command associated with the menu item.

icon_filename :

-The filename of the icon. - +The filename of the icon.

needs_term :

-TRUE if the application needs a terminal, FALSE if not. - +TRUE if the application needs a terminal, FALSE if not.

snotify :

TRUE if the application supports startup notification, FALSE if - not. - +not.

Returns :

-A new XfceAppMenuItem. - +A new XfceAppMenuItem.
-
+

xfce_app_menu_item_new_from_desktop_entry ()

-
GtkWidget *         xfce_app_menu_item_new_from_desktop_entry
-                                                        (XfceDesktopEntry *entry,
-                                                         gboolean show_icon);
+
GtkWidget *         xfce_app_menu_item_new_from_desktop_entry
+                                                        (gpointer *entry,
+                                                         gboolean show_icon);

Creates a new XfceAppMenuItem using parameters from the application specified in a XfceDesktopEntry object. This has the effect of calling @@ -311,6 +297,10 @@ xfce_app_menu_item_set_startup_notification().

+In Xfce 4.10 this function only returns NULL, since XfceDesktopEntry was +removed from libxfce4util. +

+

Since 4.1

@@ -318,27 +308,24 @@ - + - + - +

entry :

An XfceDesktopEntry describing the menu item to create. -An XfceDesktopEntry describing the menu item to create.

show_icon :

Sets whether or not to show an icon in the menu item. -Sets whether or not to show an icon in the menu item.

Returns :

A new XfceAppMenuItem, or NULL on error. -A new XfceAppMenuItem, or NULL on error.
-
+

xfce_app_menu_item_set_name ()

void                xfce_app_menu_item_set_name         (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *name);
+ const gchar *name);

Sets name as the displayed name of the XfceAppMenuItem.

@@ -350,22 +337,20 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

name :

-The name of the menu item the menu item. - +The name of the menu item the menu item.
-
+

xfce_app_menu_item_set_icon_name ()

void                xfce_app_menu_item_set_icon_name    (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *filename);
+ const gchar *filename);

Sets the icon of the XfceAppMenuItem using the specified filename. If the filename doesn't have a full pathname, standard icon search paths @@ -381,22 +366,20 @@

app_menu_item :

-an XfceAppMenuItem. - +an XfceAppMenuItem.

filename :

-The filename of the icon. - +The filename of the icon.
-
+

xfce_app_menu_item_set_command ()

void                xfce_app_menu_item_set_command      (XfceAppMenuItem *app_menu_item,
-                                                         const gchar *command);
+ const gchar *command);

Sets command as the command run when the XfceAppMenuItem is clicked.

@@ -408,22 +391,20 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

command :

-The command to associate with the menu item. - +The command to associate with the menu item.
-
+

xfce_app_menu_item_set_needs_term ()

void                xfce_app_menu_item_set_needs_term   (XfceAppMenuItem *app_menu_item,
-                                                         gboolean needs_term);
+ gboolean needs_term);

Sets whether or not the command executed by this XfceAppMenuItem requires a terminal window to run. @@ -436,23 +417,21 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

needs_term :

-TRUE if the application needs a terminal, FALSE if not. - +TRUE if the application needs a terminal, FALSE if not.
-
+

xfce_app_menu_item_set_startup_notification ()

void                xfce_app_menu_item_set_startup_notification
                                                         (XfceAppMenuItem *app_menu_item,
-                                                         gboolean snotify);
+ gboolean snotify);

Sets whether or not the application supports startup notification.

@@ -464,25 +443,23 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

snotify :

TRUE if the application supports startup notification, FALSE if - not. - +not.
-
+

xfce_app_menu_item_set_image()

#define xfce_app_menu_item_set_image(mi, img) gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img)

-Sets img as the GtkImage widget that displays the icon for XfceAppMenuItem +Sets img as the GtkImage widget that displays the icon for XfceAppMenuItem mi.

@@ -490,21 +467,19 @@ - + - +

mi :

An XfceAppMenuItem. -An XfceAppMenuItem.

img :

A GtkImage. -A GtkImage.
-
+

xfce_app_menu_item_get_name ()

-
const gchar *       xfce_app_menu_item_get_name         (XfceAppMenuItem *app_menu_item);
+
const gchar *       xfce_app_menu_item_get_name         (XfceAppMenuItem *app_menu_item);

Returns the current name/label set for the XfceAppMenuItem, or NULL.

@@ -516,21 +491,19 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

Returns :

-A name/label string. - +A name/label string.
-
+

xfce_app_menu_item_get_icon_name ()

-
const gchar *       xfce_app_menu_item_get_icon_name    (XfceAppMenuItem *app_menu_item);
+
const gchar *       xfce_app_menu_item_get_icon_name    (XfceAppMenuItem *app_menu_item);

Returns the current icon name set for the XfceAppMenuItem, or NULL.

@@ -542,21 +515,19 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

Returns :

-An icon name string. - +An icon name string.
-
+

xfce_app_menu_item_get_command ()

-
const gchar *       xfce_app_menu_item_get_command      (XfceAppMenuItem *app_menu_item);
+
const gchar *       xfce_app_menu_item_get_command      (XfceAppMenuItem *app_menu_item);

Returns the current command set for the XfceAppMenuItem, or NULL.

@@ -568,21 +539,19 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

Returns :

-A command string. - +A command string.
-
+

xfce_app_menu_item_get_needs_term ()

-
gboolean            xfce_app_menu_item_get_needs_term   (XfceAppMenuItem *app_menu_item);
+
gboolean            xfce_app_menu_item_get_needs_term   (XfceAppMenuItem *app_menu_item);

Checks whether or not the command executed by this XfceAppMenuItem requires a terminal window to run. @@ -595,21 +564,19 @@

app_menu_item :

-An XfceAppMenuItem. - +An XfceAppMenuItem.

Returns :

-TRUE if the item will spawn a terminal, FALSE if not. - +TRUE if the item will spawn a terminal, FALSE if not.
-
+

xfce_app_menu_item_get_startup_notification ()

-
gboolean            xfce_app_menu_item_get_startup_notification
+
gboolean            xfce_app_menu_item_get_startup_notification
                                                         (XfceAppMenuItem *app_menu_item);

 

 Checks whether or not the command executed by this XfceAppMenuItem supports
@@ -623,46 +590,42 @@
 
 
 
app_menu_item :

-An XfceAppMenuItem.
-
+An XfceAppMenuItem.
 
 
 
Returns :

-TRUE if the item supports startup notification, FALSE if not.
-
+TRUE if the item supports startup notification, FALSE if not.
-
+

xfce_app_menu_item_get_image()

#define xfce_app_menu_item_get_image(mi) gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(mi))

-Gets the GtkImage widget associated with XfceAppMenuItem mi. +Gets the GtkImage widget associated with XfceAppMenuItem mi.

- + - +

mi :

An XfceAppMenuItem. -An XfceAppMenuItem.

Returns :

A GtkImage. -A GtkImage.
-
+

xfce_app_menu_item_set_icon_size ()

-
void                xfce_app_menu_item_set_icon_size    (guint icon_size);
-
+
void                xfce_app_menu_item_set_icon_size    (guint icon_size);
+

Warning

xfce_app_menu_item_set_icon_size is deprecated and should not be used in newly-written code. This function currently does nothing; the 'menu' icon size is always used. @@ -679,16 +642,15 @@

icon_size :

-An icon size, in pixels. - +An icon size, in pixels.
-
+

xfce_app_menu_item_set_icon_theme_name ()

void                xfce_app_menu_item_set_icon_theme_name
-                                                        (const gchar *theme_name);
+ (const gchar *theme_name);

Sets the icon theme name that should be used when looking for icons for XfceAppMenuItems. This is a static method and does not need an instance @@ -701,52 +663,51 @@

theme_name :

-A theme name. - +A theme name.
-
+

Property Details

-
+

The "command" property

-
  "command"                  gchar*                : Read / Write
+
  "command"                  gchar*                : Read / Write

The command to run when the item is clicked.

Default value: NULL

-
+

The "icon-name" property

-
  "icon-name"                gchar*                : Read / Write
+
  "icon-name"                gchar*                : Read / Write

The name of the themed icon to display next to the item.

Default value: NULL

-
+

The "label" property

-
  "label"                    gchar*                : Read / Write
+
  "label"                    gchar*                : Read / Write

The label displayed in the item.

Default value: NULL

-
+

The "needs-term" property

-
  "needs-term"               gboolean              : Read / Write
+
  "needs-term"               gboolean              : Read / Write

Whether or not the command needs a terminal to execute.

Default value: FALSE

-
+

The "snotify" property

-
  "snotify"                  gboolean              : Read / Write
+
  "snotify"                  gboolean              : Read / Write

Whether or not the app supports startup notification.

Default value: FALSE

-
+

The "use-underline" property

-
  "use-underline"            gboolean              : Read / Write
+
  "use-underline"            gboolean              : Read / Write

Whether or not to use an underscore in the label as a keyboard mnemonic.

Default value: FALSE

@@ -754,6 +715,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/XfceFramebox.html libxfcegui4-4.10.0/docs/html/XfceFramebox.html --- libxfcegui4-4.8.1/docs/html/XfceFramebox.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceFramebox.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Implemented Interfaces -
+
@@ -39,107 +39,50 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
                     XfceFramebox;
-GtkWidget *         xfce_framebox_new                   (const gchar *text,
-                                                         gboolean indent);
-void                xfce_framebox_add                   (XfceFramebox *framebox,
-                                                         GtkWidget *widget);
-
+

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkFrame
+  GObject
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkFrame
                                        +----XfceFramebox
-
+

Implemented Interfaces

XfceFramebox implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

-
+

Description

-
+

Details

-
+

XfceFramebox

typedef struct _XfceFramebox XfceFramebox;

-
-
-

xfce_framebox_new ()

-
GtkWidget *         xfce_framebox_new                   (const gchar *text,
-                                                         gboolean indent);
-

-Creates a new XfceFramebox container widget. -

-
-- - - - - - - - - - - - - - -

text :

header text. -

indent :

if TRUE, the children will be indented. -

Returns :

 the newly allocated XfceFramebox container widget. -
-
-
-
-

xfce_framebox_add ()

-
void                xfce_framebox_add                   (XfceFramebox *framebox,
-                                                         GtkWidget *widget);
-

-Adds a child widget to the framebox container widget. -

-
-- - - - - - - - - - -

framebox :

an XfceFramebox object. -

widget :

child widget to add to the framebox container. -
-
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/XfceHeading.html libxfcegui4-4.10.0/docs/html/XfceHeading.html --- libxfcegui4-4.8.1/docs/html/XfceHeading.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceHeading.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,7 +32,7 @@ Properties -
+
@@ -41,69 +41,69 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
                     XfceHeading;
-GtkWidget *         xfce_heading_new                    (void);
-GdkPixbuf *         xfce_heading_get_icon               (XfceHeading *heading);
+GtkWidget *         xfce_heading_new                    (void);
+GdkPixbuf *         xfce_heading_get_icon               (XfceHeading *heading);
 void                xfce_heading_set_icon               (XfceHeading *heading,
-                                                         GdkPixbuf *icon);
-const gchar *       xfce_heading_get_icon_name          (XfceHeading *heading);
+                                                         GdkPixbuf *icon);
+const gchar *       xfce_heading_get_icon_name          (XfceHeading *heading);
 void                xfce_heading_set_icon_name          (XfceHeading *heading,
-                                                         const gchar *icon_name);
-const gchar *       xfce_heading_get_subtitle           (XfceHeading *heading);
+                                                         const gchar *icon_name);
+const gchar *       xfce_heading_get_subtitle           (XfceHeading *heading);
 void                xfce_heading_set_subtitle           (XfceHeading *heading,
-                                                         const gchar *subtitle);
-const gchar *       xfce_heading_get_title              (XfceHeading *heading);
+                                                         const gchar *subtitle);
+const gchar *       xfce_heading_get_title              (XfceHeading *heading);
 void                xfce_heading_set_title              (XfceHeading *heading,
-                                                         const gchar *title);
+                                                         const gchar *title);
-
+

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
+  GObject
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
                      +----XfceHeading
-
+

Implemented Interfaces

XfceHeading implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

-
+

Properties

-  "icon"                     GdkPixbuf*            : Read / Write
-  "icon-name"                gchar*                : Read / Write
-  "subtitle"                 gchar*                : Read / Write
-  "title"                    gchar*                : Read / Write
+  "icon"                     GdkPixbuf*            : Read / Write
+  "icon-name"                gchar*                : Read / Write
+  "subtitle"                 gchar*                : Read / Write
+  "title"                    gchar*                : Read / Write
-
+

Description

-
+

Details

-
+

XfceHeading

typedef struct _XfceHeading XfceHeading;

-
+

xfce_heading_new ()

-
GtkWidget *         xfce_heading_new                    (void);
+
GtkWidget *         xfce_heading_new                    (void);

Allocates a new XfceHeading instance.

@@ -111,48 +111,43 @@

Returns :

- the newly allocated XfceHeading. - - +the newly allocated XfceHeading.

Since 4.4.0

-
+

xfce_heading_get_icon ()

-
GdkPixbuf *         xfce_heading_get_icon               (XfceHeading *heading);
+
GdkPixbuf *         xfce_heading_get_icon               (XfceHeading *heading);

-Returns the GdkPixbuf that was set as icon for -heading or NULL if no icon is set. The returned -GdkPixbuf object is owned by heading. +Returns the GdkPixbuf that was set as icon for +heading or NULL if no icon is set. The returned +GdkPixbuf object is owned by heading.

- + - +

heading :

a XfceHeading. -a XfceHeading.

Returns :

 the icon for heading, or NULL. - -the icon for heading, or NULL.

Since 4.4.0

-
+

xfce_heading_set_icon ()

void                xfce_heading_set_icon               (XfceHeading *heading,
-                                                         GdkPixbuf *icon);
+ GdkPixbuf *icon);

-If icon is not NULL, heading will display the new icon -aside the title. Else, if icon is NULL no icon is displayed +If icon is not NULL, heading will display the new icon +aside the title. Else, if icon is NULL no icon is displayed unless an icon name was set with xfce_heading_set_icon_name().

@@ -160,25 +155,23 @@ - + - +

heading :

a XfceHeading. -a XfceHeading.

icon :

the new icon or NULL. -the new icon or NULL.

Since 4.4.0

-
+

xfce_heading_get_icon_name ()

-
const gchar *       xfce_heading_get_icon_name          (XfceHeading *heading);
+
const gchar *       xfce_heading_get_icon_name          (XfceHeading *heading);

Returns the icon name previously set by a call to -xfce_heading_set_icon_name() or NULL if no icon name +xfce_heading_set_icon_name() or NULL if no icon name is set for heading.

@@ -186,27 +179,24 @@ - + - +

heading :

a XfceHeading. -a XfceHeading.

Returns :

 the icon name for heading, or NULL. - -the icon name for heading, or NULL.

Since 4.4.0

-
+

xfce_heading_set_icon_name ()

void                xfce_heading_set_icon_name          (XfceHeading *heading,
-                                                         const gchar *icon_name);
+ const gchar *icon_name);

-If icon_name is not NULL and the "icon" property is set to -NULL, see xfce_heading_set_icon(), the heading will display +If icon_name is not NULL and the "icon" property is set to +NULL, see xfce_heading_set_icon(), the heading will display the name icon identified by the icon_name.

@@ -214,25 +204,23 @@ - + - +

heading :

a XfceHeading. -a XfceHeading.

icon_name :

the new icon name, or NULL. -the new icon name, or NULL.

Since 4.4.0

-
+

xfce_heading_get_subtitle ()

-
const gchar *       xfce_heading_get_subtitle           (XfceHeading *heading);
+
const gchar *       xfce_heading_get_subtitle           (XfceHeading *heading);

Returns the sub title displayed below the -main title of the heading, or NULL if +main title of the heading, or NULL if no subtitle is set.

@@ -240,26 +228,23 @@ - + - +

heading :

a XfceHeading. -a XfceHeading.

Returns :

 the subtitle of heading, or NULL. - -the subtitle of heading, or NULL.

Since 4.4.0

-
+

xfce_heading_set_subtitle ()

void                xfce_heading_set_subtitle           (XfceHeading *heading,
-                                                         const gchar *subtitle);
+ const gchar *subtitle);

-If subtitle is not NULL and not the empty string, it +If subtitle is not NULL and not the empty string, it will be displayed by heading below the main title.

@@ -267,22 +252,20 @@ - + - +

heading :

a XfceHeading. -a XfceHeading.

subtitle :

the new subtitle for heading, or NULL. -the new subtitle for heading, or NULL.

Since 4.4.0

-
+

xfce_heading_get_title ()

-
const gchar *       xfce_heading_get_title              (XfceHeading *heading);
+
const gchar *       xfce_heading_get_title              (XfceHeading *heading);

Returns the title displayed by the heading.

@@ -291,24 +274,21 @@

heading :

-a XfceHeading. - +a XfceHeading.

Returns :

- the title displayed by the heading. - - +the title displayed by the heading.

Since 4.4.0

-
+

xfce_heading_set_title ()

void                xfce_heading_set_title              (XfceHeading *heading,
-                                                         const gchar *title);
+ const gchar *title);

Sets the title displayed by the heading to the specified title. @@ -318,59 +298,57 @@

heading :

-a XfceHeading. - +a XfceHeading.

title :

-the new title for the heading. - +the new title for the heading.

Since 4.4.0

-
+

Property Details

-
+

The "icon" property

-
  "icon"                     GdkPixbuf*            : Read / Write
+
  "icon"                     GdkPixbuf*            : Read / Write

-The GdkPixbuf to display as icon, or NULL to use the +The GdkPixbuf to display as icon, or NULL to use the "icon-name" property.

Since 4.4.0

-
+

The "icon-name" property

-
  "icon-name"                gchar*                : Read / Write
+
  "icon-name"                gchar*                : Read / Write

-If the "icon" property value is NULL this is the name of +If the "icon" property value is NULL this is the name of the icon to display instead (looked up using the icon theme). -If this property is also NULL or the specified icon does not +If this property is also NULL or the specified icon does not exist in the selected icon theme, no icon will be displayed.

Default value: NULL

Since 4.4.0

-
+

The "subtitle" property

-
  "subtitle"                 gchar*                : Read / Write
+
  "subtitle"                 gchar*                : Read / Write

The sub title that should be displayed below the -title. May be NULL or the empty string to display +title. May be NULL or the empty string to display only the title.

Default value: NULL

Since 4.4.0

-
+

The "title" property

-
  "title"                    gchar*                : Read / Write
+
  "title"                    gchar*                : Read / Write

The title text to display in the heading.

@@ -381,6 +359,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/XfceIconTheme.html libxfcegui4-4.10.0/docs/html/XfceIconTheme.html --- libxfcegui4-4.8.1/docs/html/XfceIconTheme.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceIconTheme.html 2012-04-28 20:11:34.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -30,7 +30,7 @@ Signals -
+
@@ -39,60 +39,59 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
-                    XfceIconTheme;
+struct              XfceIconTheme;
 enum                XfceIconThemeCategory;
-XfceIconTheme *     xfce_icon_theme_get_for_screen      (GdkScreen *screen);
-gchar *             xfce_icon_theme_lookup              (XfceIconTheme *icon_theme,
-                                                         const gchar *icon_name,
-                                                         gint icon_size);
-gchar *             xfce_icon_theme_lookup_list         (XfceIconTheme *icon_theme,
-                                                         GList *icon_names,
-                                                         gint icon_size);
-gchar *             xfce_icon_theme_lookup_category     (XfceIconTheme *icon_theme,
+XfceIconTheme *     xfce_icon_theme_get_for_screen      (GdkScreen *screen);
+gchar *             xfce_icon_theme_lookup              (XfceIconTheme *icon_theme,
+                                                         const gchar *icon_name,
+                                                         gint icon_size);
+gchar *             xfce_icon_theme_lookup_list         (XfceIconTheme *icon_theme,
+                                                         GList *icon_names,
+                                                         gint icon_size);
+gchar *             xfce_icon_theme_lookup_category     (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category,
-                                                         gint icon_size);
-GdkPixbuf *         xfce_icon_theme_load                (XfceIconTheme *icon_theme,
-                                                         const gchar *icon_name,
-                                                         gint icon_size);
-GdkPixbuf *         xfce_icon_theme_load_list           (XfceIconTheme *icon_theme,
-                                                         GList *icon_names,
-                                                         gint icon_size);
-GdkPixbuf *         xfce_icon_theme_load_category       (XfceIconTheme *icon_theme,
+                                                         gint icon_size);
+GdkPixbuf *         xfce_icon_theme_load                (XfceIconTheme *icon_theme,
+                                                         const gchar *icon_name,
+                                                         gint icon_size);
+GdkPixbuf *         xfce_icon_theme_load_list           (XfceIconTheme *icon_theme,
+                                                         GList *icon_names,
+                                                         gint icon_size);
+GdkPixbuf *         xfce_icon_theme_load_category       (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category,
-                                                         gint icon_size);
-GList *             xfce_icon_theme_get_search_path     (XfceIconTheme *icon_theme);
+                                                         gint icon_size);
+GList *             xfce_icon_theme_get_search_path     (XfceIconTheme *icon_theme);
 void                xfce_icon_theme_set_search_path     (XfceIconTheme *icon_theme,
-                                                         GList *search_paths);
+                                                         GList *search_paths);
 void                xfce_icon_theme_prepend_search_path (XfceIconTheme *icon_theme,
-                                                         const gchar *search_path);
+                                                         const gchar *search_path);
 void                xfce_icon_theme_append_search_path  (XfceIconTheme *icon_theme,
-                                                         const gchar *search_path);
-XfceIconThemeCategory  xfce_icon_theme_register_category
-                                                        (XfceIconTheme *icon_theme,
-                                                         GList *icon_names);
+                                                         const gchar *search_path);
+XfceIconThemeCategory xfce_icon_theme_register_category (XfceIconTheme *icon_theme,
+                                                         GList *icon_names);
 void                xfce_icon_theme_unregister_category (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category);
-
+

Object Hierarchy

-  GObject
+  GObject
    +----XfceIconTheme
-
+

Signals

-  "changed"                                        : Run Last
+  "changed"                                        : Run Last
-
+

Description

XfceIconTheme is used to look up themed icons. It is actually a singleton @@ -105,19 +104,20 @@ that.

-
+

Details

-
-

XfceIconTheme

-
typedef struct _XfceIconTheme XfceIconTheme;
+
+

struct XfceIconTheme

+
struct XfceIconTheme;

This struct only contains private data and should not be accessed directly.

-
+

enum XfceIconThemeCategory

-
typedef enum { /*< prefix=XFCE_ICON_CATEGORY_ >*/
+
typedef enum {
+ /*< prefix=XFCE_ICON_CATEGORY_ >*/
     XFCE_ICON_CATEGORY_UNKNOWN = 0,
     XFCE_ICON_CATEGORY_EDITOR,
     XFCE_ICON_CATEGORY_FILEMAN,
@@ -251,11 +251,11 @@
-
+

xfce_icon_theme_get_for_screen ()

-
XfceIconTheme *     xfce_icon_theme_get_for_screen      (GdkScreen *screen);
+
XfceIconTheme *     xfce_icon_theme_get_for_screen      (GdkScreen *screen);

-Retrieves the icon theme for the specified GdkScreen (or NULL for the +Retrieves the icon theme for the specified GdkScreen (or NULL for the default screen), creating it if necessary.

@@ -266,23 +266,21 @@

screen :

-A GdkScreen, or NULL. - +A GdkScreen, or NULL.

Returns :

- A new XfceIconTheme. - +A new XfceIconTheme.
-
+

xfce_icon_theme_lookup ()

-
gchar *             xfce_icon_theme_lookup              (XfceIconTheme *icon_theme,
-                                                         const gchar *icon_name,
-                                                         gint icon_size);
+
gchar *             xfce_icon_theme_lookup              (XfceIconTheme *icon_theme,
+                                                         const gchar *icon_name,
+                                                         gint icon_size);

Tries to find icon_name in the current theme. This function may return a filename of a size different than that requested in icon_size, if a @@ -296,34 +294,30 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

icon_name :

-The name of an icon to look up. - +The name of an icon to look up.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A filename (free with g_free() when done), or NULL if no - suitable icon could be found. - +A filename (free with g_free() when done), or NULL if no +suitable icon could be found.
-
+

xfce_icon_theme_lookup_list ()

-
gchar *             xfce_icon_theme_lookup_list         (XfceIconTheme *icon_theme,
-                                                         GList *icon_names,
-                                                         gint icon_size);
+
gchar *             xfce_icon_theme_lookup_list         (XfceIconTheme *icon_theme,
+                                                         GList *icon_names,
+                                                         gint icon_size);

Tries to find one of icon_names in the current theme. This function may return a filename of a size different than that requested in icon_size, if a @@ -337,34 +331,30 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

icon_names :

-A list of names of icons to look up, in order of preference. - +A list of names of icons to look up, in order of preference.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A filename (free with g_free() when done), or NULL if no - suitable icon could be found. - +A filename (free with g_free() when done), or NULL if no +suitable icon could be found.
-
+

xfce_icon_theme_lookup_category ()

-
gchar *             xfce_icon_theme_lookup_category     (XfceIconTheme *icon_theme,
+
gchar *             xfce_icon_theme_lookup_category     (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category,
-                                                         gint icon_size);

+                                                         gint icon_size);

Tries to find an icon of type category in the current theme. This function may return a filename of a size different than that requested in icon_size, @@ -380,34 +370,30 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

category :

-The type of icon to look up. - +The type of icon to look up.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A filename (free with g_free() when done), or NULL if no - suitable icon could be found. - +A filename (free with g_free() when done), or NULL if no +suitable icon could be found.
-
+

xfce_icon_theme_load ()

-
GdkPixbuf *         xfce_icon_theme_load                (XfceIconTheme *icon_theme,
-                                                         const gchar *icon_name,
-                                                         gint icon_size);
+
GdkPixbuf *         xfce_icon_theme_load                (XfceIconTheme *icon_theme,
+                                                         const gchar *icon_name,
+                                                         gint icon_size);

Tries to find icon_name in the current theme. If a suitable icon can be found, this function will always return an icon of the specified icon_size, @@ -421,34 +407,30 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

icon_name :

-The name of an icon to look up. - +The name of an icon to look up.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A new GdkPixbuf (free with g_object_unref() when done), or - NULL if no suitable icon could be found. - +A new GdkPixbuf (free with g_object_unref() when done), or +NULL if no suitable icon could be found.
-
+

xfce_icon_theme_load_list ()

-
GdkPixbuf *         xfce_icon_theme_load_list           (XfceIconTheme *icon_theme,
-                                                         GList *icon_names,
-                                                         gint icon_size);
+
GdkPixbuf *         xfce_icon_theme_load_list           (XfceIconTheme *icon_theme,
+                                                         GList *icon_names,
+                                                         gint icon_size);

Tries to find one of icon_names in the current theme. If a suitable icon can be found, this function will always return an icon of the specified @@ -462,34 +444,30 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

icon_names :

-The names of icons to look up. - +The names of icons to look up.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A new GdkPixbuf (free with g_object_unref() when done), or - NULL if no suitable icon could be found. - +A new GdkPixbuf (free with g_object_unref() when done), or +NULL if no suitable icon could be found.
-
+

xfce_icon_theme_load_category ()

-
GdkPixbuf *         xfce_icon_theme_load_category       (XfceIconTheme *icon_theme,
+
GdkPixbuf *         xfce_icon_theme_load_category       (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category,
-                                                         gint icon_size);

+                                                         gint icon_size);

Tries to find an icon of type category in the current theme. If a suitable icon can be found, this function will always return an icon of the specified @@ -505,32 +483,28 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

category :

-The type of icon to look up. - +The type of icon to look up.

icon_size :

-The preferred icon size. - +The preferred icon size.

Returns :

- A new GdkPixbuf (free with g_object_unref() when done), or - NULL if no suitable icon could be found. - +A new GdkPixbuf (free with g_object_unref() when done), or +NULL if no suitable icon could be found.
-
+

xfce_icon_theme_get_search_path ()

-
GList *             xfce_icon_theme_get_search_path     (XfceIconTheme *icon_theme);
+
GList *             xfce_icon_theme_get_search_path     (XfceIconTheme *icon_theme);

Retrieves the current icon search path.

@@ -542,22 +516,20 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

Returns :

- A GList of search paths. Free with g_list_free() when done. - +A GList of search paths. Free with g_list_free() when done.
-
+

xfce_icon_theme_set_search_path ()

void                xfce_icon_theme_set_search_path     (XfceIconTheme *icon_theme,
-                                                         GList *search_paths);
+ GList *search_paths);

Sets the current search path to the list of search_paths. Note that this will discard any currently-set search path. @@ -570,22 +542,20 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

search_paths :

-A GList of path names, each one terminated with '/'. - +A GList of path names, each one terminated with '/'.
-
+

xfce_icon_theme_prepend_search_path ()

void                xfce_icon_theme_prepend_search_path (XfceIconTheme *icon_theme,
-                                                         const gchar *search_path);
+ const gchar *search_path);

Prepends search_path to the current icon theme search path.

@@ -597,22 +567,20 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

search_path :

-A pathname, terminated with '/'. - +A pathname, terminated with '/'.
-
+

xfce_icon_theme_append_search_path ()

void                xfce_icon_theme_append_search_path  (XfceIconTheme *icon_theme,
-                                                         const gchar *search_path);
+ const gchar *search_path);

Appends search_path to the current icon theme search path.

@@ -624,23 +592,20 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

search_path :

-A pathname, terminated with '/'. - +A pathname, terminated with '/'.
-
+

xfce_icon_theme_register_category ()

-
XfceIconThemeCategory  xfce_icon_theme_register_category
-                                                        (XfceIconTheme *icon_theme,
-                                                         GList *icon_names);
+
XfceIconThemeCategory xfce_icon_theme_register_category (XfceIconTheme *icon_theme,
+                                                         GList *icon_names);

Registers a new XfceIconThemeCategory for use with #xfce_icon_theme_lookup_category() and xfce_icon_theme_load_category(). @@ -653,24 +618,21 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

icon_names :

-A GList of icon names. - +A GList of icon names.

Returns :

- An identifier that can be used for future category lookups. - +An identifier that can be used for future category lookups.
-
+

xfce_icon_theme_unregister_category ()

void                xfce_icon_theme_unregister_category (XfceIconTheme *icon_theme,
                                                          XfceIconThemeCategory category);
@@ -687,25 +649,23 @@

icon_theme :

-An XfceIconTheme. - +An XfceIconTheme.

category :

An XfceIconThemeCategory registered previously with - xfce_icon_theme_register_category(). - +xfce_icon_theme_register_category().
-
+

Signal Details

-
+

The "changed" signal

void                user_function                      (XfceIconTheme *icon_theme,
-                                                        gpointer       user_data)       : Run Last
+ gpointer user_data) : Run Last

Emitted when the current icon theme is switched or GTK+ detects that a change has occurred in the contents of the current icon theme. @@ -718,8 +678,7 @@

icon_theme :

-the icon theme - +the icon theme

user_data :

@@ -732,6 +691,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/html/XfceTitledDialog.html libxfcegui4-4.10.0/docs/html/XfceTitledDialog.html --- libxfcegui4-4.8.1/docs/html/XfceTitledDialog.html 2011-02-10 09:37:31.000000000 +0000 +++ libxfcegui4-4.10.0/docs/html/XfceTitledDialog.html 2012-04-28 20:11:34.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -31,7 +31,7 @@ Properties -
+
@@ -40,66 +40,66 @@
-
+

Synopsis

 #include <libxfcegui4/libxfcegui4.h>
 
                     XfceTitledDialog;
-GtkWidget *         xfce_titled_dialog_new              (void);
-GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         GtkDialogFlags flags,
-                                                         const gchar *first_button_text,
+GtkWidget *         xfce_titled_dialog_new              (void);
+GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         GtkDialogFlags flags,
+                                                         const gchar *first_button_text,
                                                          ...);
-const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
+const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
 void                xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
-                                                         const gchar *subtitle);
+                                                         const gchar *subtitle);
-
+

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkWindow
-                                       +----GtkDialog
+  GObject
+   +----GInitiallyUnowned
+         +----GtkObject
+               +----GtkWidget
+                     +----GtkContainer
+                           +----GtkBin
+                                 +----GtkWindow
+                                       +----GtkDialog
                                              +----XfceTitledDialog
-
+

Implemented Interfaces

XfceTitledDialog implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

-
+

Properties

-  "subtitle"                 gchar*                : Read / Write
+  "subtitle"                 gchar*                : Read / Write
-
+

Description

-
+

Details

-
+

XfceTitledDialog

typedef struct _XfceTitledDialog XfceTitledDialog;

-
+

xfce_titled_dialog_new ()

-
GtkWidget *         xfce_titled_dialog_new              (void);
+
GtkWidget *         xfce_titled_dialog_new              (void);

Allocates a new XfceTitledDialog instance.

@@ -107,23 +107,21 @@

Returns :

- the newly allocated XfceTitledDialog. - - +the newly allocated XfceTitledDialog.

Since 4.4.0

-
+

xfce_titled_dialog_new_with_buttons ()

-
GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         GtkDialogFlags flags,
-                                                         const gchar *first_button_text,
+
GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
+                                                         GtkWindow *parent,
+                                                         GtkDialogFlags flags,
+                                                         const gchar *first_button_text,
                                                          ...);

 

-See the documentation of gtk_dialog_new_with_buttons() for details about the
+See the documentation of gtk_dialog_new_with_buttons() for details about the
 parameters and the returned dialog.
 

 

@@ -131,45 +129,38 @@
 
-
+
-
+
-
+
-
+
-
+
-
+

 

 
title :
title of the dialog, or NULL.
-title of the dialog, or NULL.
 

 

 
parent :
transient parent window of the dialog, or NULL.
-transient parent window of the dialog, or NULL.
 

 

 
flags :
from GtkDialogFlags.
-from GtkDialogFlags.
 

 

 
first_button_text :
stock ID or text to go in first, or NULL.
-stock ID or text to go in first, or NULL.
 

 

 
... :
response ID for the first button, then additional buttons, ending with NULL.
-response ID for the first button, then additional buttons, ending with NULL.
 

 

 
Returns :
 the newly allocated XfceTitledDialog.
-
-the newly allocated XfceTitledDialog.
 

 
 

 
Since 4.4.0
-
+

xfce_titled_dialog_get_subtitle ()

-
const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
+
const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);

-Returns the subtitle of the titled_dialog, or NULL +Returns the subtitle of the titled_dialog, or NULL if no subtitle is displayed in the titled_dialog.

@@ -177,51 +168,46 @@ - + - +

titled_dialog :

a XfceTitledDialog. -a XfceTitledDialog.

Returns :

 the subtitle of titled_dialog, or NULL. - -the subtitle of titled_dialog, or NULL.

Since 4.4.0

-
+

xfce_titled_dialog_set_subtitle ()

void                xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
-                                                         const gchar *subtitle);
+ const gchar *subtitle);

Sets the subtitle displayed by titled_dialog to subtitle; if -subtitle is NULL no subtitle will be displayed by the titled_dialog. +subtitle is NULL no subtitle will be displayed by the titled_dialog.

- + - +

titled_dialog :

a XfceTitledDialog. -a XfceTitledDialog.

subtitle :

the new subtitle for the titled_dialog, or NULL. -the new subtitle for the titled_dialog, or NULL.

Since 4.4.0

-
+

Property Details

-
+

The "subtitle" property

-
  "subtitle"                 gchar*                : Read / Write
+
  "subtitle"                 gchar*                : Read / Write

The subtitle displayed below the main dialog title.

@@ -232,6 +218,6 @@
- Generated by GTK-Doc V1.15
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru libxfcegui4-4.8.1/docs/Makefile.am libxfcegui4-4.10.0/docs/Makefile.am --- libxfcegui4-4.8.1/docs/Makefile.am 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/docs/Makefile.am 2012-04-28 20:10:42.000000000 +0000 @@ -49,11 +49,12 @@ $(GTK_CFLAGS) \ $(LIBSM_CFLAGS) \ $(LIBX11_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) + $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libxfcegui4/libxfcegui4.la + $(top_builddir)/libxfcegui4/libxfcegui4.la \ + $(GTK_LIBS) include $(top_srcdir)/gtk-doc.make diff -Nru libxfcegui4-4.8.1/docs/Makefile.in libxfcegui4-4.10.0/docs/Makefile.in --- libxfcegui4-4.8.1/docs/Makefile.in 2011-02-10 09:33:48.000000000 +0000 +++ libxfcegui4-4.10.0/docs/Makefile.in 2012-04-28 20:10:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -25,6 +25,23 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,14 +71,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -104,6 +126,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -122,6 +146,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -232,6 +260,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -299,15 +329,16 @@ $(GTK_CFLAGS) \ $(LIBSM_CFLAGS) \ $(LIBX11_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) + $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libxfcegui4/libxfcegui4.la + $(top_builddir)/libxfcegui4/libxfcegui4.la \ + $(GTK_LIBS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute @@ -318,15 +349,18 @@ # GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + # Other files to distribute -EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ - version.xml.in -DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -369,6 +403,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -440,10 +475,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -547,22 +587,47 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + test -d $(abs_srcdir)/tmpl && \ + { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + chmod -R u+w $(abs_builddir)/tmpl; } \ + fi + @touch setup-build.stamp + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi @touch scan-build.stamp @@ -572,10 +637,14 @@ #### templates #### -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo ' DOC Rebuilding template files' + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + if test -w $(abs_srcdir) ; then \ + cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + fi \ + fi @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -587,13 +656,13 @@ #### xml #### sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -602,58 +671,79 @@ #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -rf tmpl; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + @rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -662,14 +752,12 @@ fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -691,15 +779,15 @@ @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff -Nru libxfcegui4-4.8.1/docs/tmpl/dialogs.sgml libxfcegui4-4.10.0/docs/tmpl/dialogs.sgml --- libxfcegui4-4.8.1/docs/tmpl/dialogs.sgml 2011-02-10 09:37:30.000000000 +0000 +++ libxfcegui4-4.10.0/docs/tmpl/dialogs.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -27,7 +27,7 @@ @format: -@Varargs: +@...: @@ -45,7 +45,7 @@ @format: -@Varargs: +@...: @@ -63,7 +63,7 @@ @format: -@Varargs: +@...: @@ -97,7 +97,7 @@ @primary_text: @secondary_text: @first_button_type: -@Varargs: +@...: @Returns: diff -Nru libxfcegui4-4.8.1/docs/tmpl/libxfcegui4-unused.sgml libxfcegui4-4.10.0/docs/tmpl/libxfcegui4-unused.sgml --- libxfcegui4-4.8.1/docs/tmpl/libxfcegui4-unused.sgml 2011-02-10 09:37:30.000000000 +0000 +++ libxfcegui4-4.10.0/docs/tmpl/libxfcegui4-unused.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -370,6 +370,23 @@ @combo_info: @top: + + + + + +@framebox: +@widget: + + + + + + +@text: +@indent: +@Returns: + diff -Nru libxfcegui4-4.8.1/docs/tmpl/xfce-filechooser.sgml libxfcegui4-4.10.0/docs/tmpl/xfce-filechooser.sgml --- libxfcegui4-4.8.1/docs/tmpl/xfce-filechooser.sgml 2011-02-10 09:37:30.000000000 +0000 +++ libxfcegui4-4.10.0/docs/tmpl/xfce-filechooser.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -73,7 +73,7 @@ @parent: @action: @first_button_text: -@Varargs: +@...: @Returns: @@ -86,7 +86,7 @@ @parent: @action: @first_button_text: -@Varargs: +@...: @Returns: diff -Nru libxfcegui4-4.8.1/docs/tmpl/xfce-framebox.sgml libxfcegui4-4.10.0/docs/tmpl/xfce-framebox.sgml --- libxfcegui4-4.8.1/docs/tmpl/xfce-framebox.sgml 2011-02-10 09:37:30.000000000 +0000 +++ libxfcegui4-4.10.0/docs/tmpl/xfce-framebox.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -26,22 +26,3 @@ - - - - - -@text: -@indent: -@Returns: - - - - - - - -@framebox: -@widget: - - diff -Nru libxfcegui4-4.8.1/docs/tmpl/xfce-titled-dialog.sgml libxfcegui4-4.10.0/docs/tmpl/xfce-titled-dialog.sgml --- libxfcegui4-4.8.1/docs/tmpl/xfce-titled-dialog.sgml 2011-02-10 09:37:30.000000000 +0000 +++ libxfcegui4-4.10.0/docs/tmpl/xfce-titled-dialog.sgml 2012-04-28 20:11:34.000000000 +0000 @@ -49,7 +49,7 @@ @parent: @flags: @first_button_text: -@Varargs: +@...: @Returns: diff -Nru libxfcegui4-4.8.1/docs/version.xml libxfcegui4-4.10.0/docs/version.xml --- libxfcegui4-4.8.1/docs/version.xml 2011-02-10 09:34:12.000000000 +0000 +++ libxfcegui4-4.10.0/docs/version.xml 2012-04-28 20:10:52.000000000 +0000 @@ -1 +1 @@ -4.8.1 +4.10.0 diff -Nru libxfcegui4-4.8.1/glade/16x16/Makefile.in libxfcegui4-4.10.0/glade/16x16/Makefile.in --- libxfcegui4-4.8.1/glade/16x16/Makefile.in 2011-02-10 09:33:49.000000000 +0000 +++ libxfcegui4-4.10.0/glade/16x16/Makefile.in 2012-04-28 20:10:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,14 +61,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,6 +95,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(gladepixmapdir)" DATA = $(gladepixmap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -117,6 +145,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -135,6 +165,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -245,6 +279,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -318,8 +354,11 @@ -rm -rf .libs _libs install-gladepixmapDATA: $(gladepixmap_DATA) @$(NORMAL_INSTALL) - test -z "$(gladepixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(gladepixmapdir)" @list='$(gladepixmap_DATA)'; test -n "$(gladepixmapdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gladepixmapdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gladepixmapdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -333,9 +372,7 @@ @$(NORMAL_UNINSTALL) @list='$(gladepixmap_DATA)'; test -n "$(gladepixmapdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(gladepixmapdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gladepixmapdir)" && rm -f $$files + dir='$(DESTDIR)$(gladepixmapdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -390,10 +427,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/glade/22x22/Makefile.in libxfcegui4-4.10.0/glade/22x22/Makefile.in --- libxfcegui4-4.8.1/glade/22x22/Makefile.in 2011-02-10 09:33:49.000000000 +0000 +++ libxfcegui4-4.10.0/glade/22x22/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,14 +61,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,6 +95,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(gladepixmapdir)" DATA = $(gladepixmap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -117,6 +145,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -135,6 +165,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -245,6 +279,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -318,8 +354,11 @@ -rm -rf .libs _libs install-gladepixmapDATA: $(gladepixmap_DATA) @$(NORMAL_INSTALL) - test -z "$(gladepixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(gladepixmapdir)" @list='$(gladepixmap_DATA)'; test -n "$(gladepixmapdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gladepixmapdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gladepixmapdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -333,9 +372,7 @@ @$(NORMAL_UNINSTALL) @list='$(gladepixmap_DATA)'; test -n "$(gladepixmapdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(gladepixmapdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gladepixmapdir)" && rm -f $$files + dir='$(DESTDIR)$(gladepixmapdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -390,10 +427,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/glade/Makefile.in libxfcegui4-4.10.0/glade/Makefile.in --- libxfcegui4-4.8.1/glade/Makefile.in 2011-02-10 09:33:49.000000000 +0000 +++ libxfcegui4-4.10.0/glade/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -72,6 +89,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(glademoduledir)" \ "$(DESTDIR)$(libglademoduledir)" \ "$(DESTDIR)$(gladecatalogdir)" @@ -84,8 +107,8 @@ @HAVE_GLADEUI_TRUE@am_libgladexfce4_la_OBJECTS = \ @HAVE_GLADEUI_TRUE@ libgladexfce4_la-glade-xfce4.lo libgladexfce4_la_OBJECTS = $(am_libgladexfce4_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libgladexfce4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -110,21 +133,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgladexfce4_la_SOURCES) $(libxfce4_la_SOURCES) DIST_SOURCES = $(am__libgladexfce4_la_SOURCES_DIST) \ @@ -136,6 +159,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(gladecatalog_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -212,6 +240,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -230,6 +260,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -340,6 +374,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -449,7 +485,6 @@ $(am__aclocal_m4_deps): install-glademoduleLTLIBRARIES: $(glademodule_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(glademoduledir)" || $(MKDIR_P) "$(DESTDIR)$(glademoduledir)" @list='$(glademodule_LTLIBRARIES)'; test -n "$(glademoduledir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -457,6 +492,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(glademoduledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(glademoduledir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(glademoduledir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(glademoduledir)"; \ } @@ -480,7 +517,6 @@ done install-libglademoduleLTLIBRARIES: $(libglademodule_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libglademoduledir)" || $(MKDIR_P) "$(DESTDIR)$(libglademoduledir)" @list='$(libglademodule_LTLIBRARIES)'; test -n "$(libglademoduledir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -488,6 +524,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libglademoduledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libglademoduledir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libglademoduledir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libglademoduledir)"; \ } @@ -509,9 +547,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgladexfce4.la: $(libgladexfce4_la_OBJECTS) $(libgladexfce4_la_DEPENDENCIES) +libgladexfce4.la: $(libgladexfce4_la_OBJECTS) $(libgladexfce4_la_DEPENDENCIES) $(EXTRA_libgladexfce4_la_DEPENDENCIES) $(AM_V_CCLD)$(libgladexfce4_la_LINK) $(am_libgladexfce4_la_rpath) $(libgladexfce4_la_OBJECTS) $(libgladexfce4_la_LIBADD) $(LIBS) -libxfce4.la: $(libxfce4_la_OBJECTS) $(libxfce4_la_DEPENDENCIES) +libxfce4.la: $(libxfce4_la_OBJECTS) $(libxfce4_la_DEPENDENCIES) $(EXTRA_libxfce4_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfce4_la_LINK) -rpath $(libglademoduledir) $(libxfce4_la_OBJECTS) $(libxfce4_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -526,42 +564,37 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libgladexfce4_la-glade-xfce4.lo: glade-xfce4.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladexfce4_la_CFLAGS) $(CFLAGS) -MT libgladexfce4_la-glade-xfce4.lo -MD -MP -MF $(DEPDIR)/libgladexfce4_la-glade-xfce4.Tpo -c -o libgladexfce4_la-glade-xfce4.lo `test -f 'glade-xfce4.c' || echo '$(srcdir)/'`glade-xfce4.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgladexfce4_la-glade-xfce4.Tpo $(DEPDIR)/libgladexfce4_la-glade-xfce4.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='glade-xfce4.c' object='libgladexfce4_la-glade-xfce4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='glade-xfce4.c' object='libgladexfce4_la-glade-xfce4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladexfce4_la_CFLAGS) $(CFLAGS) -c -o libgladexfce4_la-glade-xfce4.lo `test -f 'glade-xfce4.c' || echo '$(srcdir)/'`glade-xfce4.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgladexfce4_la_CFLAGS) $(CFLAGS) -c -o libgladexfce4_la-glade-xfce4.lo `test -f 'glade-xfce4.c' || echo '$(srcdir)/'`glade-xfce4.c libxfce4_la-libglade-xfce4.lo: libglade-xfce4.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4_la_CFLAGS) $(CFLAGS) -MT libxfce4_la-libglade-xfce4.lo -MD -MP -MF $(DEPDIR)/libxfce4_la-libglade-xfce4.Tpo -c -o libxfce4_la-libglade-xfce4.lo `test -f 'libglade-xfce4.c' || echo '$(srcdir)/'`libglade-xfce4.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4_la-libglade-xfce4.Tpo $(DEPDIR)/libxfce4_la-libglade-xfce4.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libglade-xfce4.c' object='libxfce4_la-libglade-xfce4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libglade-xfce4.c' object='libxfce4_la-libglade-xfce4.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4_la_CFLAGS) $(CFLAGS) -c -o libxfce4_la-libglade-xfce4.lo `test -f 'libglade-xfce4.c' || echo '$(srcdir)/'`libglade-xfce4.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4_la_CFLAGS) $(CFLAGS) -c -o libxfce4_la-libglade-xfce4.lo `test -f 'libglade-xfce4.c' || echo '$(srcdir)/'`libglade-xfce4.c mostlyclean-libtool: -rm -f *.lo @@ -570,8 +603,11 @@ -rm -rf .libs _libs install-gladecatalogDATA: $(gladecatalog_DATA) @$(NORMAL_INSTALL) - test -z "$(gladecatalogdir)" || $(MKDIR_P) "$(DESTDIR)$(gladecatalogdir)" @list='$(gladecatalog_DATA)'; test -n "$(gladecatalogdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gladecatalogdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gladecatalogdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -585,9 +621,7 @@ @$(NORMAL_UNINSTALL) @list='$(gladecatalog_DATA)'; test -n "$(gladecatalogdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(gladecatalogdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gladecatalogdir)" && rm -f $$files + dir='$(DESTDIR)$(gladecatalogdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -756,13 +790,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -800,10 +831,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/gtk-doc.make libxfcegui4-4.10.0/gtk-doc.make --- libxfcegui4-4.8.1/gtk-doc.make 2011-02-10 09:33:30.000000000 +0000 +++ libxfcegui4-4.10.0/gtk-doc.make 2012-04-28 20:10:44.000000000 +0000 @@ -5,12 +5,12 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = $(LIBTOOL) --mode=execute else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = endif @@ -23,17 +23,19 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) -EXTRA_DIST = \ +SETUP_FILES = \ $(content_files) \ - $(HTML_IMAGES) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + tmpl.stamp sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -70,22 +72,47 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + test -d $(abs_srcdir)/tmpl && \ + { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + chmod -R u+w $(abs_builddir)/tmpl; } \ + fi + @touch setup-build.stamp + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi @touch scan-build.stamp @@ -95,10 +122,14 @@ #### templates #### -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo ' DOC Rebuilding template files' + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + if test -w $(abs_srcdir) ; then \ + cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + fi \ + fi @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @@ -110,13 +141,13 @@ #### xml #### sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' + @echo ' DOC Building XML' @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -125,58 +156,79 @@ #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -rf tmpl; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html + @rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -185,14 +237,12 @@ fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -217,14 +267,14 @@ endif dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff -Nru libxfcegui4-4.8.1/icons/48x48/Makefile.in libxfcegui4-4.10.0/icons/48x48/Makefile.in --- libxfcegui4-4.8.1/icons/48x48/Makefile.in 2011-02-10 09:33:50.000000000 +0000 +++ libxfcegui4-4.10.0/icons/48x48/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -18,6 +18,23 @@ # $Id$ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,14 +63,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,6 +97,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -119,6 +147,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -137,6 +167,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -247,6 +281,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -326,8 +362,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -341,9 +380,7 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -398,10 +435,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/icons/Makefile.in libxfcegui4-4.10.0/icons/Makefile.in --- libxfcegui4-4.8.1/icons/Makefile.in 2011-02-10 09:33:50.000000000 +0000 +++ libxfcegui4-4.10.0/icons/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +17,23 @@ # $Id$ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -45,11 +62,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -60,6 +77,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -135,6 +157,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -153,6 +177,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -263,6 +291,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -494,13 +524,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -535,10 +562,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/icons/scalable/Makefile.in libxfcegui4-4.10.0/icons/scalable/Makefile.in --- libxfcegui4-4.8.1/icons/scalable/Makefile.in 2011-02-10 09:33:50.000000000 +0000 +++ libxfcegui4-4.10.0/icons/scalable/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -18,6 +18,23 @@ # $Id$ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,14 +63,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,6 +97,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -119,6 +147,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -137,6 +167,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -247,6 +281,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -314,8 +350,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -329,9 +368,7 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -386,10 +423,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/INSTALL libxfcegui4-4.10.0/INSTALL --- libxfcegui4-4.8.1/INSTALL 2011-02-10 09:33:51.000000000 +0000 +++ libxfcegui4-4.10.0/INSTALL 2012-04-28 20:10:47.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru libxfcegui4-4.8.1/install-sh libxfcegui4-4.10.0/install-sh --- libxfcegui4-4.8.1/install-sh 2011-02-10 09:33:48.000000000 +0000 +++ libxfcegui4-4.10.0/install-sh 2012-04-28 20:10:46.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru libxfcegui4-4.8.1/libxfcegui4/libxfcegui4-config.h libxfcegui4-4.10.0/libxfcegui4/libxfcegui4-config.h --- libxfcegui4-4.8.1/libxfcegui4/libxfcegui4-config.h 2011-02-10 09:34:12.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/libxfcegui4-config.h 2012-04-28 20:10:52.000000000 +0000 @@ -30,8 +30,8 @@ G_BEGIN_DECLS; #define LIBXFCEGUI4_MAJOR_VERSION 4 -#define LIBXFCEGUI4_MINOR_VERSION 8 -#define LIBXFCEGUI4_MICRO_VERSION 1 +#define LIBXFCEGUI4_MINOR_VERSION 10 +#define LIBXFCEGUI4_MICRO_VERSION 0 #define LIBXFCEGUI4_CHECK_VERSION(major,minor,micro) \ (LIBXFCEGUI4_MAJOR_VERSION > (major) \ diff -Nru libxfcegui4-4.8.1/libxfcegui4/Makefile.am libxfcegui4-4.10.0/libxfcegui4/Makefile.am --- libxfcegui4-4.8.1/libxfcegui4/Makefile.am 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/Makefile.am 2012-04-28 20:10:43.000000000 +0000 @@ -183,7 +183,8 @@ $(LIBX11_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ - $(PLATFORM_LIBS) + $(PLATFORM_LIBS) \ + -lm libxfcegui4_la_CFLAGS = \ $(NETK_CFLAGS) \ diff -Nru libxfcegui4-4.8.1/libxfcegui4/Makefile.in libxfcegui4-4.10.0/libxfcegui4/Makefile.in --- libxfcegui4-4.8.1/libxfcegui4/Makefile.in 2011-02-10 09:33:51.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -20,6 +20,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,6 +88,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(libxfcegui4includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -121,8 +144,8 @@ libxfcegui4_la-xfce-titled-dialog.lo \ libxfcegui4_la-xinerama.lo libxfcegui4_la_OBJECTS = $(am_libxfcegui4_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libxfcegui4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -138,24 +161,29 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libxfcegui4_la_SOURCES) DIST_SOURCES = $(libxfcegui4_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(noinst_DATA) $(pkgconfig_DATA) HEADERS = $(libxfcegui4include_HEADERS) ETAGS = etags @@ -202,6 +230,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -220,6 +250,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -330,6 +364,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -532,7 +568,8 @@ $(LIBX11_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ - $(PLATFORM_LIBS) + $(PLATFORM_LIBS) \ + -lm libxfcegui4_la_CFLAGS = \ $(NETK_CFLAGS) \ @@ -615,7 +652,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -623,6 +659,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -644,7 +682,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libxfcegui4.la: $(libxfcegui4_la_OBJECTS) $(libxfcegui4_la_DEPENDENCIES) +libxfcegui4.la: $(libxfcegui4_la_OBJECTS) $(libxfcegui4_la_DEPENDENCIES) $(EXTRA_libxfcegui4_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfcegui4_la_LINK) -rpath $(libdir) $(libxfcegui4_la_OBJECTS) $(libxfcegui4_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -703,394 +741,345 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libxfcegui4_la-netk-enum-types.lo: netk-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-enum-types.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-enum-types.Tpo -c -o libxfcegui4_la-netk-enum-types.lo `test -f 'netk-enum-types.c' || echo '$(srcdir)/'`netk-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-enum-types.Tpo $(DEPDIR)/libxfcegui4_la-netk-enum-types.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-enum-types.c' object='libxfcegui4_la-netk-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-enum-types.c' object='libxfcegui4_la-netk-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-enum-types.lo `test -f 'netk-enum-types.c' || echo '$(srcdir)/'`netk-enum-types.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-enum-types.lo `test -f 'netk-enum-types.c' || echo '$(srcdir)/'`netk-enum-types.c libxfcegui4_la-netk-marshal.lo: netk-marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-marshal.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-marshal.Tpo -c -o libxfcegui4_la-netk-marshal.lo `test -f 'netk-marshal.c' || echo '$(srcdir)/'`netk-marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-marshal.Tpo $(DEPDIR)/libxfcegui4_la-netk-marshal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-marshal.c' object='libxfcegui4_la-netk-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-marshal.c' object='libxfcegui4_la-netk-marshal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-marshal.lo `test -f 'netk-marshal.c' || echo '$(srcdir)/'`netk-marshal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-marshal.lo `test -f 'netk-marshal.c' || echo '$(srcdir)/'`netk-marshal.c libxfcegui4_la-xfce_marshal.lo: xfce_marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_marshal.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_marshal.Tpo -c -o libxfcegui4_la-xfce_marshal.lo `test -f 'xfce_marshal.c' || echo '$(srcdir)/'`xfce_marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_marshal.Tpo $(DEPDIR)/libxfcegui4_la-xfce_marshal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_marshal.c' object='libxfcegui4_la-xfce_marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_marshal.c' object='libxfcegui4_la-xfce_marshal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_marshal.lo `test -f 'xfce_marshal.c' || echo '$(srcdir)/'`xfce_marshal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_marshal.lo `test -f 'xfce_marshal.c' || echo '$(srcdir)/'`xfce_marshal.c libxfcegui4_la-gui-enum-types.lo: gui-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-gui-enum-types.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-gui-enum-types.Tpo -c -o libxfcegui4_la-gui-enum-types.lo `test -f 'gui-enum-types.c' || echo '$(srcdir)/'`gui-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-gui-enum-types.Tpo $(DEPDIR)/libxfcegui4_la-gui-enum-types.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui-enum-types.c' object='libxfcegui4_la-gui-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gui-enum-types.c' object='libxfcegui4_la-gui-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gui-enum-types.lo `test -f 'gui-enum-types.c' || echo '$(srcdir)/'`gui-enum-types.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gui-enum-types.lo `test -f 'gui-enum-types.c' || echo '$(srcdir)/'`gui-enum-types.c libxfcegui4_la-dialogs.lo: dialogs.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-dialogs.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-dialogs.Tpo -c -o libxfcegui4_la-dialogs.lo `test -f 'dialogs.c' || echo '$(srcdir)/'`dialogs.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-dialogs.Tpo $(DEPDIR)/libxfcegui4_la-dialogs.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dialogs.c' object='libxfcegui4_la-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dialogs.c' object='libxfcegui4_la-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-dialogs.lo `test -f 'dialogs.c' || echo '$(srcdir)/'`dialogs.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-dialogs.lo `test -f 'dialogs.c' || echo '$(srcdir)/'`dialogs.c libxfcegui4_la-icons.lo: icons.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-icons.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-icons.Tpo -c -o libxfcegui4_la-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-icons.Tpo $(DEPDIR)/libxfcegui4_la-icons.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='icons.c' object='libxfcegui4_la-icons.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='icons.c' object='libxfcegui4_la-icons.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c libxfcegui4_la-xfce_aboutdialog.lo: xfce_aboutdialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_aboutdialog.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_aboutdialog.Tpo -c -o libxfcegui4_la-xfce_aboutdialog.lo `test -f 'xfce_aboutdialog.c' || echo '$(srcdir)/'`xfce_aboutdialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_aboutdialog.Tpo $(DEPDIR)/libxfcegui4_la-xfce_aboutdialog.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_aboutdialog.c' object='libxfcegui4_la-xfce_aboutdialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_aboutdialog.c' object='libxfcegui4_la-xfce_aboutdialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_aboutdialog.lo `test -f 'xfce_aboutdialog.c' || echo '$(srcdir)/'`xfce_aboutdialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_aboutdialog.lo `test -f 'xfce_aboutdialog.c' || echo '$(srcdir)/'`xfce_aboutdialog.c libxfcegui4_la-xfce_clock.lo: xfce_clock.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_clock.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_clock.Tpo -c -o libxfcegui4_la-xfce_clock.lo `test -f 'xfce_clock.c' || echo '$(srcdir)/'`xfce_clock.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_clock.Tpo $(DEPDIR)/libxfcegui4_la-xfce_clock.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_clock.c' object='libxfcegui4_la-xfce_clock.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_clock.c' object='libxfcegui4_la-xfce_clock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_clock.lo `test -f 'xfce_clock.c' || echo '$(srcdir)/'`xfce_clock.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_clock.lo `test -f 'xfce_clock.c' || echo '$(srcdir)/'`xfce_clock.c libxfcegui4_la-xfce_movehandler.lo: xfce_movehandler.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_movehandler.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_movehandler.Tpo -c -o libxfcegui4_la-xfce_movehandler.lo `test -f 'xfce_movehandler.c' || echo '$(srcdir)/'`xfce_movehandler.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_movehandler.Tpo $(DEPDIR)/libxfcegui4_la-xfce_movehandler.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_movehandler.c' object='libxfcegui4_la-xfce_movehandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_movehandler.c' object='libxfcegui4_la-xfce_movehandler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_movehandler.lo `test -f 'xfce_movehandler.c' || echo '$(srcdir)/'`xfce_movehandler.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_movehandler.lo `test -f 'xfce_movehandler.c' || echo '$(srcdir)/'`xfce_movehandler.c libxfcegui4_la-xfce_decorbutton.lo: xfce_decorbutton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_decorbutton.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_decorbutton.Tpo -c -o libxfcegui4_la-xfce_decorbutton.lo `test -f 'xfce_decorbutton.c' || echo '$(srcdir)/'`xfce_decorbutton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_decorbutton.Tpo $(DEPDIR)/libxfcegui4_la-xfce_decorbutton.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_decorbutton.c' object='libxfcegui4_la-xfce_decorbutton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_decorbutton.c' object='libxfcegui4_la-xfce_decorbutton.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_decorbutton.lo `test -f 'xfce_decorbutton.c' || echo '$(srcdir)/'`xfce_decorbutton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_decorbutton.lo `test -f 'xfce_decorbutton.c' || echo '$(srcdir)/'`xfce_decorbutton.c libxfcegui4_la-xfce_decortoggle.lo: xfce_decortoggle.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_decortoggle.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_decortoggle.Tpo -c -o libxfcegui4_la-xfce_decortoggle.lo `test -f 'xfce_decortoggle.c' || echo '$(srcdir)/'`xfce_decortoggle.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_decortoggle.Tpo $(DEPDIR)/libxfcegui4_la-xfce_decortoggle.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_decortoggle.c' object='libxfcegui4_la-xfce_decortoggle.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_decortoggle.c' object='libxfcegui4_la-xfce_decortoggle.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_decortoggle.lo `test -f 'xfce_decortoggle.c' || echo '$(srcdir)/'`xfce_decortoggle.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_decortoggle.lo `test -f 'xfce_decortoggle.c' || echo '$(srcdir)/'`xfce_decortoggle.c libxfcegui4_la-xfce_framebox.lo: xfce_framebox.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_framebox.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_framebox.Tpo -c -o libxfcegui4_la-xfce_framebox.lo `test -f 'xfce_framebox.c' || echo '$(srcdir)/'`xfce_framebox.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_framebox.Tpo $(DEPDIR)/libxfcegui4_la-xfce_framebox.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_framebox.c' object='libxfcegui4_la-xfce_framebox.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_framebox.c' object='libxfcegui4_la-xfce_framebox.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_framebox.lo `test -f 'xfce_framebox.c' || echo '$(srcdir)/'`xfce_framebox.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_framebox.lo `test -f 'xfce_framebox.c' || echo '$(srcdir)/'`xfce_framebox.c libxfcegui4_la-xfce_scaled_image.lo: xfce_scaled_image.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_scaled_image.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_scaled_image.Tpo -c -o libxfcegui4_la-xfce_scaled_image.lo `test -f 'xfce_scaled_image.c' || echo '$(srcdir)/'`xfce_scaled_image.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_scaled_image.Tpo $(DEPDIR)/libxfcegui4_la-xfce_scaled_image.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_scaled_image.c' object='libxfcegui4_la-xfce_scaled_image.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_scaled_image.c' object='libxfcegui4_la-xfce_scaled_image.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_scaled_image.lo `test -f 'xfce_scaled_image.c' || echo '$(srcdir)/'`xfce_scaled_image.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_scaled_image.lo `test -f 'xfce_scaled_image.c' || echo '$(srcdir)/'`xfce_scaled_image.c libxfcegui4_la-xfce_iconbutton.lo: xfce_iconbutton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_iconbutton.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_iconbutton.Tpo -c -o libxfcegui4_la-xfce_iconbutton.lo `test -f 'xfce_iconbutton.c' || echo '$(srcdir)/'`xfce_iconbutton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_iconbutton.Tpo $(DEPDIR)/libxfcegui4_la-xfce_iconbutton.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_iconbutton.c' object='libxfcegui4_la-xfce_iconbutton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_iconbutton.c' object='libxfcegui4_la-xfce_iconbutton.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_iconbutton.lo `test -f 'xfce_iconbutton.c' || echo '$(srcdir)/'`xfce_iconbutton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_iconbutton.lo `test -f 'xfce_iconbutton.c' || echo '$(srcdir)/'`xfce_iconbutton.c libxfcegui4_la-xfce-internals.lo: xfce-internals.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-internals.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-internals.Tpo -c -o libxfcegui4_la-xfce-internals.lo `test -f 'xfce-internals.c' || echo '$(srcdir)/'`xfce-internals.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-internals.Tpo $(DEPDIR)/libxfcegui4_la-xfce-internals.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-internals.c' object='libxfcegui4_la-xfce-internals.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-internals.c' object='libxfcegui4_la-xfce-internals.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-internals.lo `test -f 'xfce-internals.c' || echo '$(srcdir)/'`xfce-internals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-internals.lo `test -f 'xfce-internals.c' || echo '$(srcdir)/'`xfce-internals.c libxfcegui4_la-xfce_togglebutton.lo: xfce_togglebutton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_togglebutton.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_togglebutton.Tpo -c -o libxfcegui4_la-xfce_togglebutton.lo `test -f 'xfce_togglebutton.c' || echo '$(srcdir)/'`xfce_togglebutton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_togglebutton.Tpo $(DEPDIR)/libxfcegui4_la-xfce_togglebutton.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_togglebutton.c' object='libxfcegui4_la-xfce_togglebutton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_togglebutton.c' object='libxfcegui4_la-xfce_togglebutton.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_togglebutton.lo `test -f 'xfce_togglebutton.c' || echo '$(srcdir)/'`xfce_togglebutton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_togglebutton.lo `test -f 'xfce_togglebutton.c' || echo '$(srcdir)/'`xfce_togglebutton.c libxfcegui4_la-xfce_menubutton.lo: xfce_menubutton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_menubutton.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_menubutton.Tpo -c -o libxfcegui4_la-xfce_menubutton.lo `test -f 'xfce_menubutton.c' || echo '$(srcdir)/'`xfce_menubutton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_menubutton.Tpo $(DEPDIR)/libxfcegui4_la-xfce_menubutton.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_menubutton.c' object='libxfcegui4_la-xfce_menubutton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_menubutton.c' object='libxfcegui4_la-xfce_menubutton.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_menubutton.lo `test -f 'xfce_menubutton.c' || echo '$(srcdir)/'`xfce_menubutton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_menubutton.lo `test -f 'xfce_menubutton.c' || echo '$(srcdir)/'`xfce_menubutton.c libxfcegui4_la-xfce_systemtray.lo: xfce_systemtray.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce_systemtray.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce_systemtray.Tpo -c -o libxfcegui4_la-xfce_systemtray.lo `test -f 'xfce_systemtray.c' || echo '$(srcdir)/'`xfce_systemtray.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce_systemtray.Tpo $(DEPDIR)/libxfcegui4_la-xfce_systemtray.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce_systemtray.c' object='libxfcegui4_la-xfce_systemtray.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce_systemtray.c' object='libxfcegui4_la-xfce_systemtray.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_systemtray.lo `test -f 'xfce_systemtray.c' || echo '$(srcdir)/'`xfce_systemtray.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce_systemtray.lo `test -f 'xfce_systemtray.c' || echo '$(srcdir)/'`xfce_systemtray.c libxfcegui4_la-gtk_style.lo: gtk_style.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-gtk_style.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-gtk_style.Tpo -c -o libxfcegui4_la-gtk_style.lo `test -f 'gtk_style.c' || echo '$(srcdir)/'`gtk_style.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-gtk_style.Tpo $(DEPDIR)/libxfcegui4_la-gtk_style.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtk_style.c' object='libxfcegui4_la-gtk_style.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtk_style.c' object='libxfcegui4_la-gtk_style.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gtk_style.lo `test -f 'gtk_style.c' || echo '$(srcdir)/'`gtk_style.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gtk_style.lo `test -f 'gtk_style.c' || echo '$(srcdir)/'`gtk_style.c libxfcegui4_la-gtktoxevent.lo: gtktoxevent.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-gtktoxevent.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-gtktoxevent.Tpo -c -o libxfcegui4_la-gtktoxevent.lo `test -f 'gtktoxevent.c' || echo '$(srcdir)/'`gtktoxevent.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-gtktoxevent.Tpo $(DEPDIR)/libxfcegui4_la-gtktoxevent.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtktoxevent.c' object='libxfcegui4_la-gtktoxevent.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtktoxevent.c' object='libxfcegui4_la-gtktoxevent.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gtktoxevent.lo `test -f 'gtktoxevent.c' || echo '$(srcdir)/'`gtktoxevent.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-gtktoxevent.lo `test -f 'gtktoxevent.c' || echo '$(srcdir)/'`gtktoxevent.c libxfcegui4_la-netk-application.lo: netk-application.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-application.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-application.Tpo -c -o libxfcegui4_la-netk-application.lo `test -f 'netk-application.c' || echo '$(srcdir)/'`netk-application.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-application.Tpo $(DEPDIR)/libxfcegui4_la-netk-application.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-application.c' object='libxfcegui4_la-netk-application.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-application.c' object='libxfcegui4_la-netk-application.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-application.lo `test -f 'netk-application.c' || echo '$(srcdir)/'`netk-application.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-application.lo `test -f 'netk-application.c' || echo '$(srcdir)/'`netk-application.c libxfcegui4_la-netk-class-group.lo: netk-class-group.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-class-group.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-class-group.Tpo -c -o libxfcegui4_la-netk-class-group.lo `test -f 'netk-class-group.c' || echo '$(srcdir)/'`netk-class-group.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-class-group.Tpo $(DEPDIR)/libxfcegui4_la-netk-class-group.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-class-group.c' object='libxfcegui4_la-netk-class-group.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-class-group.c' object='libxfcegui4_la-netk-class-group.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-class-group.lo `test -f 'netk-class-group.c' || echo '$(srcdir)/'`netk-class-group.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-class-group.lo `test -f 'netk-class-group.c' || echo '$(srcdir)/'`netk-class-group.c libxfcegui4_la-netk-pager.lo: netk-pager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-pager.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-pager.Tpo -c -o libxfcegui4_la-netk-pager.lo `test -f 'netk-pager.c' || echo '$(srcdir)/'`netk-pager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-pager.Tpo $(DEPDIR)/libxfcegui4_la-netk-pager.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-pager.c' object='libxfcegui4_la-netk-pager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-pager.c' object='libxfcegui4_la-netk-pager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-pager.lo `test -f 'netk-pager.c' || echo '$(srcdir)/'`netk-pager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-pager.lo `test -f 'netk-pager.c' || echo '$(srcdir)/'`netk-pager.c libxfcegui4_la-netk-screen.lo: netk-screen.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-screen.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-screen.Tpo -c -o libxfcegui4_la-netk-screen.lo `test -f 'netk-screen.c' || echo '$(srcdir)/'`netk-screen.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-screen.Tpo $(DEPDIR)/libxfcegui4_la-netk-screen.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-screen.c' object='libxfcegui4_la-netk-screen.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-screen.c' object='libxfcegui4_la-netk-screen.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-screen.lo `test -f 'netk-screen.c' || echo '$(srcdir)/'`netk-screen.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-screen.lo `test -f 'netk-screen.c' || echo '$(srcdir)/'`netk-screen.c libxfcegui4_la-netk-tasklist.lo: netk-tasklist.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-tasklist.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-tasklist.Tpo -c -o libxfcegui4_la-netk-tasklist.lo `test -f 'netk-tasklist.c' || echo '$(srcdir)/'`netk-tasklist.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-tasklist.Tpo $(DEPDIR)/libxfcegui4_la-netk-tasklist.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-tasklist.c' object='libxfcegui4_la-netk-tasklist.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-tasklist.c' object='libxfcegui4_la-netk-tasklist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-tasklist.lo `test -f 'netk-tasklist.c' || echo '$(srcdir)/'`netk-tasklist.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-tasklist.lo `test -f 'netk-tasklist.c' || echo '$(srcdir)/'`netk-tasklist.c libxfcegui4_la-netk-trayicon.lo: netk-trayicon.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-trayicon.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-trayicon.Tpo -c -o libxfcegui4_la-netk-trayicon.lo `test -f 'netk-trayicon.c' || echo '$(srcdir)/'`netk-trayicon.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-trayicon.Tpo $(DEPDIR)/libxfcegui4_la-netk-trayicon.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-trayicon.c' object='libxfcegui4_la-netk-trayicon.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-trayicon.c' object='libxfcegui4_la-netk-trayicon.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-trayicon.lo `test -f 'netk-trayicon.c' || echo '$(srcdir)/'`netk-trayicon.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-trayicon.lo `test -f 'netk-trayicon.c' || echo '$(srcdir)/'`netk-trayicon.c libxfcegui4_la-netk-util.lo: netk-util.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-util.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-util.Tpo -c -o libxfcegui4_la-netk-util.lo `test -f 'netk-util.c' || echo '$(srcdir)/'`netk-util.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-util.Tpo $(DEPDIR)/libxfcegui4_la-netk-util.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-util.c' object='libxfcegui4_la-netk-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-util.c' object='libxfcegui4_la-netk-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-util.lo `test -f 'netk-util.c' || echo '$(srcdir)/'`netk-util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-util.lo `test -f 'netk-util.c' || echo '$(srcdir)/'`netk-util.c libxfcegui4_la-netk-window.lo: netk-window.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-window.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-window.Tpo -c -o libxfcegui4_la-netk-window.lo `test -f 'netk-window.c' || echo '$(srcdir)/'`netk-window.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-window.Tpo $(DEPDIR)/libxfcegui4_la-netk-window.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-window.c' object='libxfcegui4_la-netk-window.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-window.c' object='libxfcegui4_la-netk-window.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window.lo `test -f 'netk-window.c' || echo '$(srcdir)/'`netk-window.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window.lo `test -f 'netk-window.c' || echo '$(srcdir)/'`netk-window.c libxfcegui4_la-netk-window-menu.lo: netk-window-menu.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-window-menu.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-window-menu.Tpo -c -o libxfcegui4_la-netk-window-menu.lo `test -f 'netk-window-menu.c' || echo '$(srcdir)/'`netk-window-menu.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-window-menu.Tpo $(DEPDIR)/libxfcegui4_la-netk-window-menu.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-window-menu.c' object='libxfcegui4_la-netk-window-menu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-window-menu.c' object='libxfcegui4_la-netk-window-menu.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window-menu.lo `test -f 'netk-window-menu.c' || echo '$(srcdir)/'`netk-window-menu.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window-menu.lo `test -f 'netk-window-menu.c' || echo '$(srcdir)/'`netk-window-menu.c libxfcegui4_la-netk-window-action-menu.lo: netk-window-action-menu.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-window-action-menu.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-window-action-menu.Tpo -c -o libxfcegui4_la-netk-window-action-menu.lo `test -f 'netk-window-action-menu.c' || echo '$(srcdir)/'`netk-window-action-menu.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-window-action-menu.Tpo $(DEPDIR)/libxfcegui4_la-netk-window-action-menu.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-window-action-menu.c' object='libxfcegui4_la-netk-window-action-menu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-window-action-menu.c' object='libxfcegui4_la-netk-window-action-menu.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window-action-menu.lo `test -f 'netk-window-action-menu.c' || echo '$(srcdir)/'`netk-window-action-menu.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-window-action-menu.lo `test -f 'netk-window-action-menu.c' || echo '$(srcdir)/'`netk-window-action-menu.c libxfcegui4_la-netk-workspace.lo: netk-workspace.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-workspace.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-workspace.Tpo -c -o libxfcegui4_la-netk-workspace.lo `test -f 'netk-workspace.c' || echo '$(srcdir)/'`netk-workspace.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-workspace.Tpo $(DEPDIR)/libxfcegui4_la-netk-workspace.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-workspace.c' object='libxfcegui4_la-netk-workspace.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-workspace.c' object='libxfcegui4_la-netk-workspace.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-workspace.lo `test -f 'netk-workspace.c' || echo '$(srcdir)/'`netk-workspace.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-workspace.lo `test -f 'netk-workspace.c' || echo '$(srcdir)/'`netk-workspace.c libxfcegui4_la-netk-xutils.lo: netk-xutils.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-netk-xutils.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-netk-xutils.Tpo -c -o libxfcegui4_la-netk-xutils.lo `test -f 'netk-xutils.c' || echo '$(srcdir)/'`netk-xutils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-netk-xutils.Tpo $(DEPDIR)/libxfcegui4_la-netk-xutils.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='netk-xutils.c' object='libxfcegui4_la-netk-xutils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='netk-xutils.c' object='libxfcegui4_la-netk-xutils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-xutils.lo `test -f 'netk-xutils.c' || echo '$(srcdir)/'`netk-xutils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-netk-xutils.lo `test -f 'netk-xutils.c' || echo '$(srcdir)/'`netk-xutils.c libxfcegui4_la-session-client.lo: session-client.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-session-client.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-session-client.Tpo -c -o libxfcegui4_la-session-client.lo `test -f 'session-client.c' || echo '$(srcdir)/'`session-client.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-session-client.Tpo $(DEPDIR)/libxfcegui4_la-session-client.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='session-client.c' object='libxfcegui4_la-session-client.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='session-client.c' object='libxfcegui4_la-session-client.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-session-client.lo `test -f 'session-client.c' || echo '$(srcdir)/'`session-client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-session-client.lo `test -f 'session-client.c' || echo '$(srcdir)/'`session-client.c libxfcegui4_la-preview_filesel.lo: preview_filesel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-preview_filesel.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-preview_filesel.Tpo -c -o libxfcegui4_la-preview_filesel.lo `test -f 'preview_filesel.c' || echo '$(srcdir)/'`preview_filesel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-preview_filesel.Tpo $(DEPDIR)/libxfcegui4_la-preview_filesel.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='preview_filesel.c' object='libxfcegui4_la-preview_filesel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='preview_filesel.c' object='libxfcegui4_la-preview_filesel.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-preview_filesel.lo `test -f 'preview_filesel.c' || echo '$(srcdir)/'`preview_filesel.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-preview_filesel.lo `test -f 'preview_filesel.c' || echo '$(srcdir)/'`preview_filesel.c libxfcegui4_la-xfce-appmenuitem.lo: xfce-appmenuitem.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-appmenuitem.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-appmenuitem.Tpo -c -o libxfcegui4_la-xfce-appmenuitem.lo `test -f 'xfce-appmenuitem.c' || echo '$(srcdir)/'`xfce-appmenuitem.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-appmenuitem.Tpo $(DEPDIR)/libxfcegui4_la-xfce-appmenuitem.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-appmenuitem.c' object='libxfcegui4_la-xfce-appmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-appmenuitem.c' object='libxfcegui4_la-xfce-appmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-appmenuitem.lo `test -f 'xfce-appmenuitem.c' || echo '$(srcdir)/'`xfce-appmenuitem.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-appmenuitem.lo `test -f 'xfce-appmenuitem.c' || echo '$(srcdir)/'`xfce-appmenuitem.c libxfcegui4_la-xfce-colorbutton.lo: xfce-colorbutton.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-colorbutton.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-colorbutton.Tpo -c -o libxfcegui4_la-xfce-colorbutton.lo `test -f 'xfce-colorbutton.c' || echo '$(srcdir)/'`xfce-colorbutton.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-colorbutton.Tpo $(DEPDIR)/libxfcegui4_la-xfce-colorbutton.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-colorbutton.c' object='libxfcegui4_la-xfce-colorbutton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-colorbutton.c' object='libxfcegui4_la-xfce-colorbutton.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-colorbutton.lo `test -f 'xfce-colorbutton.c' || echo '$(srcdir)/'`xfce-colorbutton.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-colorbutton.lo `test -f 'xfce-colorbutton.c' || echo '$(srcdir)/'`xfce-colorbutton.c libxfcegui4_la-xfce-widget-helpers.lo: xfce-widget-helpers.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-widget-helpers.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-widget-helpers.Tpo -c -o libxfcegui4_la-xfce-widget-helpers.lo `test -f 'xfce-widget-helpers.c' || echo '$(srcdir)/'`xfce-widget-helpers.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-widget-helpers.Tpo $(DEPDIR)/libxfcegui4_la-xfce-widget-helpers.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-widget-helpers.c' object='libxfcegui4_la-xfce-widget-helpers.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-widget-helpers.c' object='libxfcegui4_la-xfce-widget-helpers.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-widget-helpers.lo `test -f 'xfce-widget-helpers.c' || echo '$(srcdir)/'`xfce-widget-helpers.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-widget-helpers.lo `test -f 'xfce-widget-helpers.c' || echo '$(srcdir)/'`xfce-widget-helpers.c libxfcegui4_la-xfce-exec.lo: xfce-exec.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-exec.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-exec.Tpo -c -o libxfcegui4_la-xfce-exec.lo `test -f 'xfce-exec.c' || echo '$(srcdir)/'`xfce-exec.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-exec.Tpo $(DEPDIR)/libxfcegui4_la-xfce-exec.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-exec.c' object='libxfcegui4_la-xfce-exec.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-exec.c' object='libxfcegui4_la-xfce-exec.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-exec.lo `test -f 'xfce-exec.c' || echo '$(srcdir)/'`xfce-exec.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-exec.lo `test -f 'xfce-exec.c' || echo '$(srcdir)/'`xfce-exec.c libxfcegui4_la-xfce-filechooser.lo: xfce-filechooser.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-filechooser.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-filechooser.Tpo -c -o libxfcegui4_la-xfce-filechooser.lo `test -f 'xfce-filechooser.c' || echo '$(srcdir)/'`xfce-filechooser.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-filechooser.Tpo $(DEPDIR)/libxfcegui4_la-xfce-filechooser.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-filechooser.c' object='libxfcegui4_la-xfce-filechooser.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-filechooser.c' object='libxfcegui4_la-xfce-filechooser.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-filechooser.lo `test -f 'xfce-filechooser.c' || echo '$(srcdir)/'`xfce-filechooser.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-filechooser.lo `test -f 'xfce-filechooser.c' || echo '$(srcdir)/'`xfce-filechooser.c libxfcegui4_la-xfce-gdk-extensions.lo: xfce-gdk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-gdk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-gdk-extensions.Tpo -c -o libxfcegui4_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-gdk-extensions.Tpo $(DEPDIR)/libxfcegui4_la-xfce-gdk-extensions.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-gdk-extensions.c' object='libxfcegui4_la-xfce-gdk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gdk-extensions.c' object='libxfcegui4_la-xfce-gdk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c libxfcegui4_la-xfce-gtk-extensions.lo: xfce-gtk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-gtk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-gtk-extensions.Tpo -c -o libxfcegui4_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-gtk-extensions.Tpo $(DEPDIR)/libxfcegui4_la-xfce-gtk-extensions.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-gtk-extensions.c' object='libxfcegui4_la-xfce-gtk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gtk-extensions.c' object='libxfcegui4_la-xfce-gtk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c libxfcegui4_la-xfce-heading.lo: xfce-heading.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-heading.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-heading.Tpo -c -o libxfcegui4_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-heading.Tpo $(DEPDIR)/libxfcegui4_la-xfce-heading.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-heading.c' object='libxfcegui4_la-xfce-heading.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-heading.c' object='libxfcegui4_la-xfce-heading.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c libxfcegui4_la-xfce-icontheme.lo: xfce-icontheme.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-icontheme.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-icontheme.Tpo -c -o libxfcegui4_la-xfce-icontheme.lo `test -f 'xfce-icontheme.c' || echo '$(srcdir)/'`xfce-icontheme.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-icontheme.Tpo $(DEPDIR)/libxfcegui4_la-xfce-icontheme.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-icontheme.c' object='libxfcegui4_la-xfce-icontheme.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-icontheme.c' object='libxfcegui4_la-xfce-icontheme.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-icontheme.lo `test -f 'xfce-icontheme.c' || echo '$(srcdir)/'`xfce-icontheme.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-icontheme.lo `test -f 'xfce-icontheme.c' || echo '$(srcdir)/'`xfce-icontheme.c libxfcegui4_la-xfce-startup-notification.lo: xfce-startup-notification.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-startup-notification.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-startup-notification.Tpo -c -o libxfcegui4_la-xfce-startup-notification.lo `test -f 'xfce-startup-notification.c' || echo '$(srcdir)/'`xfce-startup-notification.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-startup-notification.Tpo $(DEPDIR)/libxfcegui4_la-xfce-startup-notification.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-startup-notification.c' object='libxfcegui4_la-xfce-startup-notification.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-startup-notification.c' object='libxfcegui4_la-xfce-startup-notification.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-startup-notification.lo `test -f 'xfce-startup-notification.c' || echo '$(srcdir)/'`xfce-startup-notification.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-startup-notification.lo `test -f 'xfce-startup-notification.c' || echo '$(srcdir)/'`xfce-startup-notification.c libxfcegui4_la-xfce-titled-dialog.lo: xfce-titled-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xfce-titled-dialog.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xfce-titled-dialog.Tpo -c -o libxfcegui4_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xfce-titled-dialog.Tpo $(DEPDIR)/libxfcegui4_la-xfce-titled-dialog.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-titled-dialog.c' object='libxfcegui4_la-xfce-titled-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-titled-dialog.c' object='libxfcegui4_la-xfce-titled-dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c libxfcegui4_la-xinerama.lo: xinerama.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -MT libxfcegui4_la-xinerama.lo -MD -MP -MF $(DEPDIR)/libxfcegui4_la-xinerama.Tpo -c -o libxfcegui4_la-xinerama.lo `test -f 'xinerama.c' || echo '$(srcdir)/'`xinerama.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfcegui4_la-xinerama.Tpo $(DEPDIR)/libxfcegui4_la-xinerama.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xinerama.c' object='libxfcegui4_la-xinerama.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xinerama.c' object='libxfcegui4_la-xinerama.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xinerama.lo `test -f 'xinerama.c' || echo '$(srcdir)/'`xinerama.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfcegui4_la_CFLAGS) $(CFLAGS) -c -o libxfcegui4_la-xinerama.lo `test -f 'xinerama.c' || echo '$(srcdir)/'`xinerama.c mostlyclean-libtool: -rm -f *.lo @@ -1099,8 +1088,11 @@ -rm -rf .libs _libs install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1114,13 +1106,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-libxfcegui4includeHEADERS: $(libxfcegui4include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libxfcegui4includedir)" || $(MKDIR_P) "$(DESTDIR)$(libxfcegui4includedir)" @list='$(libxfcegui4include_HEADERS)'; test -n "$(libxfcegui4includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libxfcegui4includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libxfcegui4includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1134,9 +1127,7 @@ @$(NORMAL_UNINSTALL) @list='$(libxfcegui4include_HEADERS)'; test -n "$(libxfcegui4includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libxfcegui4includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libxfcegui4includedir)" && rm -f $$files + dir='$(DESTDIR)$(libxfcegui4includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1242,10 +1233,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru libxfcegui4-4.8.1/libxfcegui4/netk-inlinepixbufs.h libxfcegui4-4.10.0/libxfcegui4/netk-inlinepixbufs.h --- libxfcegui4-4.8.1/libxfcegui4/netk-inlinepixbufs.h 2011-02-10 09:34:17.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/netk-inlinepixbufs.h 2012-04-28 20:10:43.000000000 +0000 @@ -1,13 +1,24 @@ +/* + * Copyright (C) 2003-2011 The Xfce Development Team + * + * This 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. + * + * This 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 Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + /* GdkPixbuf RGBA C-Source image dump */ -#ifdef __SUNPRO_C -#pragma align 4 (default_icon_data) -#endif -#ifdef __GNUC__ -static const guint8 default_icon_data[] __attribute__ ((__aligned__ (4))) = -#else static const guint8 default_icon_data[] = -#endif { "" /* Pixbuf magic (0x47646b50) */ "GdkP" @@ -238,8 +249,8 @@ "\205\13\377\320\201\10\377\317\201\10\377\315\200\10\377\312~\7\377\305" "x\0\377\241s3\377\354\354\342\377\264\254\232\377\272\262\237\377\270" "\261\236\377\266\255\234\377\265\256\233\377\263\254\232\377\261\250" - "\227\377\257\251\226\377\253\244\223\377\265\256\233\377JH\77\377\21" - "\17\12c\252\256\266\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230" + "\227\377\257\251\226\377\253\244\223\377\265\256\233\377JH?\377\21\17" + "\12c\252\256\266\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230" "\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230" "\236\1\225\230\236\1\225\230\236\1\253\260\270\1\0\0\0\250\317\217)\370" "\331\226/\377\327\225.\377\327\226.\377\335\232/\377\335\2320\377\341" @@ -248,24 +259,24 @@ "\317\202\10\377\316\202\10\377\314~\7\377\307w\0\377\244u5\377\354\353" "\342\377\265\254\232\377\272\262\237\377\270\261\236\377\266\255\234" "\377\265\256\233\377\263\254\232\377\261\250\227\377\257\251\226\377" - "\254\244\223\377\266\260\235\377\77=6\377\33\30\22`\247\254\264\1\225" - "\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225" + "\254\244\223\377\266\260\235\377?=6\377\33\30\22`\247\254\264\1\225\230" + "\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230" + "\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230" + "\236\1\253\260\270\1\0\0\0\250\317\217)\370\331\226/\377\327\225.\377" + "\331\226/\377\334\232/\377\336\2320\377\342\2350\377\337\2353\377\333" + "\220\36\377\336\213\11\377\334\213\14\377\332\212\13\377\330\210\12\377" + "\326\207\12\377\326\206\13\377\321\203\10\377\320\202\10\377\316\201" + "\10\377\314\200\7\377\306w\0\377\244v6\377\353\351\337\377\265\256\232" + "\377\272\262\237\377\270\260\236\377\266\255\234\377\265\256\233\377" + "\263\254\231\377\261\250\227\377\257\250\226\377\254\245\223\377\270" + "\261\236\37753.\377.*\"]\245\252\262\1\225\230\236\1\225\230\236\1\225" "\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225" - "\230\236\1\253\260\270\1\0\0\0\250\317\217)\370\331\226/\377\327\225" - ".\377\331\226/\377\334\232/\377\336\2320\377\342\2350\377\337\2353\377" - "\333\220\36\377\336\213\11\377\334\213\14\377\332\212\13\377\330\210" - "\12\377\326\207\12\377\326\206\13\377\321\203\10\377\320\202\10\377\316" - "\201\10\377\314\200\7\377\306w\0\377\244v6\377\353\351\337\377\265\256" - "\232\377\272\262\237\377\270\260\236\377\266\255\234\377\265\256\233" - "\377\263\254\231\377\261\250\227\377\257\250\226\377\254\245\223\377" - "\270\261\236\37753.\377.*\"]\245\252\262\1\225\230\236\1\225\230\236" - "\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236" - "\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\253\260\270" - "\1\0\0\0\250\317\217)\370\331\226/\377\327\225.\377\331\225/\377\334" - "\231/\377\336\2320\377\342\2350\377\341\2363\377\334\223\40\377\336\213" - "\11\377\335\214\14\377\333\212\13\377\330\210\12\377\327\207\12\377\325" + "\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\253\260\270\1\0" + "\0\0\250\317\217)\370\331\226/\377\327\225.\377\331\225/\377\334\231" + "/\377\336\2320\377\342\2350\377\341\2363\377\334\223\40\377\336\213\11" + "\377\335\214\14\377\333\212\13\377\330\210\12\377\327\207\12\377\325" "\206\13\377\320\203\10\377\320\202\10\377\316\201\10\377\314\200\7\377" - "\305v\0\377\247~\77\377\350\347\336\377\265\256\232\377\273\262\240\377" + "\305v\0\377\247~?\377\350\347\336\377\265\256\232\377\273\262\240\377" "\271\261\240\377\270\261\237\377\271\266\242\377\270\264\240\377\263" "\256\234\377\261\252\230\377\254\245\223\377\273\263\240\377//(\377D" "@4X\243\247\260\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236" @@ -277,7 +288,7 @@ "\202\10\377\316\201\10\377\314\200\7\377\305v\0\377\251\200A\377\353" "\352\337\377\271\263\240\377\274\274\250\377\262\271\246\377\241\257" "\234\377\234\222\202\377\217re\377\226\230\207\377\273\271\246\377\266" - "\256\234\377\276\266\243\377\"\"\35\377RK\77S\240\245\256\1\225\230\236" + "\256\234\377\276\266\243\377\"\"\35\377RK?S\240\245\256\1\225\230\236" "\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236" "\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236\1\225\230\236" "\1\253\260\270\1\0\0\0\250\317\217)\370\331\226/\377\327\225.\377\331" @@ -319,7 +330,7 @@ "\251\316\215)\371\331\227/\377\327\225.\377\330\227/\377\335\231/\377" "\337\2330\377\343\2361\377\341\2353\377\336\222\36\377\342\215\12\377" "\340\215\14\377\335\214\14\377\332\211\13\377\331\210\13\377\330\214" - "\7\377\266e\20\377\360/\77\377\33434\377\321**\377\321!!\377\322##\377" + "\7\377\266e\20\377\360/?\377\33434\377\321**\377\321!!\377\322##\377" "\323##\377\323##\377\322##\377\322\"\"\377\321\"\"\377\321\"\"\377\321" "!!\377\320!!\377\320!!\377\320\"\"\377\322!!\377\333##\377\351&&\377" "\271\35\35\377\15\0\0\374\0\0\0\243\250\260\267\1\225\230\236\1\225\230" @@ -391,7 +402,7 @@ "\236\0\0\377\235\0\0\377\235\0\0\377\235\0\0\377\232\0\0\377\233\0\0" "\377\233\0\0\377\241\0\0\377\207\0\0\377\0\0\0\233>BE\2\266\272\301\1" "\201\205\212\1\225\230\236\1\14\14\15\1""123\1\274\300\307\1OPS\2\0\0" - "\0\14\0\0\0$\0\0\0\77\0\0\0X\0\0\0r\0\0\0\213\0\0\0\253\11\6\1\327\252" + "\0\14\0\0\0$\0\0\0?\0\0\0X\0\0\0r\0\0\0\213\0\0\0\253\11\6\1\327\252" "v$\366\363\2514\376\350\2435\377\334\221\34\377\341\215\14\377\344\220" "\15\377\345\222\16\377\333\212\14\377\262q\12\376sK\4\371e4\14\372\367" "5<\377\35677\377\34666\377\35077\377\35377\377\35588\377\36088\377\365" diff -Nru libxfcegui4-4.8.1/libxfcegui4/netk-marshal.c libxfcegui4-4.10.0/libxfcegui4/netk-marshal.c --- libxfcegui4-4.8.1/libxfcegui4/netk-marshal.c 2011-02-10 09:34:17.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/netk-marshal.c 2012-04-28 20:10:52.000000000 +0000 @@ -5,7 +5,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru libxfcegui4-4.8.1/libxfcegui4/xfce-appmenuitem.c libxfcegui4-4.10.0/libxfcegui4/xfce-appmenuitem.c --- libxfcegui4-4.8.1/libxfcegui4/xfce-appmenuitem.c 2011-02-10 09:33:26.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/xfce-appmenuitem.c 2012-04-28 20:10:43.000000000 +0000 @@ -522,127 +522,17 @@ * xfce_app_menu_item_new_with_command(), xfce_app_menu_item_set_needs_term(), * xfce_app_menu_item_set_icon_name(), and * xfce_app_menu_item_set_startup_notification(). + * + * In Xfce 4.10 this function only returns NULL, since XfceDesktopEntry was + * removed from libxfce4util. * * Since 4.1 **/ GtkWidget * -xfce_app_menu_item_new_from_desktop_entry(XfceDesktopEntry *entry, +xfce_app_menu_item_new_from_desktop_entry(gpointer *entry, gboolean show_icon) { - XfceAppMenuItem *app_menu_item; - gchar *name = NULL, *cmd = NULL, *icon = NULL, *snotify = NULL; - gchar *onlyshowin = NULL, *categories = NULL, *term = NULL; - const gchar *dfile; - - g_return_val_if_fail(XFCE_IS_DESKTOP_ENTRY(entry), NULL); - - if(xfce_desktop_entry_get_string(entry, "OnlyShowIn", FALSE, &onlyshowin) - || xfce_desktop_entry_get_string(entry, "Categories", FALSE, - &categories)) - { - if((onlyshowin && strstr(onlyshowin, "XFCE;")) - || (categories && strstr(categories, "X-XFCE;"))) - { - if(xfce_desktop_entry_has_translated_entry(entry, "GenericName")) { - xfce_desktop_entry_get_string(entry, "GenericName", TRUE, - &name); - } else if(xfce_desktop_entry_has_translated_entry(entry, "Name")) { - xfce_desktop_entry_get_string(entry, "Name", TRUE, &name); - } else { - xfce_desktop_entry_get_string(entry, "GenericName", FALSE, - &name); - } - } else if(onlyshowin) { - g_free(onlyshowin); - g_free(categories); - return NULL; - } - - g_free(onlyshowin); - g_free(categories); - } - - app_menu_item = XFCE_APP_MENU_ITEM(xfce_app_menu_item_new()); - - if(!name && !xfce_desktop_entry_get_string(entry, "Name", TRUE, &name)) { - gchar *tmp, *tmp1; - - tmp = g_filename_to_utf8(xfce_desktop_entry_get_file(entry), -1, - NULL, NULL, NULL); - if(!tmp) - tmp = g_strdup(xfce_desktop_entry_get_file(entry)); - - if((tmp1 = g_strrstr(tmp, ".desktop"))) - *tmp1 = 0; - if((tmp1 = g_strrstr(tmp, "/"))) - tmp1++; - else - tmp1 = name; - name = g_strdup(tmp1); - g_free(tmp); - } - - app_menu_item->priv->name = name; - - if(!g_utf8_validate(name, -1, NULL)) { - g_warning("XfceAppMenuItem: 'name' failed utf8 validation for .desktop file '%s'", - xfce_desktop_entry_get_file(entry)); - gtk_widget_destroy(GTK_WIDGET(app_menu_item)); - return NULL; - } - - gtk_label_set_text(GTK_LABEL(app_menu_item->priv->accel_label), - app_menu_item->priv->name); - - if(xfce_desktop_entry_get_string(entry, "Terminal", TRUE, &term)) { - app_menu_item->priv->needs_term = (*term == '1' - || !g_ascii_strcasecmp(term, - "true")); - g_free(term); - } - - if(xfce_desktop_entry_get_string(entry, "StartupNotify", TRUE, &snotify)) { - app_menu_item->priv->snotify = (*snotify == '1' - || !g_ascii_strcasecmp(snotify, - "true")); - g_free(snotify); - } - - if(!xfce_desktop_entry_get_string(entry, "Exec", TRUE, &cmd)) { - gtk_widget_destroy(GTK_WIDGET(app_menu_item)); - return NULL; - } - - /* remove quotes around the command (yes, people do that!) */ - if(cmd[0] == '"') { - gint i; - - for(i = 1; cmd[i - 1] != '\0'; ++i) { - if (cmd[i] != '"') - cmd[i-1] = cmd[i]; - else { - cmd[i-1] = cmd[i] = ' '; - break; - } - } - } - - app_menu_item->priv->command = xfce_expand_variables(cmd, NULL); - g_free(cmd); - - if(show_icon) { - xfce_desktop_entry_get_string(entry, "Icon", TRUE, &icon); - if(icon) { - xfce_app_menu_item_set_icon_name(app_menu_item, icon); - g_free(icon); - } - } - - dfile = xfce_desktop_entry_get_file(entry); - if(dfile) - app_menu_item->priv->dot_desktop_filename = g_strdup(dfile); - - return GTK_WIDGET(app_menu_item); + return NULL; } /** diff -Nru libxfcegui4-4.8.1/libxfcegui4/xfce-appmenuitem.h libxfcegui4-4.10.0/libxfcegui4/xfce-appmenuitem.h --- libxfcegui4-4.8.1/libxfcegui4/xfce-appmenuitem.h 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/xfce-appmenuitem.h 2012-04-28 20:10:43.000000000 +0000 @@ -70,7 +70,7 @@ gboolean needs_term, gboolean snotify); -GtkWidget *xfce_app_menu_item_new_from_desktop_entry (XfceDesktopEntry *entry, +GtkWidget *xfce_app_menu_item_new_from_desktop_entry (gpointer *entry, gboolean show_icon); void xfce_app_menu_item_set_name (XfceAppMenuItem *app_menu_item, diff -Nru libxfcegui4-4.8.1/libxfcegui4/xfce-exec.c libxfcegui4-4.10.0/libxfcegui4/xfce-exec.c --- libxfcegui4-4.8.1/libxfcegui4/xfce-exec.c 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/xfce-exec.c 2012-04-28 20:10:43.000000000 +0000 @@ -221,24 +221,23 @@ if (g_path_is_absolute (realcmd) && g_file_test (realcmd, G_FILE_TEST_IS_DIR)) { - argv = g_new (char *, 3); - - if (in_terminal) - argv[0] = g_strdup ("xfterm4"); - else - argv[0] = g_strdup ("xftree4"); + argv = g_new (char *, 5); - argv[1] = realcmd; - argv[2] = NULL; + argv[0] = g_strdup ("exo-open"); + argv[1] = g_strdup ("--launch"); + argv[2] = g_strdup (in_terminal ? "TerminalEmulator" : "FileManager"); + argv[3] = realcmd; + argv[4] = NULL; } else if (in_terminal) { - argv = g_new (char *, 4); + argv = g_new (char *, 5); - argv[0] = g_strdup ("xfterm4"); - argv[1] = g_strdup ("-e"); - argv[2] = realcmd; - argv[3] = NULL; + argv[0] = g_strdup ("exo-open"); + argv[1] = g_strdup ("--launch"); + argv[2] = g_strdup ("TerminalEmulator"); + argv[3] = realcmd; + argv[4] = NULL; } else { diff -Nru libxfcegui4-4.8.1/libxfcegui4/xfce_marshal.c libxfcegui4-4.10.0/libxfcegui4/xfce_marshal.c --- libxfcegui4-4.8.1/libxfcegui4/xfce_marshal.c 2011-02-10 09:34:17.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4/xfce_marshal.c 2012-04-28 20:10:52.000000000 +0000 @@ -5,7 +5,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru libxfcegui4-4.8.1/libxfcegui4.spec libxfcegui4-4.10.0/libxfcegui4.spec --- libxfcegui4-4.8.1/libxfcegui4.spec 2011-02-10 09:34:12.000000000 +0000 +++ libxfcegui4-4.10.0/libxfcegui4.spec 2012-04-28 20:10:52.000000000 +0000 @@ -1,6 +1,6 @@ Summary: various gtk widgets for xfce Name: libxfcegui4 -Version: 4.8.1 +Version: 4.10.0 Release: 1 License: LGPL URL: http://www.xfce.org/ diff -Nru libxfcegui4-4.8.1/ltmain.sh libxfcegui4-4.10.0/ltmain.sh --- libxfcegui4-4.8.1/ltmain.sh 2011-02-10 09:33:30.000000000 +0000 +++ libxfcegui4-4.10.0/ltmain.sh 2012-04-28 20:10:43.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru libxfcegui4-4.8.1/Makefile.am libxfcegui4-4.10.0/Makefile.am --- libxfcegui4-4.8.1/Makefile.am 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/Makefile.am 2012-04-28 20:10:43.000000000 +0000 @@ -27,6 +27,9 @@ dist-hook: ChangeLog +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + EXTRA_DIST = \ AUTHORS \ COPYING \ diff -Nru libxfcegui4-4.8.1/Makefile.in libxfcegui4-4.10.0/Makefile.in --- libxfcegui4-4.8.1/Makefile.in 2011-02-10 09:33:52.000000000 +0000 +++ libxfcegui4-4.10.0/Makefile.in 2012-04-28 20:10:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +17,23 @@ # $Id$ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,11 +68,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libxfcegui4.spec CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -66,6 +83,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -78,9 +100,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -108,7 +132,8 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -151,6 +176,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -169,6 +196,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ @@ -279,6 +310,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -309,6 +342,9 @@ 1.8 \ dist-bzip2 +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + EXTRA_DIST = \ AUTHORS \ COPYING \ @@ -339,7 +375,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -375,10 +411,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -571,13 +605,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -611,7 +642,11 @@ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -619,7 +654,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -637,7 +672,7 @@ dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -651,6 +686,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -670,6 +707,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -698,8 +736,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -730,10 +776,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -822,9 +873,9 @@ .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-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-local distclean-tags \ + dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-local 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 \ diff -Nru libxfcegui4-4.8.1/missing libxfcegui4-4.10.0/missing --- libxfcegui4-4.8.1/missing 2011-02-10 09:33:48.000000000 +0000 +++ libxfcegui4-4.10.0/missing 2012-04-28 20:10:46.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru libxfcegui4-4.8.1/NEWS libxfcegui4-4.10.0/NEWS --- libxfcegui4-4.8.1/NEWS 2011-02-10 09:33:26.000000000 +0000 +++ libxfcegui4-4.10.0/NEWS 2012-04-28 20:10:43.000000000 +0000 @@ -1,7 +1,17 @@ -4.8.1 +4.10.0 +====== +- Fix link against libm (bug #8698). +- Use exo-open in xfce_exec (bug #4048). +- Translation updates: Dutch (Flemish), Portuguese (Brazilian), + Chinese (China). + +4.9.0 ===== -- Update and fix missing licenses (bug #7243). -- Translation updates: Galician. +- Drop XfceDesktopEntry usage. +- Add missing flag to linking. +- Translation updates: Arabic, German, Estonian, Finnish, Galician, + Croatian, Armenian, Icelandic, Korean, Lithuanian, Dutch (Flemish), + Norwegian Nynorsk, Portuguese, Telugu, Chinese (China). 4.8.0 ===== diff -Nru libxfcegui4-4.8.1/po/ar.po libxfcegui4-4.10.0/po/ar.po --- libxfcegui4-4.8.1/po/ar.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/ar.po 2012-04-28 20:10:43.000000000 +0000 @@ -2,72 +2,72 @@ # Khaled Hosny , 2007. msgid "" msgstr "" -"Project-Id-Version: ar\n" +"Project-Id-Version: libxfcegui4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2007-02-23 21:18+0200\n" -"Last-Translator: Khaled Hosny \n" -"Language-Team: Arabic \n" -"Language: ar\n" +"POT-Creation-Date: 2011-08-23 22:15+0000\n" +"PO-Revision-Date: 2011-08-24 02:36-0000\n" +"Last-Translator: كريم أولاد الشلحة \n" +"Language-Team: Arabic Xfce Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && " -"n<=10 ? 2 : 3\n" +"Language: ar\n" +"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n" "X-Poedit-Language: Arabic\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" +"X-Poedit-Country: Morocco\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "مساحة العمل" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "أ_ظهر" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "ا_خفِ" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "الغِ ال_تكبير" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "ك_بّر" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "ا_لغِ التظليل" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_ظلِّل" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "الغِ الت_تثيب" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "ثبِّت" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." msgstr "أرسِل إلى..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "أ_غلق" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "بحاجة لطرفية" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "ما إذا كان الأمر بحاجة للطرفية أم لا" @@ -78,21 +78,22 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 +#: ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "الأمر" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "الأمر الذي سينفّذ عند نقر العنصر" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" -msgstr "اسم الأيقونة" +msgstr "إسم الأيقونة" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" -msgstr "اسم الأيقونة (من السِمة) التي ستعرض بجانب العصر" +msgstr "إسم الأيقونة (من السِمة) التي ستعرض بجانب العصر" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -101,66 +102,65 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 -#, fuzzy +#: ../libxfcegui4/xfce-appmenuitem.c:244 +#: ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "وسم" -#: ../libxfcegui4/xfce-appmenuitem.c:246 -#, fuzzy +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "إظهار الوسم في العنصر" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" msgstr "تنبيهات بدء التشغيل" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "" +msgstr "هل التطبيق يدعم تنبيهات بدء التشغيل أم لا" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "إستخدام التسطير" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "" +msgstr "إستعمال أو عدم إستعمال التسطير في الوسم كذكرة للوحة المفاتيح" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "حوْل %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "زر الصفحة الرئيسية" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "معلومات" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "شكر وتقدير" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "الترخيص" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 +#: ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" -msgstr "فشلت في الحصول على انتقاء المدير" +msgstr "فشلت في الحصول على إنتقاء المدير" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "" -"لقد طلبت أبقونة اللوحة المقاس (%i x %i)، يجري تغيير الحجم إلى (%i x %i)" +msgstr "لقد طلبت أبقونة اللوحة المقاس (%i x %i)، يجري تغيير الحجم إلى (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" msgstr "لم تكن أيقونة اللوحة متِّصلة، يجري تدميرها" @@ -195,12 +195,10 @@ #. #. #: ../glade/xfce4.xml.in.h:35 -#, fuzzy msgid "Launcher Menu Item" msgstr "مطلقة عناصر القائمة" #: ../glade/xfce4.xml.in.h:36 -#, fuzzy msgid "Move Handle" msgstr "مقبض تحريك" @@ -216,7 +214,6 @@ msgstr "بحاجة لطرفية" #: ../glade/xfce4.xml.in.h:45 -#, fuzzy msgid "Scaled Image" msgstr "صورة محجمة" @@ -232,7 +229,6 @@ #. #. #: ../glade/xfce4.xml.in.h:54 -#, fuzzy msgid "Supports Startup Notification" msgstr "يدعم تنبيهات بدء التشغيل" @@ -246,7 +242,7 @@ #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" -msgstr "قطع Xcfe4" +msgstr "قطع إكسفس4" #~ msgid "Command Shortcut" #~ msgstr "الأمر" diff -Nru libxfcegui4-4.8.1/po/de.po libxfcegui4-4.10.0/po/de.po --- libxfcegui4-4.8.1/po/de.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/de.po 2012-04-28 20:10:43.000000000 +0000 @@ -4,70 +4,74 @@ # Moritz Heiber , 2003. # Fabian Nowak , 2006, 2007. # Nico Schümann , 2007. +# Mario Blättermann , 2012. # msgid "" msgstr "" -"Project-Id-Version: libxfcegui4 4.4.0\n" +"Project-Id-Version: libxfcegui4 master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2009-04-12 11:49+0200\n" -"Last-Translator: Fabian Nowak \n" -"Language-Team: German \n" +"POT-Creation-Date: 2012-03-29 08:00+0000\n" +"PO-Revision-Date: 2012-03-29 12:24+0100\n" +"Last-Translator: Mario Blättermann \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Arbeitsfläche" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "_Anzeigen" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Verstecken" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "_Wiederherstellen" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "_Maximieren" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "_Ausrollen" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_Einrollen" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "Lös_en" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "Anhe_ften" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "Verschieben nach..." +msgstr "Verschieben nach …" -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Schließen" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Benötigt ein Terminal" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "Gibt an, ob das Programm ein Terminal zur Ausführung braucht" @@ -78,19 +82,20 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 +#: ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Befehl" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Der auszuführende Befehl" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Symbolname" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "Der Name des Symbols, welches neben dem Objekt erscheint" @@ -101,63 +106,65 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 +#: ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "Überschrift" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "Überschrift, die in diesem Objekt angezeigt wird" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" msgstr "Visuelle Rückmeldung über den Programmstart geben" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "Ob das Programm die Rückmeldung über den Programmstart unterstützt" +msgstr "Gibt an, ob das Programm die Rückmeldung über den Programmstart unterstützt" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "Unterstriche benutzen" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "Ob der Unterstrich als Tastenkürzel verwendet werden soll" +msgstr "Gibt an, ob der Unterstrich als Tastenkürzel verwendet werden soll" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." -msgstr "Über %s..." +msgstr "Info zu %s …" -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Webseite besuchen" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Informationen" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Beteiligte" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Lizenz" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 +#: ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" -msgstr "Konnte die Auswahl des Managers nicht erfassen" +msgstr "Die Auswahl des Managers konnte nicht erfasst werden" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "Leistensymbol wollte die Größe %ix%i, passe die Größe an auf %ix%i" +msgstr "Leistensymbol hatte die Größe %ix%i angefragt, die Größe wird auf %ix%i angepasst" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" msgstr "Leistensymbol wurde nicht angehängt. Gelöscht." diff -Nru libxfcegui4-4.8.1/po/et.po libxfcegui4-4.10.0/po/et.po --- libxfcegui4-4.8.1/po/et.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/et.po 2012-04-28 20:10:43.000000000 +0000 @@ -4,74 +4,75 @@ # Mart Tõnso , 2004. # Peeter Vois , 2006. # Kristjan Siimson , 2008. +# Allar Kiristaja , 2011. # msgid "" msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2008-09-29 06:17-0700\n" -"Last-Translator: Kristjan Siimson \n" -"Language-Team: Estonian \n" +"POT-Creation-Date: 2011-10-25 16:09+0000\n" +"PO-Revision-Date: 2011-10-25 19:51+0300\n" +"Last-Translator: Allar Kiristaja \n" +"Language-Team: Eesti <>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8bits\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Narro 0.9.2 on http://tolge.pingviin.org\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" -msgstr "Tööpind" +msgstr "Tööala" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" -msgstr "_Näidata" +msgstr "_Näita" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" -msgstr "_Peita" +msgstr "_Peida" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" -msgstr "_Taassuurendada" +msgstr "_Vähenda" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" -msgstr "_Suurendada" +msgstr "_Suurenda" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" -msgstr "E_sile tuua" +msgstr "Too _Esile" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" -msgstr "_Varjata" +msgstr "Va_rja" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" -msgstr "Vabas_tada" +msgstr "Vabas_ta" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" -msgstr "Kinnis_tada" +msgstr "Kinni_ta" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "Saata..." +msgstr "Saada..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" -msgstr "_Sulgeda" +msgstr "_Sulge" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Vajab terminali" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" -msgstr "Kas käsu käivitamiseks on terminali tarvis või mitte" +msgstr "Kas käsu käivitamiseks on terminali tarvis või ei" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -80,19 +81,19 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Käsk" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Esemel klõpsates käivitatav käsk" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Ikooni nimetus" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "Eseme kõrval näidatava teemaikooni nimetus" @@ -103,65 +104,65 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "Silt" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "Esemes näidatav silt" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "Käivitusteatis" +msgstr "Käivitusteadaanne" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "Kas rakendus toetab käivitusteatiseid või mitte" +msgstr "Kas rakendus toetab käivitusteadaandeid või ei" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" -msgstr "Kasutada allajoonimist" +msgstr "Kasuta allajoonimist" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "Kas siltide alljoont kasutada klaviatuuri mäluabina või mitte" +msgstr "Kas siltide alljoont kasutada klaviatuuri mäluabina või ei" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "%s teave..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Külasta kodulehte" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Teave" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Tunnustused" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Litsents" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Haldusvaliku omandamine ebaõnnestus" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "teateala ikoon soovib suurust (%i x %i), uus suurus (%i x %i)" +msgstr "teateala ikoon nõuab suurust (%i x %i), uus suurus (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "teateala ikoon polnud lisatud, see hävitatakse" +msgstr "teateala ikooni ei lisatud, see hävitatakse" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" @@ -199,7 +200,7 @@ #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "Liigutada sanga" +msgstr "Liiguta sanga" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -214,7 +215,7 @@ #: ../glade/xfce4.xml.in.h:45 msgid "Scaled Image" -msgstr "Skaleeritud pilt" +msgstr "Muudetud mõõtmetega pilt" #: ../glade/xfce4.xml.in.h:46 msgid "Subtitle" @@ -229,7 +230,7 @@ #. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "Toetab käivitusteatist" +msgstr "Toetab käivitusteadaandeid" #: ../glade/xfce4.xml.in.h:55 msgid "Title" diff -Nru libxfcegui4-4.8.1/po/fi.po libxfcegui4-4.10.0/po/fi.po --- libxfcegui4-4.8.1/po/fi.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/fi.po 2012-04-28 20:10:43.000000000 +0000 @@ -3,70 +3,70 @@ # Copyright (C) 2002-2007 The Xfce Development Team. # Juha Kautto , 2004. # Jari Rahkonen , 2005-2009. -# +# msgid "" msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" +"POT-Creation-Date: 2011-10-08 04:08+0000\n" "PO-Revision-Date: 2009-01-25 09:34+0200\n" "Last-Translator: Jari Rahkonen \n" -"Language-Team: Finnish \n" -"Language: fi\n" +"Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Työtila" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "_Näytä" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Piilota" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "Palauta k_oko" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "_Suurenna" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "P_alauta" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_Varjosta" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "P_oista kiinnitys" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "_Kiinnitä" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." msgstr "Lähetä..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "S_ulje" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Tarvitsee päätteen" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "Tarvitseeko komento päätettä toimiakseen" @@ -74,22 +74,22 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Komento" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Painettaessa suoritettava komento" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Kuvakkeen nimi" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "Kohteen vieressä näytettävän teemakuvakkeen nimi" @@ -97,69 +97,69 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "Nimike" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "Kohteen näkyvä nimike" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" msgstr "Käynnistyksen huomautus" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" msgstr "Määrittää, tukeeko sovellus käynnistyksen huomautusta" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "Käytä alaviivaa" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" msgstr "" "Määrittää, merkitseekö nimikkeessä oleva alaviiva kohteen pikanäppäintä" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "Tietoa sovelluksesta %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Avaa kotisivu" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Tietoja" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Tekijät" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Lisenssi" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Hallintaohjelman valinta epäonnistui" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" msgstr "Ilmoitusalue pyysi kokoa %ix%i, kuvake muutettiin kokoon %ix%i" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "Kuvakketta ei liitetty ilmoitusalueelle, hävitetään" +msgstr "Kuvaketta ei liitetty ilmoitusalueelle, hävitetään" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" @@ -173,9 +173,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:18 msgid "Icon Filename" msgstr "Kuvaketiedosto" @@ -188,9 +188,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" msgstr "Käynnistin valikkoon" @@ -203,9 +203,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:44 msgid "Needs Terminal" msgstr "Tarvitsee päätettä" @@ -222,9 +222,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" msgstr "Tukee käynnistyksen huomautusta" diff -Nru libxfcegui4-4.8.1/po/gl.po libxfcegui4-4.10.0/po/gl.po --- libxfcegui4-4.8.1/po/gl.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/gl.po 2012-04-28 20:10:43.000000000 +0000 @@ -1,19 +1,19 @@ # Galician translation of libxfcegui4 # Copyright (C) 2008, 2009, 2010 Leandro Regueiro # This file is distributed under the same license as the xfce package. -# +# # Ricardo Domínguez Rouco , 2006. # Miguel Anxo Bouzada , 2008. # Leandro Regueiro , 2008, 2009, 2010. -# +# # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en -# +# msgid "" msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 11:31+0000\n" +"POT-Creation-Date: 2011-05-05 10:14+0000\n" "PO-Revision-Date: 2010-01-06 12:30+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -23,56 +23,56 @@ "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Espazo de traballo" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "_Mostrar" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Ocultar" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "_Restaurar" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "Ma_ximizar" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "_Sen sombreado" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_Sombreado" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "De_spegar" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "_Pegar" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." msgstr "Enviar a..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Pechar" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Precisa terminal" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "O comando precisa ou non dun terminal para executarse" @@ -80,22 +80,22 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Comando" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Comando a executar cando se prema no elemento" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Nome da icona" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "O nome da icona do tema para mostrar xunta ó elemento" @@ -103,70 +103,68 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "Etiqueta" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "A etiqueta que mostra o elemento" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" msgstr "Notificación ó iniciar" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" msgstr "Se a aplicación soporta ou non a notificación ó iniciar" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "Usar subliñado" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" msgstr "Empregar subliñado na etiqueta para teclado nemotécnico" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "Acerca de %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Visitar a páxina web" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Información" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Créditos" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Licenza" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Non se conseguiu adquirir a selección do xestor" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "" -"a icona da area de notificación pediu un tamaño de (%i x %i), " -"redimensionándoo a (%i x %i)" +msgstr "a icona da area de notificación pediu un tamaño de (%i x %i), redimensionándoo a (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "o icono da Bandexa do Sistema non foi adxuntado, destruíndoo" +msgstr "Non se anexou a icona da área de notificación, destruíndoa" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" @@ -180,9 +178,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:18 msgid "Icon Filename" msgstr "Nome de ficheiro da icona" @@ -195,9 +193,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" msgstr "Elemento iniciador do menú" @@ -210,9 +208,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:44 msgid "Needs Terminal" msgstr "Precisa terminal" @@ -229,9 +227,9 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" msgstr "Soporta notificacións de inicio" @@ -248,12 +246,8 @@ msgid "Xfce4 Widgets" msgstr "Chintófanos de Xfce4" -#~ msgid "" -#~ "This shortcut is already being used for another window manager action. " -#~ "Which action do you want to use?" -#~ msgstr "" -#~ "Este atallo xa se está usando para outra acción do xestor de fiestras. " -#~ "Que acción desexa usar?" +#~ msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" +#~ msgstr "Este atallo xa se está usando para outra acción do xestor de fiestras. Que acción desexa usar?" #~ msgid "Use '%s'" #~ msgstr "Usar '%s'" @@ -261,21 +255,14 @@ #~ msgid "Keep the other one" #~ msgstr "Manter a outra" -#~ msgid "" -#~ "This shortcut is already being used for the command '%s'. Which action do " -#~ "you want to use?" -#~ msgstr "" -#~ "Este atallo xa se está usando para o comando '%s'. Que acción desexa usar?" +#~ msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" +#~ msgstr "Este atallo xa se está usando para o comando '%s'. Que acción desexa usar?" #~ msgid "Keep '%s'" #~ msgstr "Manter '%s'" -#~ msgid "" -#~ "This shortcut is already being used by a window manager action. Which " -#~ "action do you want to use?" -#~ msgstr "" -#~ "Este atallo xa se está usando para unha acción do xestor de fiestras. Que " -#~ "acción desexa usar?" +#~ msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" +#~ msgstr "Este atallo xa se está usando para unha acción do xestor de fiestras. Que acción desexa usar?" #~ msgid "Keep the window manager action" #~ msgstr "Manter a acción do xestor de fiestras" diff -Nru libxfcegui4-4.8.1/po/hr.po libxfcegui4-4.10.0/po/hr.po --- libxfcegui4-4.8.1/po/hr.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/po/hr.po 2012-04-28 20:10:43.000000000 +0000 @@ -0,0 +1,245 @@ +# Croatian translations for libxfcegui4 package. +# Copyright (C) 2002-2006 The Xfce development team. +# This file is distributed under the same license as the libxfcegui4 package. +# Ivica Kolić , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: libxfcegui4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-10-29 22:09+0000\n" +"PO-Revision-Date: 2011-05-21 02:40+0100\n" +"Last-Translator: Ivica Kolić \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Croatian\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Bookmarks: 41,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Poedit-Country: CROATIA\n" + +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 +msgid "Workspace" +msgstr "Radni prostor" + +#: ../libxfcegui4/netk-window-action-menu.c:245 +msgid "S_how" +msgstr "P_okaži" + +#: ../libxfcegui4/netk-window-action-menu.c:252 +msgid "_Hide" +msgstr "_Sakrij" + +#: ../libxfcegui4/netk-window-action-menu.c:260 +msgid "Un_maximize" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:267 +msgid "Ma_ximize" +msgstr "Ma_ksimiziraj" + +#: ../libxfcegui4/netk-window-action-menu.c:275 +msgid "Un_shade" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:282 +msgid "_Shade" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:290 +msgid "Uns_tick" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:298 +msgid "S_tick" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:438 +msgid "Send to..." +msgstr "Pošalji za..." + +#: ../libxfcegui4/netk-window-action-menu.c:462 +msgid "_Close" +msgstr "_Zatvori" + +#: ../libxfcegui4/xfce-appmenuitem.c:229 +msgid "Needs terminal" +msgstr "Treba terminal" + +#: ../libxfcegui4/xfce-appmenuitem.c:230 +msgid "Whether or not the command needs a terminal to execute" +msgstr "Treba li naredba terminal za izvršenje ili ne" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 +msgid "Command" +msgstr "Naredba" + +#: ../libxfcegui4/xfce-appmenuitem.c:235 +msgid "The command to run when the item is clicked" +msgstr "Naredba za pokretanje, kada se klikne na stavku" + +#: ../libxfcegui4/xfce-appmenuitem.c:239 +msgid "Icon name" +msgstr "Ime ikone" + +#: ../libxfcegui4/xfce-appmenuitem.c:240 +msgid "The name of the themed icon to display next to the item" +msgstr "" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 +msgid "Label" +msgstr "Natpis" + +#: ../libxfcegui4/xfce-appmenuitem.c:245 +msgid "The label displayed in the item" +msgstr "Natpis prikazan u stavci " + +#: ../libxfcegui4/xfce-appmenuitem.c:249 +msgid "Startup notification" +msgstr "Obavijest o pokretanju" + +#: ../libxfcegui4/xfce-appmenuitem.c:250 +msgid "Whether or not the app supports startup notification" +msgstr "" + +#: ../libxfcegui4/xfce-appmenuitem.c:254 +msgid "Use underline" +msgstr "Koristite podcrtano" + +#: ../libxfcegui4/xfce-appmenuitem.c:255 +msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" +msgstr "" + +#. set window title +#: ../libxfcegui4/xfce_aboutdialog.c:641 +#, c-format +msgid "About %s..." +msgstr "O programu %s..." + +#: ../libxfcegui4/xfce_aboutdialog.c:997 +msgid "Visit homepage" +msgstr "Posjetite početnu stranicu" + +#: ../libxfcegui4/xfce_aboutdialog.c:1009 +msgid "Info" +msgstr "Info" + +#: ../libxfcegui4/xfce_aboutdialog.c:1031 +msgid "Credits" +msgstr "" + +#: ../libxfcegui4/xfce_aboutdialog.c:1053 +msgid "License" +msgstr "Licenca" + +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 +#, c-format +msgid "Failed to acquire manager selection" +msgstr "" + +#: ../libxfcegui4/xfce_systemtray.c:454 +#, c-format +msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" +msgstr "" + +#: ../libxfcegui4/xfce_systemtray.c:463 +msgid "tray icon was not attached, destroying it" +msgstr "" + +#: ../glade/xfce4.xml.in.h:9 +msgid "Dialog Header" +msgstr "" + +#: ../glade/xfce4.xml.in.h:10 +msgid "Icon" +msgstr "Ikona" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:18 +msgid "Icon Filename" +msgstr "Datotečno ime ikone" + +#: ../glade/xfce4.xml.in.h:19 +msgid "Icon Name" +msgstr "Ime ikone" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:35 +msgid "Launcher Menu Item" +msgstr "Stavka izbornika pokretača" + +#: ../glade/xfce4.xml.in.h:36 +msgid "Move Handle" +msgstr "" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:44 +msgid "Needs Terminal" +msgstr "Treba terminal" + +#: ../glade/xfce4.xml.in.h:45 +msgid "Scaled Image" +msgstr "" + +#: ../glade/xfce4.xml.in.h:46 +msgid "Subtitle" +msgstr "Podnapis" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:54 +msgid "Supports Startup Notification" +msgstr "Podržava obavijesti o pokretanju" + +#: ../glade/xfce4.xml.in.h:55 +msgid "Title" +msgstr "Naslov" + +#: ../glade/xfce4.xml.in.h:56 +msgid "Titled Dialog" +msgstr "" + +#: ../glade/xfce4.xml.in.h:57 +msgid "Xfce4 Widgets" +msgstr "" diff -Nru libxfcegui4-4.8.1/po/hy.po libxfcegui4-4.10.0/po/hy.po --- libxfcegui4-4.8.1/po/hy.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/hy.po 2012-04-28 20:10:43.000000000 +0000 @@ -2,71 +2,71 @@ # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the libxfcegui4 package. # Norayr Chilingaryan , 2005. -# +# msgid "" msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" +"POT-Creation-Date: 2011-04-21 10:15+0000\n" "PO-Revision-Date: 2005-09-22 20:56+0900\n" "Last-Translator: Norayr Chilingaryan \n" "Language-Team: Armenian \n" -"Language: hy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hy\n" "X-Generator: KBabel 1.9\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" -msgstr "" +msgstr "Աշխատանքային միջավայր" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "Ցուցադրել" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Թաքցնել" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "Փոքրացնել" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "Մեծացնել" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "Լուսավորել" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "Մթնեցնել" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" -msgstr "" +msgstr "Պոկել" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" -msgstr "" +msgstr "Կպցնել" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "" +msgstr "Ուղարկել" -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Փակել" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Պահանջում է տերմինալ" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "Այսպես թե այնպես ծրագիրը պահանջում է տերմինալ աշխատանքի համար" @@ -74,22 +74,22 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Հրաման" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Հրաման, որը աշխատացվելու ըստ կտոցի" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Պատկերակի անունը" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "հաջորդ ցուցադրվող պատկերակի անունը" @@ -97,92 +97,89 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" -msgstr "" +msgstr "Պիտակ" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" -msgstr "" +msgstr "Այս պիտակը կցուցադրվի կետի համար" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "" +msgstr "Գործարկման ծանուցում" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "" +msgstr "Արդյոք ծրագիրն ունի գործարկման ծանուցման հնարավորություն" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" -msgstr "" +msgstr "Ընդգծել" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "" +msgstr "Արդյոք ըստ ստեղնաշարի համապատասխան կոճակի ընդգծել պիտակը" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "%s մասին" -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Այցելեք կայքը" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Տեղեկություն" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Երախտիքներ" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Արտոնագիր" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Հնարավոր չէ ստանալ ընտրվածը" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" msgstr "սկուտեղի պատկերակը պահանջում է (%i x %i) չափսը, վերածվում է (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" msgstr "սկուտեղի պատկերակը ամրացված չէ և ոչնչացվում է" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" -msgstr "" +msgstr "Դիալոգի վերնագիր" #: ../glade/xfce4.xml.in.h:10 -#, fuzzy msgid "Icon" -msgstr "Պատկերակի անունը" +msgstr "Պատկերակ" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:18 -#, fuzzy msgid "Icon Filename" -msgstr "Պատկերակի անունը" +msgstr "Պատկերակի ֆայլի անունը" #: ../glade/xfce4.xml.in.h:19 -#, fuzzy msgid "Icon Name" msgstr "Պատկերակի անունը" @@ -190,68 +187,64 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" -msgstr "" +msgstr "Գործարկիչի մենյուի կետ" #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "" +msgstr "Տեղափոխման բռնակ" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:44 -#, fuzzy msgid "Needs Terminal" msgstr "Պահանջում է տերմինալ" #: ../glade/xfce4.xml.in.h:45 msgid "Scaled Image" -msgstr "" +msgstr "Փոքրացված պատկեր" #: ../glade/xfce4.xml.in.h:46 msgid "Subtitle" -msgstr "" +msgstr "Ենթավերնագիր" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "" +msgstr "Գործարկման ծանուցման հնարավորություն" #: ../glade/xfce4.xml.in.h:55 msgid "Title" -msgstr "" +msgstr "Վերնագիր" #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "" +msgstr "Վերնագրված դիալոգ" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" -msgstr "" +msgstr "Xfce4 ինտերֆեյսի տարրեր" -#, fuzzy #~ msgid "Command Shortcut" #~ msgstr "Հրաման" -#, fuzzy #~ msgid "Command:" #~ msgstr "Հրաման" -#, fuzzy #~ msgid "Command: %s" #~ msgstr "Հրաման" diff -Nru libxfcegui4-4.8.1/po/is.po libxfcegui4-4.10.0/po/is.po --- libxfcegui4-4.8.1/po/is.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/po/is.po 2012-04-28 20:10:43.000000000 +0000 @@ -0,0 +1,242 @@ +# translation of is.po to Icelandic +# Sveinn í Felli , 2011. +# Copyright (C) 2011 Free Software Foundation +# This file is distributed under the same license as the PACKAGE package. +msgid "" +msgstr "" +"Project-Id-Version: is\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-11-29 05:30+0000\n" +"PO-Revision-Date: 2011-12-07 07:36+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic \n" +"Language: is\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 +msgid "Workspace" +msgstr "Vinnusvæði" + +#: ../libxfcegui4/netk-window-action-menu.c:245 +msgid "S_how" +msgstr "_Birta" + +#: ../libxfcegui4/netk-window-action-menu.c:252 +msgid "_Hide" +msgstr "_Fela" + +#: ../libxfcegui4/netk-window-action-menu.c:260 +msgid "Un_maximize" +msgstr "Minn_ka glugga" + +#: ../libxfcegui4/netk-window-action-menu.c:267 +msgid "Ma_ximize" +msgstr "_Hámarka" + +#: ../libxfcegui4/netk-window-action-menu.c:275 +msgid "Un_shade" +msgstr "Af_skyggja" + +#: ../libxfcegui4/netk-window-action-menu.c:282 +msgid "_Shade" +msgstr "_Skyggja" + +#: ../libxfcegui4/netk-window-action-menu.c:290 +msgid "Uns_tick" +msgstr "Afklís_tra" + +#: ../libxfcegui4/netk-window-action-menu.c:298 +msgid "S_tick" +msgstr "Klís_tra" + +#: ../libxfcegui4/netk-window-action-menu.c:438 +msgid "Send to..." +msgstr "Senda Til..." + +#: ../libxfcegui4/netk-window-action-menu.c:462 +msgid "_Close" +msgstr "_Loka" + +#: ../libxfcegui4/xfce-appmenuitem.c:229 +msgid "Needs terminal" +msgstr "Þarfnast skjáhermis" + +#: ../libxfcegui4/xfce-appmenuitem.c:230 +msgid "Whether or not the command needs a terminal to execute" +msgstr "Hvort skipunin þarfnast skjáhermis til að keyra eða ekki" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 +msgid "Command" +msgstr "Skipun" + +#: ../libxfcegui4/xfce-appmenuitem.c:235 +msgid "The command to run when the item is clicked" +msgstr "Skipunin sem er keyrð þegar smellt er á atriðið" + +#: ../libxfcegui4/xfce-appmenuitem.c:239 +msgid "Icon name" +msgstr "Heiti táknmyndar" + +#: ../libxfcegui4/xfce-appmenuitem.c:240 +msgid "The name of the themed icon to display next to the item" +msgstr "Heiti þemuðu táknmyndarinnar sem birta á næst atriðinu" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 +msgid "Label" +msgstr "Skýring" + +#: ../libxfcegui4/xfce-appmenuitem.c:245 +msgid "The label displayed in the item" +msgstr "Merkingin sem sett verður á atriðið" + +#: ../libxfcegui4/xfce-appmenuitem.c:249 +msgid "Startup notification" +msgstr "Tilkynning í ræsingu" + +#: ../libxfcegui4/xfce-appmenuitem.c:250 +msgid "Whether or not the app supports startup notification" +msgstr "Hvort forritið styður tilkynningar í ræsingu eða ekki" + +#: ../libxfcegui4/xfce-appmenuitem.c:254 +msgid "Use underline" +msgstr "Nota undirstrikun" + +#: ../libxfcegui4/xfce-appmenuitem.c:255 +msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" +msgstr "Hvort nota eigi undirstrikun í skýringunni til að gefa til kynna flýtilykil" + +#. set window title +#: ../libxfcegui4/xfce_aboutdialog.c:641 +#, c-format +msgid "About %s..." +msgstr "Um %s..." + +#: ../libxfcegui4/xfce_aboutdialog.c:997 +msgid "Visit homepage" +msgstr "Heimsækja vefsvæði" + +#: ../libxfcegui4/xfce_aboutdialog.c:1009 +msgid "Info" +msgstr "Upplýsingar" + +#: ../libxfcegui4/xfce_aboutdialog.c:1031 +msgid "Credits" +msgstr "Framlög" + +#: ../libxfcegui4/xfce_aboutdialog.c:1053 +msgid "License" +msgstr "Notkunarskilmálar" + +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 +#, c-format +msgid "Failed to acquire manager selection" +msgstr "Gat ekki fengið val frá stýringu" + +#: ../libxfcegui4/xfce_systemtray.c:454 +#, c-format +msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" +msgstr "kerfisbakkatákn bað um stærðina (%i x %i), breyti því í (%i x %i)" + +#: ../libxfcegui4/xfce_systemtray.c:463 +msgid "tray icon was not attached, destroying it" +msgstr "kerfisbakkatákn var ekki hengt við, eyði því" + +#: ../glade/xfce4.xml.in.h:9 +msgid "Dialog Header" +msgstr "Haus samskiptaglugga" + +#: ../glade/xfce4.xml.in.h:10 +msgid "Icon" +msgstr "Táknmynd" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:18 +msgid "Icon Filename" +msgstr "Skráarheiti táknmyndar" + +#: ../glade/xfce4.xml.in.h:19 +msgid "Icon Name" +msgstr "Heiti táknmyndar" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:35 +msgid "Launcher Menu Item" +msgstr "Atriði á ræsivalmynd" + +#: ../glade/xfce4.xml.in.h:36 +msgid "Move Handle" +msgstr "Færa haldfang" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:44 +msgid "Needs Terminal" +msgstr "Þarfnast skjáhermis" + +#: ../glade/xfce4.xml.in.h:45 +msgid "Scaled Image" +msgstr "Kvörðuð mynd" + +#: ../glade/xfce4.xml.in.h:46 +msgid "Subtitle" +msgstr "Undirtexti" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:54 +msgid "Supports Startup Notification" +msgstr "Styður tilkynningu í ræsingu" + +#: ../glade/xfce4.xml.in.h:55 +msgid "Title" +msgstr "Titill" + +#: ../glade/xfce4.xml.in.h:56 +msgid "Titled Dialog" +msgstr "Viðmótsgluggi með titli" + +#: ../glade/xfce4.xml.in.h:57 +msgid "Xfce4 Widgets" +msgstr "Xfce4 græjur" + diff -Nru libxfcegui4-4.8.1/po/ko.po libxfcegui4-4.10.0/po/ko.po --- libxfcegui4-4.8.1/po/ko.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/ko.po 2012-04-28 20:10:43.000000000 +0000 @@ -2,73 +2,73 @@ # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the libxfcegui4 package. # ByungHyun Choi , 2005. +# Seong-ho, Cho , 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: libxfcegui4 4.4.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2007-09-24 11:44+0900\n" -"Last-Translator: ByungHyun Choi \n" -"Language-Team: xfce4-users-kr-i18n \n" -"Language: \n" +"Project-Id-Version: libxfcegui4.master\n" +"Report-Msgid-Bugs-To: xfce-i18n \n" +"POT-Creation-Date: 2012-02-26 08:54+0000\n" +"PO-Revision-Date: 2012-02-26 22:09+0900\n" +"Last-Translator: Seong-ho, Cho \n" +"Language-Team: xfce-i18n \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "작업공간" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" -msgstr "보이기(_h)" +msgstr "보이기(_H)" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "숨기기(_H)" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" -msgstr "원래크기로(_m)" +msgstr "원래크기로(_M)" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" -msgstr "최대화(_x)" +msgstr "최대화(_X)" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" -msgstr "말린 창 내리기(_s)" +msgstr "말린 창 펼치기(_S)" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "말아 올리기(_S)" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" -msgstr "현재 작업공간에 보이기(_t)" +msgstr "현재 작업공간에서 보기(_T)" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" -msgstr "모든 작업공간에 보이기(_t)" +msgstr "모든 작업공간에서 보기(_T)" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." msgstr "보내기..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "닫기(_C)" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" -msgstr "명령어 실행에 관계 없이" +msgstr "터미널 필요" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" -msgstr "터미널이 필요합니다." +msgstr "명령을 실행하기 위한 터미널이 필요한지에 대한 여부" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -77,21 +77,22 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 +#: ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "명령" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" -msgstr "클릭하면 명령을 실행합니다." +msgstr "항목을 누르면 실행할 명령입니다" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "아이콘 이름" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" -msgstr "테마 아이콘 이름을 옆에 표시합니다." +msgstr "항목 엎에 표시할 테마 아이콘의 이름 입니다" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -100,69 +101,71 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 +#: ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "레이블" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" -msgstr "항목에 표시되는 레이블" +msgstr "항목에 표시하는 레이블입니다" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "시작할 때 알림" +msgstr "시작 알림" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "알리미 기능 지원여부와 상관 없이" +msgstr "프로그램이 시작 알림을 지원하는지에 대한 여부입니다" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "밑줄 사용" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "레이블에 키보드의 밑줄 사용여부와 관계없이" +msgstr "키보드 니모닉처럼 레이블에 밑줄을 사용하는지에 대한 여부입니다" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." -msgstr "%s에 대하여" +msgstr "%s 정보..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "홈페이지" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "정보" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" -msgstr "만든이들..." +msgstr "만든 사람" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "라이선스" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 +#: ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" -msgstr "창 관리자에 연결하지 못 했습니다." +msgstr "관리자 선택을 얻어내는데 실패했습니다" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "트레이 아이콘의 크기는 (%i x %i)이므로, (%i x %i)로 변경합니다." +msgstr "요청하신 트레이 아이콘의 크기는 (%i x %i)이므로, (%i x %i)로 변경합니다" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "트레이 아이콘을 붙이지 못했기 때문에 죽여버리겠습니다." +msgstr "트레이 아이콘이 붙지 않아서 죽이겠습니다" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" -msgstr "대화창 헤더" +msgstr "대화상자 헤더" #: ../glade/xfce4.xml.in.h:10 msgid "Icon" @@ -177,7 +180,7 @@ #. #: ../glade/xfce4.xml.in.h:18 msgid "Icon Filename" -msgstr "아이콘 화일" +msgstr "아이콘 파일 이름" #: ../glade/xfce4.xml.in.h:19 msgid "Icon Name" @@ -192,7 +195,7 @@ #. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" -msgstr "실행기 메뉴 항목" +msgstr "실행 아이콘 메뉴 항목" #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" @@ -226,7 +229,7 @@ #. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "시작할 때 알림 기능 지원" +msgstr "시작 알림 지원" #: ../glade/xfce4.xml.in.h:55 msgid "Title" @@ -234,7 +237,7 @@ #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "제목있는 대화창" +msgstr "제목있는 대화상자" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" diff -Nru libxfcegui4-4.8.1/po/lt.po libxfcegui4-4.10.0/po/lt.po --- libxfcegui4-4.8.1/po/lt.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/lt.po 2012-04-28 20:10:43.000000000 +0000 @@ -2,70 +2,73 @@ # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the libxfcegui4 package. # Mantas Zapolskas , 2004. +# Algimantas Margevičius , 2012. # msgid "" msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2006-11-22 15:42+0300\n" -"Last-Translator: Mantas Zapolskas \n" -"Language-Team: Lithuanian \n" +"POT-Creation-Date: 2012-01-27 13:21+0000\n" +"PO-Revision-Date: 2012-01-27 16:22+0200\n" +"Last-Translator: Algimantas Margevičius \n" +"Language-Team: Lietuvių <>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Darbo laukas" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "R_odyti" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Paslėpti" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "Su_mažinti" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "Iš_didinti" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "Atiden_gti" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "Užde_ngti" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "Atseg_ti" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "Pri_segti" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "Perkeltį į..." +msgstr "Siųsti į..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Uždaryti" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Reikalingas terminalas" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "Ar reikalingas terminalas komandai paleisti" @@ -76,21 +79,21 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Komanda" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "Komanda, kurią paleisti paspaudus ant elemento" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" -msgstr "Ikonos vardas" +msgstr "Piktogramos pavadinimas" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" -msgstr "Rodyti teminės ikonos vardą šalia elemento" +msgstr "Rodyti teminės piktogramos vardą šalia elemento" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -99,75 +102,74 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" -msgstr "" +msgstr "Etiketė" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" -msgstr "" +msgstr "Etiketė kuri bus rodoma elemente" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "" +msgstr "Paleidimo pranešimas" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "" +msgstr "Ar programa palaiko paleidimo pranešimą" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" -msgstr "" +msgstr "Naudoti pabraukimą" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "" +msgstr "Naudoti ar nenaudoti pabraukimą etiketėje, kaip klaviatūros priminimą" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "Apie %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Aplankyti svetainę" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Informacija" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Padėkos" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Licencija" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Nepavyko pasiekti valdyklės pasirinkimo" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" msgstr "" -"skydelio ikona turi būti (%i·x·%i) dydžio, pakeičiamas dydis į (%i x %i)" +"skydelio piktograma turi būti (%i·x·%i) dydžio, dydis pakeičiamas į (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "skydelio ikona nėra prijungta, naikinama ją" +msgstr "skydelio piktograma nėra prijungta, naikinama" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" -msgstr "" +msgstr "Lango antraštė" #: ../glade/xfce4.xml.in.h:10 -#, fuzzy msgid "Icon" -msgstr "Ikonos vardas" +msgstr "Piktograma" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -177,14 +179,12 @@ #. #. #: ../glade/xfce4.xml.in.h:18 -#, fuzzy msgid "Icon Filename" -msgstr "Ikonos vardas" +msgstr "Piktogramos failo vardas" #: ../glade/xfce4.xml.in.h:19 -#, fuzzy msgid "Icon Name" -msgstr "Ikonos vardas" +msgstr "Piktogramos vardas" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -195,11 +195,11 @@ #. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" -msgstr "" +msgstr "Leistuko meniu elementas" #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "" +msgstr "Perkelti valdyklę" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -209,17 +209,16 @@ #. #. #: ../glade/xfce4.xml.in.h:44 -#, fuzzy msgid "Needs Terminal" msgstr "Reikalingas terminalas" #: ../glade/xfce4.xml.in.h:45 msgid "Scaled Image" -msgstr "" +msgstr "Sumažintas atvaizdas" #: ../glade/xfce4.xml.in.h:46 msgid "Subtitle" -msgstr "" +msgstr "Subtitrai" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -230,28 +229,16 @@ #. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "" +msgstr "Palaiko paleidimo pranešimą" #: ../glade/xfce4.xml.in.h:55 msgid "Title" -msgstr "" +msgstr "Antraštė" #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "" +msgstr "Antraštės dialogas" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" -msgstr "" - -#, fuzzy -#~ msgid "Command Shortcut" -#~ msgstr "Komanda" - -#, fuzzy -#~ msgid "Command:" -#~ msgstr "Komanda" - -#, fuzzy -#~ msgid "Command: %s" -#~ msgstr "Komanda" +msgstr "Xfce4 valdikliai" diff -Nru libxfcegui4-4.8.1/po/Makefile.in.in libxfcegui4-4.10.0/po/Makefile.in.in --- libxfcegui4-4.8.1/po/Makefile.in.in 2011-02-10 09:33:29.000000000 +0000 +++ libxfcegui4-4.10.0/po/Makefile.in.in 2012-04-28 20:10:43.000000000 +0000 @@ -50,8 +50,8 @@ XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS) INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -74,15 +74,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru libxfcegui4-4.8.1/po/nl.po libxfcegui4-4.10.0/po/nl.po --- libxfcegui4-4.8.1/po/nl.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/nl.po 2012-04-28 20:10:43.000000000 +0000 @@ -1,172 +1,173 @@ -# Dutch translations for libxfcegui4 package. -# Copyright (C) 2002-2006 The Xfce development team. +# Dutch translation of the libxfcegui4 package. +# Copyright (C) The Xfce development team. # This file is distributed under the same license as the libxfcegui4 package. # Jasper Huijsmans , 2004. -# +# Pjotr, 2011. +# msgid "" msgstr "" -"Project-Id-Version: libxfcegui4 4.4.0\n" +"Project-Id-Version: libxfcegui4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2005-09-22 20:59+0900\n" -"Last-Translator: Stephan Arts \n" -"Language-Team: Dutch \n" -"Language: nl\n" +"POT-Creation-Date: 2012-04-17 07:42+0000\n" +"PO-Revision-Date: 2011-09-08 20:59+0200\n" +"Last-Translator: Pjotr\n" +"Language-Team: Dutch (Flemish)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl (Dutch)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Werkblad" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "_Tonen" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Verbergen" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" -msgstr "On_aximaliseren" +msgstr "Ont_maximaliseren" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "Ma_ximaliseren" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "_Oprollen" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_Uitrollen" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" -msgstr "_Plakken" +msgstr "_Losmaken" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" -msgstr "_Loslaten" +msgstr "_Plakken" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "Zend naar..." +msgstr "Zenden naar..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Sluiten" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" -msgstr "Terminal nodig" +msgstr "Heeft terminal nodig" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" -msgstr "Heeft het programma een terminal nodig?" +msgstr "Of het programma al dan niet een terminal nodig heeft" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" -msgstr "Commando" +msgstr "Opdracht" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" -msgstr "Het commando om uit te voeren" +msgstr "De opdracht om uit te voeren wanneer het element wordt aangeklikt" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" -msgstr "Pictogram" +msgstr "Pictogramnaam" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" -msgstr "De naam van het pictogram (zonder extensie)" +msgstr "" +"De naam van het themapictogram dat moet worden vertoond naast het element" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" -msgstr "Label" +msgstr "Etiket" -#: ../libxfcegui4/xfce-appmenuitem.c:246 -#, fuzzy +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" -msgstr "Het label wordt weergegeven in het item" +msgstr "Het etiket dat wordt weergegeven in het element" -#: ../libxfcegui4/xfce-appmenuitem.c:250 -#, fuzzy +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "Opstart bericht" +msgstr "Opstartmelding" -#: ../libxfcegui4/xfce-appmenuitem.c:251 -#, fuzzy +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "Of de applicatie ondersteunt opstarten aanmelding" +msgstr "Of de toepassing al dan niet opstartmelding ondersteunt" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" -msgstr "Gebruik onderstrepen" +msgstr "Onderstrepen gebruiken" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" msgstr "" +"Al dan niet een laagliggend streepje gebruiken in het etiket, als een " +"toetsenbord-geheugenhulp" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." -msgstr "%s info..." +msgstr "Over %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" -msgstr "Thuispagina" +msgstr "Bezoek thuispagina" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Info" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Dankwoord" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Licentie" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" -msgstr "Verkrijgen beheerder selectie mislukt" +msgstr "Verkrijgen beheerderselectie mislukt" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" msgstr "" -"systeemvak icoon heeft een formaat van (%i x %i), schalen naar (%i x %i)" +"systeemvakpictogram heeft een formaat van (%i x %i), schalen naar (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "systeemvak icoon is niet verbonden, wordt vernietigd" +msgstr "systeemvakpictogram was niet verbonden, wordt vernietigd" #: ../glade/xfce4.xml.in.h:9 -#, fuzzy msgid "Dialog Header" -msgstr "Dialog Header" +msgstr "Dialoogkop" #: ../glade/xfce4.xml.in.h:10 msgid "Icon" @@ -176,50 +177,46 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:18 -#, fuzzy msgid "Icon Filename" -msgstr "Pictogram" +msgstr "Naam van pictogrambestand" #: ../glade/xfce4.xml.in.h:19 -#, fuzzy msgid "Icon Name" -msgstr "Pictogram" +msgstr "Pictogramnaam" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:35 -#, fuzzy msgid "Launcher Menu Item" -msgstr "Launcher Menu Item" +msgstr "Startmenu-element" #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "Bewegings Greep" +msgstr "Verplaats greep" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:44 -#, fuzzy msgid "Needs Terminal" msgstr "Terminal nodig" #: ../glade/xfce4.xml.in.h:45 msgid "Scaled Image" -msgstr "Gescaled Image" +msgstr "Geschaalde afbeelding" #: ../glade/xfce4.xml.in.h:46 msgid "Subtitle" @@ -229,47 +226,44 @@ #. create and populate the XfceAboutInfo struct. #. -#. +#. #. -#. +#. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "Ondersteunt Startup bericht" +msgstr "Ondersteunt opstartmelding" #: ../glade/xfce4.xml.in.h:55 -#, fuzzy msgid "Title" msgstr "Titel" #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "Getitelde Dialoog" +msgstr "Getitelde dialoog" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" msgstr "Xfce4 Widgets" -#, fuzzy #~ msgid "" #~ "This shortcut is already being used for another window manager action. " #~ "Which action do you want to use?" #~ msgstr "" -#~ "Deze snelkoppeling wordt al gebruikt voor een andere window manager " -#~ "actie. Welke actie wilt u gebruiken?" +#~ "Deze sneltoets wordt al gebruikt voor een andere actie van de " +#~ "vensterbeheerder. Welke actie wilt u gebruiken?" #~ msgid "Use '%s'" #~ msgstr "Gebruik '%s'" -#, fuzzy #~ msgid "Keep the other one" -#~ msgstr "Houd de andere" +#~ msgstr "Behoud de andere" #~ msgid "" #~ "This shortcut is already being used for the command '%s'. Which action do " #~ "you want to use?" #~ msgstr "" -#~ "Deze snelkoppeling wordt al gebruikt voor het commando '%s'. Welke actie " -#~ "wilt u gebruiken?" +#~ "Deze sneltoets wordt al gebruikt voor de opdracht '%s'. Welke actie wilt " +#~ "u gebruiken?" #~ msgid "Keep '%s'" #~ msgstr "Behoud '% s'" @@ -278,42 +272,41 @@ #~ "This shortcut is already being used by a window manager action. Which " #~ "action do you want to use?" #~ msgstr "" -#~ "Deze snelkoppeling wordt reeds gebruikt door een window manager actie. " -#~ "Welke actie wilt u gebruiken?" +#~ "Deze sneltoets wordt reeds gebruikt door een vensterbeheerderactie. Welke " +#~ "actie wilt u gebruiken?" #~ msgid "Keep the window manager action" -#~ msgstr "Bewaar de window manager actie" +#~ msgstr "Bewaar de vensterbeheerderactie" #~ msgid "Conflicting actions for %s" #~ msgstr "Tegenstrijdige acties voor %s" #~ msgid "This shortcut is already being used for something else." -#~ msgstr "Deze snelkoppeling wordt al gebruikt voor iets anders." +#~ msgstr "Deze sneltoets wordt al gebruikt voor iets anders." #~ msgid "Window Manager Action Shortcut" -#~ msgstr "Window Manager Actie Shortcut" +#~ msgstr "Sneltoets voor de vensterbeheerderactie" #~ msgid "Action:" #~ msgstr "Actie:" #~ msgid "Command Shortcut" -#~ msgstr "Command Snelkoppeling" +#~ msgstr "Opdracht-sneltoets" #~ msgid "Command:" -#~ msgstr "Commando:" +#~ msgstr "Opdracht:" -#, fuzzy #~ msgid "Shortcut" -#~ msgstr "Snelkoppeling" +#~ msgstr "Sneltoets" #~ msgid "Shortcut:" -#~ msgstr "Snelkoppeling:" +#~ msgstr "Sneltoets:" #~ msgid "Could not grab the keyboard." #~ msgstr "Kon het toetsenbord niet verkrijgen" #~ msgid "%s" -#~ msgstr "% s" +#~ msgstr "%s" #~ msgid "Command: %s" -#~ msgstr "Commando" +#~ msgstr "Opdracht: %s" diff -Nru libxfcegui4-4.8.1/po/nn.po libxfcegui4-4.10.0/po/nn.po --- libxfcegui4-4.8.1/po/nn.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/po/nn.po 2012-04-28 20:10:43.000000000 +0000 @@ -0,0 +1,246 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: libxfce4gui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-01-06 21:27+0000\n" +"PO-Revision-Date: 2012-01-07 01:33+0100\n" +"Last-Translator: Eivind Ødegård \n" +"Language-Team: nn_NO \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Norwegian Nynorsk\n" +"X-Poedit-Country: NORWAY\n" + +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 +msgid "Workspace" +msgstr "Arbeidsflate" + +#: ../libxfcegui4/netk-window-action-menu.c:245 +msgid "S_how" +msgstr "_Vis" + +#: ../libxfcegui4/netk-window-action-menu.c:252 +msgid "_Hide" +msgstr "_Gøym" + +#: ../libxfcegui4/netk-window-action-menu.c:260 +msgid "Un_maximize" +msgstr "_Avmaksimer" + +#: ../libxfcegui4/netk-window-action-menu.c:267 +msgid "Ma_ximize" +msgstr "_Maksimer" + +#: ../libxfcegui4/netk-window-action-menu.c:275 +msgid "Un_shade" +msgstr "_Fjern skugge" + +#: ../libxfcegui4/netk-window-action-menu.c:282 +msgid "_Shade" +msgstr "_Skuggelegg" + +#: ../libxfcegui4/netk-window-action-menu.c:290 +msgid "Uns_tick" +msgstr "A_vklistra" + +#: ../libxfcegui4/netk-window-action-menu.c:298 +msgid "S_tick" +msgstr "_Klistra" + +#: ../libxfcegui4/netk-window-action-menu.c:438 +msgid "Send to..." +msgstr "Send til..." + +#: ../libxfcegui4/netk-window-action-menu.c:462 +msgid "_Close" +msgstr "_Lukk" + +#: ../libxfcegui4/xfce-appmenuitem.c:229 +msgid "Needs terminal" +msgstr "Treng terminal" + +#: ../libxfcegui4/xfce-appmenuitem.c:230 +msgid "Whether or not the command needs a terminal to execute" +msgstr "Om denne kommandoen treng terminal eller ikkje for å køyra" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 +#: ../glade/xfce4.xml.in.h:8 +msgid "Command" +msgstr "Kommando" + +#: ../libxfcegui4/xfce-appmenuitem.c:235 +msgid "The command to run when the item is clicked" +msgstr "Kommandoen me skal køyra når du klikkar på elementet" + +#: ../libxfcegui4/xfce-appmenuitem.c:239 +msgid "Icon name" +msgstr "Namn på ikonet" + +#: ../libxfcegui4/xfce-appmenuitem.c:240 +msgid "The name of the themed icon to display next to the item" +msgstr "Namnet på temaikonet me skal visa ved sidan av elementet" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 +#: ../glade/xfce4.xml.in.h:27 +msgid "Label" +msgstr "Merke" + +#: ../libxfcegui4/xfce-appmenuitem.c:245 +msgid "The label displayed in the item" +msgstr "Merket som skal visast i elementet" + +#: ../libxfcegui4/xfce-appmenuitem.c:249 +msgid "Startup notification" +msgstr "Oppstartsvarsling" + +#: ../libxfcegui4/xfce-appmenuitem.c:250 +msgid "Whether or not the app supports startup notification" +msgstr "Om programmet støttar oppstartsvarsling eller ikkje" + +#: ../libxfcegui4/xfce-appmenuitem.c:254 +msgid "Use underline" +msgstr "Bruk understreking" + +#: ../libxfcegui4/xfce-appmenuitem.c:255 +msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" +msgstr "Om me skal bruka understreking i merket som tastaturhjelp" + +#. set window title +#: ../libxfcegui4/xfce_aboutdialog.c:641 +#, c-format +msgid "About %s..." +msgstr "Om %s..." + +#: ../libxfcegui4/xfce_aboutdialog.c:997 +msgid "Visit homepage" +msgstr "Gå til heimesida" + +#: ../libxfcegui4/xfce_aboutdialog.c:1009 +msgid "Info" +msgstr "Info" + +#: ../libxfcegui4/xfce_aboutdialog.c:1031 +msgid "Credits" +msgstr "Heider og ære" + +#: ../libxfcegui4/xfce_aboutdialog.c:1053 +msgid "License" +msgstr "Lisens" + +#: ../libxfcegui4/xfce_systemtray.c:314 +#: ../libxfcegui4/xfce_systemtray.c:318 +#, c-format +msgid "Failed to acquire manager selection" +msgstr "Greidde ikkje henta handteringsutval" + +#: ../libxfcegui4/xfce_systemtray.c:454 +#, c-format +msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" +msgstr "traug-ikonet vil ha ein storleik på (%i*%i), endrar til (%i*%i)" + +#: ../libxfcegui4/xfce_systemtray.c:463 +msgid "tray icon was not attached, destroying it" +msgstr "traug-ikonet vart ikkje lagt ved, øydar det" + +#: ../glade/xfce4.xml.in.h:9 +msgid "Dialog Header" +msgstr "Dialogoverskrift" + +#: ../glade/xfce4.xml.in.h:10 +msgid "Icon" +msgstr "Ikon" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:18 +msgid "Icon Filename" +msgstr "Filnamn på ikonet" + +#: ../glade/xfce4.xml.in.h:19 +msgid "Icon Name" +msgstr "Namn på ikonet" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:35 +msgid "Launcher Menu Item" +msgstr "Menyoppføring for startar" + +#: ../glade/xfce4.xml.in.h:36 +msgid "Move Handle" +msgstr "Flytt handtak" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:44 +msgid "Needs Terminal" +msgstr "Treng terminal" + +#: ../glade/xfce4.xml.in.h:45 +msgid "Scaled Image" +msgstr "Skalert bilete" + +#: ../glade/xfce4.xml.in.h:46 +msgid "Subtitle" +msgstr "Undertittel" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:54 +msgid "Supports Startup Notification" +msgstr "Støttar oppstartsvarsling" + +#: ../glade/xfce4.xml.in.h:55 +msgid "Title" +msgstr "Tittel" + +#: ../glade/xfce4.xml.in.h:56 +msgid "Titled Dialog" +msgstr "Dialog med tittel" + +#: ../glade/xfce4.xml.in.h:57 +msgid "Xfce4 Widgets" +msgstr "Småprogram for Xfce4" + diff -Nru libxfcegui4-4.8.1/po/pt_BR.po libxfcegui4-4.10.0/po/pt_BR.po --- libxfcegui4-4.8.1/po/pt_BR.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/pt_BR.po 2012-04-28 20:10:43.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2009-01-16 12:18-0500\n" +"POT-Creation-Date: 2012-04-14 16:27+0000\n" +"PO-Revision-Date: 2012-04-14 17:38-0300\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -20,56 +20,56 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "Espaço de trabalho" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" msgstr "M_ostrar" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "_Ocultar" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" msgstr "Desfazer _maximizar" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" msgstr "Ma_ximizar" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" msgstr "Desfazer _sombrear" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" msgstr "_Sombrear" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" msgstr "Desfazer fi_xar" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" msgstr "_Fixar" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." msgstr "Enviar para..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "_Fechar" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "Precisa do terminal" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" msgstr "Se o comando precisa ou não de um terminal para executar" @@ -80,19 +80,19 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Comando" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" msgstr "O comando a ser executado quando o item é clicado" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "Nome do ícone" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" msgstr "O nome do ícone temático a ser exibido próximo ao item" @@ -103,65 +103,65 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "Rótulo" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" msgstr "O rótulo exibido no item" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" msgstr "Notificação de inicialização" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" msgstr "Se o aplicativo tem suporte a notificações de inicialização" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "Usar sublinhado" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" msgstr "Se usar um sublinhado no rótulo como um mnemônico de teclado" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "Sobre %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "Visitar página inicial" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "Informações" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" msgstr "Créditos" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" msgstr "Licença" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" msgstr "Falha ao obter a seleção do gerenciador" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" msgstr "" "o ícone da bandeja do sistema requisitou um tamanho de (%i x %i), " "redimensionando para (%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" msgstr "o ícone de notificação do sistema não foi anexado, destruindo-o" @@ -243,7 +243,7 @@ #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" -msgstr "Widgets do s/Xfce4" +msgstr "Widgets do Xfce4" #~ msgid "" #~ "This shortcut is already being used for another window manager action. " diff -Nru libxfcegui4-4.8.1/po/pt.po libxfcegui4-4.10.0/po/pt.po --- libxfcegui4-4.8.1/po/pt.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/pt.po 2012-04-28 20:10:43.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: libxfcegui4 4.4.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-16 16:16+0100\n" -"PO-Revision-Date: 2009-02-25 16:39+0100\n" -"Last-Translator: Nuno Miguel \n" +"PO-Revision-Date: 2012-01-18 14:36-0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,11 @@ #: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Needs terminal" -msgstr "Necessita de terminal" +msgstr "Requer terminal" #: ../libxfcegui4/xfce-appmenuitem.c:231 msgid "Whether or not the command needs a terminal to execute" -msgstr "Se o comando precisa ou não de um terminal para executar" +msgstr "Se o comando precisa ou não de um terminal para ser executado" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -78,7 +78,8 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:235 +#: ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "Comando" @@ -101,13 +102,14 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:245 +#: ../glade/xfce4.xml.in.h:27 msgid "Label" -msgstr "Etiqueta" +msgstr "Texto" #: ../libxfcegui4/xfce-appmenuitem.c:246 msgid "The label displayed in the item" -msgstr "A etiqueta mostrada no item" +msgstr "O texto exibido no item" #: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Startup notification" @@ -137,7 +139,7 @@ #: ../libxfcegui4/xfce_aboutdialog.c:1010 msgid "Info" -msgstr "Info" +msgstr "Informações" #: ../libxfcegui4/xfce_aboutdialog.c:1032 msgid "Credits" @@ -147,17 +149,16 @@ msgid "License" msgstr "Licença" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:315 +#: ../libxfcegui4/xfce_systemtray.c:319 #, c-format msgid "Failed to acquire manager selection" -msgstr "Falha ao adquirir a selecção do gestor" +msgstr "Falha ao adquirir a seleção do gestor" #: ../libxfcegui4/xfce_systemtray.c:455 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "" -"o ícone da bandeja do sistema requisitou um tamanho de (%i x %i), ajustado " -"para (%i x %i)" +msgstr "o ícone da bandeja do sistema requisitou o tamanho (%i x %i), ajustado para (%i x %i)" #: ../libxfcegui4/xfce_systemtray.c:464 msgid "tray icon was not attached, destroying it" @@ -199,7 +200,7 @@ #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "Mover manípulo" +msgstr "Mover guia" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -210,7 +211,7 @@ #. #: ../glade/xfce4.xml.in.h:44 msgid "Needs Terminal" -msgstr "Necessita de terminal" +msgstr "Requer terminal" #: ../glade/xfce4.xml.in.h:45 msgid "Scaled Image" @@ -237,7 +238,7 @@ #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "Diálogo intitulado" +msgstr "Diálogo entitulado" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" diff -Nru libxfcegui4-4.8.1/po/te.po libxfcegui4-4.10.0/po/te.po --- libxfcegui4-4.8.1/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfcegui4-4.10.0/po/te.po 2012-04-28 20:10:43.000000000 +0000 @@ -0,0 +1,240 @@ +# Xfce Telugu Translation. +# Copyright (C) 2011 Telugu Linux Development Team. +# This file is distributed under the same license as the PACKAGE package. +# Praveen Illa , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: libxfce4.master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-21 04:14+0000\n" +"PO-Revision-Date: 2011-07-13 20:20+0530\n" +"Last-Translator: Praveen Illa \n" +"Language-Team: Telugu \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 +msgid "Workspace" +msgstr "కార్యక్షేత్రం" + +#: ../libxfcegui4/netk-window-action-menu.c:245 +msgid "S_how" +msgstr "చూపించు (_h)" + +#: ../libxfcegui4/netk-window-action-menu.c:252 +msgid "_Hide" +msgstr "దాయి (_H)" + +#: ../libxfcegui4/netk-window-action-menu.c:260 +msgid "Un_maximize" +msgstr "గరిష్ఠీకరించవద్దు (_m)" + +#: ../libxfcegui4/netk-window-action-menu.c:267 +msgid "Ma_ximize" +msgstr "గరిష్ఠీకరించు (_x)" + +#: ../libxfcegui4/netk-window-action-menu.c:275 +msgid "Un_shade" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:282 +msgid "_Shade" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:290 +msgid "Uns_tick" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:298 +msgid "S_tick" +msgstr "" + +#: ../libxfcegui4/netk-window-action-menu.c:438 +msgid "Send to..." +msgstr "ఇచటకు పంపు..." + +#: ../libxfcegui4/netk-window-action-menu.c:462 +msgid "_Close" +msgstr "మూసివేయి(_C)" + +#: ../libxfcegui4/xfce-appmenuitem.c:229 +msgid "Needs terminal" +msgstr "టెర్మినల్ అవసరం" + +#: ../libxfcegui4/xfce-appmenuitem.c:230 +msgid "Whether or not the command needs a terminal to execute" +msgstr "" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 +msgid "Command" +msgstr "ఆదేశం" + +#: ../libxfcegui4/xfce-appmenuitem.c:235 +msgid "The command to run when the item is clicked" +msgstr "" + +#: ../libxfcegui4/xfce-appmenuitem.c:239 +msgid "Icon name" +msgstr "ప్రతీక పేరు" + +#: ../libxfcegui4/xfce-appmenuitem.c:240 +msgid "The name of the themed icon to display next to the item" +msgstr "" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 +msgid "Label" +msgstr "గుర్తు" + +#: ../libxfcegui4/xfce-appmenuitem.c:245 +msgid "The label displayed in the item" +msgstr "" + +#: ../libxfcegui4/xfce-appmenuitem.c:249 +msgid "Startup notification" +msgstr "ప్రారంభ ప్రకటన" + +#: ../libxfcegui4/xfce-appmenuitem.c:250 +msgid "Whether or not the app supports startup notification" +msgstr "" + +#: ../libxfcegui4/xfce-appmenuitem.c:254 +msgid "Use underline" +msgstr "కిందిగీత వాడు" + +#: ../libxfcegui4/xfce-appmenuitem.c:255 +msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" +msgstr "" + +#. set window title +#: ../libxfcegui4/xfce_aboutdialog.c:641 +#, c-format +msgid "About %s..." +msgstr "%s గురించి..." + +#: ../libxfcegui4/xfce_aboutdialog.c:997 +msgid "Visit homepage" +msgstr "నివాసపుటను సందర్శించు" + +#: ../libxfcegui4/xfce_aboutdialog.c:1009 +msgid "Info" +msgstr "సమాచారం" + +#: ../libxfcegui4/xfce_aboutdialog.c:1031 +msgid "Credits" +msgstr "పరపతులు" + +#: ../libxfcegui4/xfce_aboutdialog.c:1053 +msgid "License" +msgstr "లైసెన్స్" + +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 +#, c-format +msgid "Failed to acquire manager selection" +msgstr "" + +#: ../libxfcegui4/xfce_systemtray.c:454 +#, c-format +msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" +msgstr "" + +#: ../libxfcegui4/xfce_systemtray.c:463 +msgid "tray icon was not attached, destroying it" +msgstr "" + +#: ../glade/xfce4.xml.in.h:9 +msgid "Dialog Header" +msgstr "" + +#: ../glade/xfce4.xml.in.h:10 +msgid "Icon" +msgstr "ప్రతీక" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:18 +msgid "Icon Filename" +msgstr "ప్రతీక ఫైల్ పేరు" + +#: ../glade/xfce4.xml.in.h:19 +msgid "Icon Name" +msgstr "ప్రతీక పేరు" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:35 +msgid "Launcher Menu Item" +msgstr "మెనూ ప్రారంభ అంశం" + +#: ../glade/xfce4.xml.in.h:36 +msgid "Move Handle" +msgstr "" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:44 +msgid "Needs Terminal" +msgstr "టెర్మినల్ అవసరం" + +#: ../glade/xfce4.xml.in.h:45 +msgid "Scaled Image" +msgstr "కొలతలు మార్చబడిన బొమ్మ" + +#: ../glade/xfce4.xml.in.h:46 +msgid "Subtitle" +msgstr "ఉపశీర్షిక" + +#. TODO: this needs some special setup in the glade helper lib to +#. create and populate the XfceAboutInfo struct. +#. +#. +#. +#. +#: ../glade/xfce4.xml.in.h:54 +msgid "Supports Startup Notification" +msgstr "" + +#: ../glade/xfce4.xml.in.h:55 +msgid "Title" +msgstr "శీర్షిక" + +#: ../glade/xfce4.xml.in.h:56 +msgid "Titled Dialog" +msgstr "" + +#: ../glade/xfce4.xml.in.h:57 +msgid "Xfce4 Widgets" +msgstr "Xfce4 విడ్జెట్లు" diff -Nru libxfcegui4-4.8.1/po/zh_CN.po libxfcegui4-4.10.0/po/zh_CN.po --- libxfcegui4-4.8.1/po/zh_CN.po 2011-02-10 09:33:27.000000000 +0000 +++ libxfcegui4-4.10.0/po/zh_CN.po 2012-04-28 20:10:43.000000000 +0000 @@ -1,77 +1,80 @@ -# ----zh_CN.po (libxfcegui4 4.4.3) ----Simplified Chinese translations for libxfcegui4 package. -# Copyright (C) 2002-2006 The Xfce development team. -# This file is distributed under the same license as the libxfcegui4 package. +# Simplified Chinese translations for +# the libxfcegui4 package. +# This file is distributed under the same license as +# the libxfcegui4 package. # Yongtao Yang , 2004. # Huang Huan , 2006. # Hunt Xu , 2008. # Chris K. Zhang , 2009. # Aron Xu , 2009. +# Chipong Luo , 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: libxfcegui4 4.4.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:16+0100\n" +"Project-Id-Version: libxfcegui4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-04-20 10:27+0000\n" "PO-Revision-Date: 2009-06-14 02:14+0800\n" -"Last-Translator: Aron Xu \n" -"Language-Team: Chinese/Simplified \n" -"Language: \n" +"Last-Translator: Chipong Luo \n" +"Language-Team: Chinese (Simplified) \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../libxfcegui4/netk-window-action-menu.c:215 -#: ../libxfcegui4/netk-window-action-menu.c:217 +#: ../libxfcegui4/netk-window-action-menu.c:214 +#: ../libxfcegui4/netk-window-action-menu.c:216 msgid "Workspace" msgstr "工作区" -#: ../libxfcegui4/netk-window-action-menu.c:246 +#: ../libxfcegui4/netk-window-action-menu.c:245 msgid "S_how" -msgstr "显示(_h)" +msgstr "显示(_H)" -#: ../libxfcegui4/netk-window-action-menu.c:253 +#: ../libxfcegui4/netk-window-action-menu.c:252 msgid "_Hide" msgstr "隐藏(_H)" -#: ../libxfcegui4/netk-window-action-menu.c:261 +#: ../libxfcegui4/netk-window-action-menu.c:260 msgid "Un_maximize" -msgstr "恢复(_m)" +msgstr "取消最大化(_M)" -#: ../libxfcegui4/netk-window-action-menu.c:268 +#: ../libxfcegui4/netk-window-action-menu.c:267 msgid "Ma_ximize" -msgstr "最大化(_x)" +msgstr "最大化(_X)" -#: ../libxfcegui4/netk-window-action-menu.c:276 +#: ../libxfcegui4/netk-window-action-menu.c:275 msgid "Un_shade" -msgstr "展开(_s)" +msgstr "取消折叠(_S)" -#: ../libxfcegui4/netk-window-action-menu.c:283 +#: ../libxfcegui4/netk-window-action-menu.c:282 msgid "_Shade" -msgstr "卷起(_S)" +msgstr "折叠(_S)" -#: ../libxfcegui4/netk-window-action-menu.c:291 +#: ../libxfcegui4/netk-window-action-menu.c:290 msgid "Uns_tick" -msgstr "取消粘附(_t)" +msgstr "取消粘滞(_T)" -#: ../libxfcegui4/netk-window-action-menu.c:299 +#: ../libxfcegui4/netk-window-action-menu.c:298 msgid "S_tick" -msgstr "粘附(_t)" +msgstr "粘滞(_T)" -#: ../libxfcegui4/netk-window-action-menu.c:439 +#: ../libxfcegui4/netk-window-action-menu.c:438 msgid "Send to..." -msgstr "发送到..." +msgstr "发送至..." -#: ../libxfcegui4/netk-window-action-menu.c:463 +#: ../libxfcegui4/netk-window-action-menu.c:462 msgid "_Close" msgstr "关闭(_C)" -#: ../libxfcegui4/xfce-appmenuitem.c:230 +#: ../libxfcegui4/xfce-appmenuitem.c:229 msgid "Needs terminal" msgstr "需要终端" -#: ../libxfcegui4/xfce-appmenuitem.c:231 +#: ../libxfcegui4/xfce-appmenuitem.c:230 msgid "Whether or not the command needs a terminal to execute" -msgstr "该命令是否需要在终端中执行" +msgstr "此命令是否需要终端去执行" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -80,21 +83,21 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:235 ../glade/xfce4.xml.in.h:8 +#: ../libxfcegui4/xfce-appmenuitem.c:234 ../glade/xfce4.xml.in.h:8 msgid "Command" msgstr "命令" -#: ../libxfcegui4/xfce-appmenuitem.c:236 +#: ../libxfcegui4/xfce-appmenuitem.c:235 msgid "The command to run when the item is clicked" -msgstr "点击该项目时所运行的命令" +msgstr "点击此项目时所要运行的命令" -#: ../libxfcegui4/xfce-appmenuitem.c:240 +#: ../libxfcegui4/xfce-appmenuitem.c:239 msgid "Icon name" msgstr "图标名称" -#: ../libxfcegui4/xfce-appmenuitem.c:241 +#: ../libxfcegui4/xfce-appmenuitem.c:240 msgid "The name of the themed icon to display next to the item" -msgstr "显示在该项目旁边的主题图标名" +msgstr "显示在此项目旁边的主题图标名称" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -103,69 +106,69 @@ #. #. #. -#: ../libxfcegui4/xfce-appmenuitem.c:245 ../glade/xfce4.xml.in.h:27 +#: ../libxfcegui4/xfce-appmenuitem.c:244 ../glade/xfce4.xml.in.h:27 msgid "Label" msgstr "标签" -#: ../libxfcegui4/xfce-appmenuitem.c:246 +#: ../libxfcegui4/xfce-appmenuitem.c:245 msgid "The label displayed in the item" -msgstr "在项目中显示的标签" +msgstr "在此项目中显示的标签" -#: ../libxfcegui4/xfce-appmenuitem.c:250 +#: ../libxfcegui4/xfce-appmenuitem.c:249 msgid "Startup notification" -msgstr "启动提示" +msgstr "启动通知" -#: ../libxfcegui4/xfce-appmenuitem.c:251 +#: ../libxfcegui4/xfce-appmenuitem.c:250 msgid "Whether or not the app supports startup notification" -msgstr "程序是否支持启动提示" +msgstr "应用程序是否支持启动通知" -#: ../libxfcegui4/xfce-appmenuitem.c:255 +#: ../libxfcegui4/xfce-appmenuitem.c:254 msgid "Use underline" msgstr "使用下划线" -#: ../libxfcegui4/xfce-appmenuitem.c:256 +#: ../libxfcegui4/xfce-appmenuitem.c:255 msgid "Whether or not to use an underscore in the label as a keyboard mnemonic" -msgstr "是否在标签中使用下划线标示键盘快捷方式对应按键" +msgstr "是否在标签中使用下划线以帮助记忆快捷键" #. set window title -#: ../libxfcegui4/xfce_aboutdialog.c:642 +#: ../libxfcegui4/xfce_aboutdialog.c:641 #, c-format msgid "About %s..." msgstr "关于 %s..." -#: ../libxfcegui4/xfce_aboutdialog.c:998 +#: ../libxfcegui4/xfce_aboutdialog.c:997 msgid "Visit homepage" msgstr "访问主页" -#: ../libxfcegui4/xfce_aboutdialog.c:1010 +#: ../libxfcegui4/xfce_aboutdialog.c:1009 msgid "Info" msgstr "信息" -#: ../libxfcegui4/xfce_aboutdialog.c:1032 +#: ../libxfcegui4/xfce_aboutdialog.c:1031 msgid "Credits" -msgstr "光荣榜" +msgstr "鸣谢" -#: ../libxfcegui4/xfce_aboutdialog.c:1054 +#: ../libxfcegui4/xfce_aboutdialog.c:1053 msgid "License" -msgstr "许可证" +msgstr "许可协议" -#: ../libxfcegui4/xfce_systemtray.c:315 ../libxfcegui4/xfce_systemtray.c:319 +#: ../libxfcegui4/xfce_systemtray.c:314 ../libxfcegui4/xfce_systemtray.c:318 #, c-format msgid "Failed to acquire manager selection" -msgstr "获取管理器选择失败" +msgstr "无法获取管理器选择区" -#: ../libxfcegui4/xfce_systemtray.c:455 +#: ../libxfcegui4/xfce_systemtray.c:454 #, c-format msgid "tray icon has requested a size of (%i x %i), resizing to (%i x %i)" -msgstr "系统托盘图标要求尺寸为（%i x %i），调整尺寸为（%i x %i）" +msgstr "系统托盘图标要求大小为(%i x %i)，调整大小为(%i x %i)" -#: ../libxfcegui4/xfce_systemtray.c:464 +#: ../libxfcegui4/xfce_systemtray.c:463 msgid "tray icon was not attached, destroying it" -msgstr "系统托盘图标未附着，正在消除" +msgstr "系统托盘图标未附加，正在消除" #: ../glade/xfce4.xml.in.h:9 msgid "Dialog Header" -msgstr "对话框标题" +msgstr "对话框页眉" #: ../glade/xfce4.xml.in.h:10 msgid "Icon" @@ -195,11 +198,11 @@ #. #: ../glade/xfce4.xml.in.h:35 msgid "Launcher Menu Item" -msgstr "启动器菜单项" +msgstr "启动器菜单项目" #: ../glade/xfce4.xml.in.h:36 msgid "Move Handle" -msgstr "移动控制柄" +msgstr "移动控制器" #. TODO: this needs some special setup in the glade helper lib to #. create and populate the XfceAboutInfo struct. @@ -229,7 +232,7 @@ #. #: ../glade/xfce4.xml.in.h:54 msgid "Supports Startup Notification" -msgstr "支持启动提示" +msgstr "支持启动通知" #: ../glade/xfce4.xml.in.h:55 msgid "Title" @@ -237,71 +240,8 @@ #: ../glade/xfce4.xml.in.h:56 msgid "Titled Dialog" -msgstr "带标题的对话框" +msgstr "有标题的对话框" #: ../glade/xfce4.xml.in.h:57 msgid "Xfce4 Widgets" -msgstr "Xfce4 控件" - -#~ msgid "" -#~ "This shortcut is already being used for another window manager action. " -#~ "Which action do you want to use?" -#~ msgstr "该快捷方式已被用于另一个窗口管理器操作。您想用于哪一个？" - -#~ msgid "Use '%s'" -#~ msgstr "使用“%s”" - -#~ msgid "Keep the other one" -#~ msgstr "保持另一个" - -#~ msgid "" -#~ "This shortcut is already being used for the command '%s'. Which action do " -#~ "you want to use?" -#~ msgstr "该快捷方式已被用于“%s”命令。您想用于哪一个？" - -#~ msgid "Keep '%s'" -#~ msgstr "保持“%s”" - -#~ msgid "" -#~ "This shortcut is already being used by a window manager action. Which " -#~ "action do you want to use?" -#~ msgstr "该快捷方式已被用于一个窗口管理器操作。您想用于哪一个？" - -#~ msgid "Keep the window manager action" -#~ msgstr "保持窗口管理器操作" - -#~ msgid "Conflicting actions for %s" -#~ msgstr "%s 有操作冲突" - -#~ msgid "This shortcut is already being used for something else." -#~ msgstr "该快捷方式已被使用" - -#~ msgid "Window Manager Action Shortcut" -#~ msgstr "窗口管理器操作快捷方式" - -#~ msgid "Action:" -#~ msgstr "操作：" - -#~ msgid "Command Shortcut" -#~ msgstr "命令快捷方式" - -#~ msgid "Command:" -#~ msgstr "命令：" - -#~ msgid "Shortcut" -#~ msgstr "快捷方式" - -#~ msgid "Shortcut:" -#~ msgstr "快捷方式：" - -#~ msgid "Could not grab the keyboard." -#~ msgstr "无法捕捉键盘。" - -#~ msgid "%s" -#~ msgstr "%s" - -#~ msgid "Command: %s" -#~ msgstr "命令：%s" - -#~ msgid "Enter shortcut" -#~ msgstr "输入快捷方式" +msgstr "Xfce 4 控件"