r24254 - in /desktop/unstable/gnome-panel/debian: changelog control control.in patches/10_clock_applet_link_gnome_desktop.patch patches/30_xrandr_crashes.patch patches/70_relibtoolize.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed May 5 08:05:06 UTC 2010
Author: slomo
Date: Wed May 5 08:05:04 2010
New Revision: 24254
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24254
Log:
* New upstream stable release:
+ debian/patches/30_xrandr_crashes.patch,
debian/patches/10_clock_applet_link_gnome_desktop.patch:
- Dropped, merged upstream.
+ debian/patches/70_relibtoolize.patch:
- Regenerated for the new version.
+ debian/control.in:
- Update build dependencies and dependencies.
Removed:
desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch
desktop/unstable/gnome-panel/debian/patches/30_xrandr_crashes.patch
Modified:
desktop/unstable/gnome-panel/debian/changelog
desktop/unstable/gnome-panel/debian/control
desktop/unstable/gnome-panel/debian/control.in
desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
desktop/unstable/gnome-panel/debian/patches/series
Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=24254&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Wed May 5 08:05:04 2010
@@ -1,3 +1,16 @@
+gnome-panel (2.30.0-1) unstable; urgency=low
+
+ * New upstream stable release:
+ + debian/patches/30_xrandr_crashes.patch,
+ debian/patches/10_clock_applet_link_gnome_desktop.patch:
+ - Dropped, merged upstream.
+ + debian/patches/70_relibtoolize.patch:
+ - Regenerated for the new version.
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 05 May 2010 09:52:06 +0200
+
gnome-panel (2.28.0-3) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=24254&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Wed May 5 08:05:04 2010
@@ -7,8 +7,8 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>
-Standards-Version: 3.8.1
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>, Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.8.4
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
quilt,
@@ -19,10 +19,10 @@
python,
libx11-dev,
libxau-dev,
- libgtk2.0-dev (>= 2.15.1),
- libgnomeui-dev (>= 2.16.0-2),
+ libice-dev,
+ libsm-dev,
+ libgtk2.0-dev (>= 2.19.7),
libgnome-desktop-dev (>= 2.26),
- libgnome2-dev (>= 2.13.0),
libbonoboui2-dev (>= 2.1.1),
liborbit2-dev (>= 1:2.12.1),
libwnck-dev (>= 2.19.5),
@@ -43,7 +43,8 @@
network-manager-dev (>= 0.6) | not+linux-gnu,
libnm-util-dev (>= 0.6) | not+linux-gnu,
libpolkit-gobject-1-dev (>= 0.91),
- libxrandr-dev (>= 2:1.2.0)
+ libxrandr-dev (>= 2:1.2.0),
+ libcanberra-gtk-dev
Package: gnome-panel
Architecture: any
@@ -108,8 +109,7 @@
Depends: ${misc:Depends},
libpanel-applet2-0 (= ${binary:Version}),
libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.13.1),
- libgnomeui-dev (>= 2.5.4),
+ libgtk2.0-dev (>= 2.19.7),
libbonoboui2-dev (>= 2.1.1)
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=24254&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Wed May 5 08:05:04 2010
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
quilt,
@@ -14,10 +14,10 @@
python,
libx11-dev,
libxau-dev,
- libgtk2.0-dev (>= 2.15.1),
- libgnomeui-dev (>= 2.16.0-2),
+ libice-dev,
+ libsm-dev,
+ libgtk2.0-dev (>= 2.19.7),
libgnome-desktop-dev (>= 2.26),
- libgnome2-dev (>= 2.13.0),
libbonoboui2-dev (>= 2.1.1),
liborbit2-dev (>= 1:2.12.1),
libwnck-dev (>= 2.19.5),
@@ -38,7 +38,8 @@
network-manager-dev (>= 0.6) | not+linux-gnu,
libnm-util-dev (>= 0.6) | not+linux-gnu,
libpolkit-gobject-1-dev (>= 0.91),
- libxrandr-dev (>= 2:1.2.0)
+ libxrandr-dev (>= 2:1.2.0),
+ libcanberra-gtk-dev
Package: gnome-panel
Architecture: any
@@ -103,8 +104,7 @@
Depends: ${misc:Depends},
libpanel-applet2-0 (= ${binary:Version}),
libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.13.1),
- libgnomeui-dev (>= 2.5.4),
+ libgtk2.0-dev (>= 2.19.7),
libbonoboui2-dev (>= 2.1.1)
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Modified: desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch?rev=24254&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] Wed May 5 08:05:04 2010
@@ -1,13 +1,13 @@
-libtoolize --force --copy
-aclocal -I m4
-automake -acf -Wno-portability
-autoheader
-autoconf
-rm -rf autom4te.cache config.h.in~
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -13,2102 +13,2105 @@
+diff -Naur gnome-panel-2.30.0.old/aclocal.m4 gnome-panel-2.30.0/aclocal.m4
+--- gnome-panel-2.30.0.old/aclocal.m4 2010-03-30 02:52:39.000000000 +0200
++++ gnome-panel-2.30.0/aclocal.m4 2010-05-05 10:03:27.282509637 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@@ -13,2102 +13,2121 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -268,17 +268,15 @@
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
--
++AC_SUBST($1)dnl
++])
+
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+AC_SUBST($1)dnl
-+])
-
--# serial 10
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
@@ -286,16 +284,21 @@
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
+-# serial 10
++ gt_cv_have_gettext=no
+
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+ gt_cv_have_gettext=no
-
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
+
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
@@ -371,10 +374,7 @@
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-
+-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
@@ -473,7 +473,18 @@
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
--
+
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
-# AM_DEP_TRACK
-# ------------
@@ -500,17 +511,16 @@
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
@@ -566,17 +576,6 @@
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
@@ -588,6 +587,17 @@
+ unset ac_cv_func_bind_textdomain_codeset
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ LIBS="$glib_save_LIBS"
+
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
@@ -601,23 +611,6 @@
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
@@ -683,14 +676,18 @@
+ fi
+ ])
--# serial 8
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
+ fi
--# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+-# serial 8
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
@@ -704,9 +701,16 @@
+ fi
+ fi
--# Do all the work for Automake. -*- Autoconf -*-
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ # We need to process the po/ directory.
+ POSUB=po
+
+-# Do all the work for Automake. -*- Autoconf -*-
++ AC_OUTPUT_COMMANDS(
++ [case "$CONFIG_FILES" in *po/Makefile.in*)
++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++ esac])
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
@@ -714,12 +718,6 @@
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ AC_OUTPUT_COMMANDS(
-+ [case "$CONFIG_FILES" in *po/Makefile.in*)
-+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+ esac])
-
--# serial 16
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
@@ -728,8 +726,7 @@
+ POFILES="$POFILES $lang.po"
+ done
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
+-# serial 16
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
@@ -742,6 +739,25 @@
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
+
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
++# AM_GLIB_GNU_GETTEXT
++# -------------------
++# Do checks necessary for use of gettext. If a suitable implementation
++# of gettext is found in either in libintl or in the C library,
++# it will set INTLLIBS to the libraries needed for use of gettext
++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
++# on various variables needed by the Makefile.in.in installed by
++# glib-gettextize.
++dnl
++glib_DEFUN([GLIB_GNU_GETTEXT],
++ [AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++
++ GLIB_LC_MESSAGES
++ GLIB_WITH_NLS
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
@@ -770,32 +786,6 @@
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
-+# AM_GLIB_GNU_GETTEXT
-+# -------------------
-+# Do checks necessary for use of gettext. If a suitable implementation
-+# of gettext is found in either in libintl or in the C library,
-+# it will set INTLLIBS to the libraries needed for use of gettext
-+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-+# on various variables needed by the Makefile.in.in installed by
-+# glib-gettextize.
-+dnl
-+glib_DEFUN([GLIB_GNU_GETTEXT],
-+ [AC_REQUIRE([AC_PROG_CC])dnl
-+ AC_REQUIRE([AC_HEADER_STDC])dnl
-+
-+ GLIB_LC_MESSAGES
-+ GLIB_WITH_NLS
-
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -827,6 +817,21 @@
+ AC_MSG_RESULT($LINGUAS)
+ fi
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
++ dnl Construct list of names of catalog files to be constructed.
++ if test -n "$LINGUAS"; then
++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++ fi
++ fi
+
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
@@ -839,15 +844,6 @@
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+ dnl Construct list of names of catalog files to be constructed.
-+ if test -n "$LINGUAS"; then
-+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+ fi
-+ fi
-
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
@@ -859,6 +855,26 @@
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++ dnl Generate list of files to be processed by xgettext which will
++ dnl be included in po/Makefile.
++ test -d po || mkdir po
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -900,23 +916,6 @@
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+ dnl Generate list of files to be processed by xgettext which will
-+ dnl be included in po/Makefile.
-+ test -d po || mkdir po
-+ if test "x$srcdir" != "x."; then
-+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+ posrcprefix="$srcdir/"
-+ else
-+ posrcprefix="../$srcdir/"
-+ fi
-+ else
-+ posrcprefix="../"
-+ fi
-+ rm -f po/POTFILES
-+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+ < $srcdir/po/POTFILES.in > po/POTFILES
-+ ])
-+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
@@ -946,6 +945,7 @@
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+-
+dnl
+dnl Now the definitions that aclocal will find
+dnl
@@ -954,6 +954,9 @@
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
@@ -969,10 +972,6 @@
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
-
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
@@ -990,15 +989,14 @@
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+# gnome-common.m4
-+#
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+dnl GNOME_COMMON_INIT
++# gnome-common.m4
++#
-# AM_PROG_INSTALL_SH
-# ------------------
@@ -1014,26 +1012,25 @@
- esac
-fi
-AC_SUBST(install_sh)])
-+AC_DEFUN([GNOME_COMMON_INIT],
-+[
-+ dnl this macro should come after AC_CONFIG_MACRO_DIR
-+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++dnl GNOME_COMMON_INIT
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++ dnl this macro should come after AC_CONFIG_MACRO_DIR
++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
+-# serial 2
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+ if test -n "$ac_macro_dir"; then
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+ fi
-
--# serial 2
-+ AC_SUBST([ACLOCAL_AMFLAGS])
-+])
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
@@ -1047,6 +1044,11 @@
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
++ AC_SUBST([ACLOCAL_AMFLAGS])
++])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
+AC_DEFUN([GNOME_DEBUG_CHECK],
+[
+ AC_ARG_ENABLE([debug],
@@ -1054,35 +1056,25 @@
+ [turn on debugging]),,
+ [enable_debug=no])
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
++])
+
+-# serial 5
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+ AC_REQUIRE([AM_MAINTAINER_MODE])
-
--# serial 5
-+ DISABLE_DEPRECATED=""
-+ if test $USE_MAINTAINER_MODE = yes; then
-+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-+ for DOMAIN in $DOMAINS; do
-+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-+ done
-+ fi
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
@@ -1109,10 +1101,19 @@
- AC_SUBST([MAINT])dnl
-]
-)
++ DISABLE_DEPRECATED=""
++ if test $USE_MAINTAINER_MODE = yes; then
++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
++ for DOMAIN in $DOMAINS; do
++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
++ done
++ fi
+
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ AC_SUBST(DISABLE_DEPRECATED)
+])
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
@@ -1121,25 +1122,21 @@
+ dnl More compiler warnings
+ dnl ******************************
--# Check to see how 'make' treats includes. -*- Autoconf -*-
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
+
+-# serial 4
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
-
--# serial 4
-+ warning_flags=
-+ realsave_CFLAGS="$CFLAGS"
-# AM_MAKE_INCLUDE()
-# -----------------
@@ -1182,6 +1179,15 @@
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
+
+-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -1223,33 +1229,11 @@
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
--# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
--# 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 6
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
-
--# serial 6
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCFLAGS)
-# AM_PROG_CC_C_O
-# --------------
@@ -1275,6 +1259,22 @@
-dnl setting of CC.
-m4_define([AC_PROG_CC],
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+ AC_SUBST(WARN_CFLAGS)
])
@@ -1476,7 +1476,11 @@
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
-+
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
@@ -1496,16 +1500,17 @@
+ $3])dnl
+fi])
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# 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)])])
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
@@ -1522,11 +1527,11 @@
+fi[]dnl
+])# _PKG_CONFIG
--# _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)])])
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -1538,21 +1543,13 @@
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
-# Free Software Foundation, Inc.
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
- #
+-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
+
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ---------------------------------------------------------------------------
-# Adds support for distributing Python modules and packages. To
@@ -1560,19 +1557,21 @@
-# automake variable. To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
#
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
@@ -1585,6 +1584,7 @@
- m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0])
++#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
@@ -1740,7 +1740,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], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
@@ -1780,7 +1780,7 @@
+# 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])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -2344,12 +2344,19 @@
- fi
-done
-rm -rf conftest.dir
-
+-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
+
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+-dnl you should install foo.schemas files
+-dnl
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -2363,19 +2370,6 @@
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
--dnl AM_GCONF_SOURCE_2
--dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
--dnl (i.e. pass to gconftool-2
--dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
--dnl you should install foo.schemas files
--dnl
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
@@ -2383,22 +2377,33 @@
- else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-+# serial 8
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- AC_ARG_WITH([gconf-source],
- AC_HELP_STRING([--with-gconf-source=sourceaddress],
- [Config database for installing schema files.]),
- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++# serial 8
+
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+# Do all the work for Automake. -*- Autoconf -*-
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
++# Do all the work for Automake. -*- Autoconf -*-
+
+- AC_ARG_WITH([gconf-schema-file-dir],
+- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+- [Directory for installing schema files.]),
+- [GCONF_SCHEMA_FILE_DIR="$withval"],)
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
@@ -2406,16 +2411,9 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-- AC_ARG_WITH([gconf-schema-file-dir],
-- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-- [Directory for installing schema files.]),
-- [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+# serial 16
-
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
++# serial 16
- AC_ARG_ENABLE(schemas-install,
- [ --disable-schemas-install Disable the schemas installation],
@@ -2425,33 +2423,8 @@
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.62])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
-+fi
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -2485,15 +2458,33 @@
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.62])dnl
++dnl Autoconf wants to disallow AM_ names. We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
-+AC_SUBST([CYGPATH_W])
-dnl
-dnl We go to great lengths to make sure that aclocal won't
@@ -2506,18 +2497,15 @@
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++ if (cygpath --version) >/dev/null 2>/dev/null; then
++ CYGPATH_W='cygpath -w'
++ else
++ CYGPATH_W=echo
++ fi
++fi
++AC_SUBST([CYGPATH_W])
-# GLIB_LC_MESSAGES
-#--------------------
@@ -2532,9 +2520,18 @@
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
@@ -2574,6 +2571,10 @@
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -3097,7 +3098,7 @@
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
+# serial 6
-
++
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
@@ -3124,11 +3125,10 @@
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
-# gnome-common.m4
-#
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--dnl GNOME_COMMON_INIT
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
@@ -3136,11 +3136,19 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+-dnl GNOME_COMMON_INIT
++# serial 6
+
-AC_DEFUN([GNOME_COMMON_INIT],
-[
- dnl this macro should come after AC_CONFIG_MACRO_DIR
- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-+# serial 6
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
- dnl ensure that when the Automake generated makefile calls aclocal,
- dnl it honours the $ACLOCAL_FLAGS environment variable
@@ -3148,15 +3156,8 @@
- if test -n "$ac_macro_dir"; then
- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
- AC_SUBST([ACLOCAL_AMFLAGS])
-+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
@@ -3511,6 +3512,14 @@
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
+ esac
+ ])
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
@@ -3560,6 +3569,14 @@
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
+ ;;
+ esac
+ ])
@@ -3976,9 +3993,16 @@
m4_include([m4/d-type.m4])
m4_include([m4/gnome-doc-utils.m4])
---- a/applets/clock/Makefile.in
-+++ b/applets/clock/Makefile.in
-@@ -347,6 +347,8 @@
+diff -Naur gnome-panel-2.30.0.old/applets/clock/Makefile.in gnome-panel-2.30.0/applets/clock/Makefile.in
+--- gnome-panel-2.30.0.old/applets/clock/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/clock/Makefile.in 2010-05-05 10:03:29.542500074 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -337,6 +337,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -3987,7 +4011,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -372,6 +374,7 @@
+@@ -362,6 +364,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3995,9 +4019,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/applets/clock/pixmaps/Makefile.in
-+++ b/applets/clock/pixmaps/Makefile.in
-@@ -178,6 +178,8 @@
+@@ -1308,7 +1311,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -1333,7 +1336,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/applets/clock/pixmaps/Makefile.in gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in
+--- gnome-panel-2.30.0.old/applets/clock/pixmaps/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/clock/pixmaps/Makefile.in 2010-05-05 10:03:29.622501653 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4006,7 +4055,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4014,9 +4063,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/applets/fish/Makefile.in
-+++ b/applets/fish/Makefile.in
-@@ -238,6 +238,8 @@
+diff -Naur gnome-panel-2.30.0.old/applets/fish/Makefile.in gnome-panel-2.30.0/applets/fish/Makefile.in
+--- gnome-panel-2.30.0.old/applets/fish/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/fish/Makefile.in 2010-05-05 10:03:29.738500274 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -221,6 +221,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4025,7 +4081,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -263,6 +265,7 @@
+@@ -246,6 +248,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4033,9 +4089,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/applets/Makefile.in
-+++ b/applets/Makefile.in
-@@ -194,6 +194,8 @@
+diff -Naur gnome-panel-2.30.0.old/applets/Makefile.in gnome-panel-2.30.0/applets/Makefile.in
+--- gnome-panel-2.30.0.old/applets/Makefile.in 2010-03-30 02:52:44.000000000 +0200
++++ gnome-panel-2.30.0/applets/Makefile.in 2010-05-05 10:03:29.310501463 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -177,6 +177,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4044,7 +4107,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@
+@@ -202,6 +204,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4052,9 +4115,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/applets/notification_area/Makefile.in
-+++ b/applets/notification_area/Makefile.in
-@@ -265,6 +265,8 @@
+@@ -348,7 +351,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -373,7 +376,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/applets/notification_area/Makefile.in gnome-panel-2.30.0/applets/notification_area/Makefile.in
+--- gnome-panel-2.30.0.old/applets/notification_area/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/notification_area/Makefile.in 2010-05-05 10:03:29.874499535 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -248,6 +248,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4063,7 +4151,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -290,6 +292,7 @@
+@@ -273,6 +275,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4071,9 +4159,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/applets/wncklet/Makefile.in
-+++ b/applets/wncklet/Makefile.in
-@@ -249,6 +249,8 @@
+diff -Naur gnome-panel-2.30.0.old/applets/wncklet/Makefile.in gnome-panel-2.30.0/applets/wncklet/Makefile.in
+--- gnome-panel-2.30.0.old/applets/wncklet/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/applets/wncklet/Makefile.in 2010-05-05 10:03:30.030499037 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -232,6 +232,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4082,7 +4177,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -274,6 +276,7 @@
+@@ -257,6 +259,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4090,13 +4185,51 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/configure
-+++ b/configure
+diff -Naur gnome-panel-2.30.0.old/compile gnome-panel-2.30.0/compile
+--- gnome-panel-2.30.0.old/compile 2010-03-30 02:52:44.000000000 +0200
++++ gnome-panel-2.30.0/compile 2010-05-05 10:03:29.221527585 +0200
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2009-10-06.20; # UTC
+
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+ # Foundation, Inc.
+@@ -124,9 +124,9 @@
+ ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+ elif test -f "${cofile}bj"; then
+- mv "${cofile}bj" "$ofile"
++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+ fi
+
+ rmdir "$lockdir"
+diff -Naur gnome-panel-2.30.0.old/config.h.in gnome-panel-2.30.0/config.h.in
+--- gnome-panel-2.30.0.old/config.h.in 2010-03-30 02:52:43.000000000 +0200
++++ gnome-panel-2.30.0/config.h.in 2010-05-05 10:03:28.678500745 +0200
+@@ -135,6 +135,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+diff -Naur gnome-panel-2.30.0.old/configure gnome-panel-2.30.0/configure
+--- gnome-panel-2.30.0.old/configure 2010-03-30 02:52:43.000000000 +0200
++++ gnome-panel-2.30.0/configure 2010-05-05 10:03:28.378498856 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gnome-panel 2.28.0.
-+# Generated by GNU Autoconf 2.65 for gnome-panel 2.28.0.
+-# Generated by GNU Autoconf 2.63 for gnome-panel 2.30.0.
++# Generated by GNU Autoconf 2.65 for gnome-panel 2.30.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel>.
#
@@ -4902,8 +5035,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-panel'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='gnome-panel 2.28.0'
+ PACKAGE_VERSION='2.30.0'
+ PACKAGE_STRING='gnome-panel 2.30.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel'
+PACKAGE_URL=''
@@ -4917,8 +5050,8 @@
+LOGOUT_CFLAGS
PANEL_LIBS
PANEL_CFLAGS
- PKG_CONFIG
-@@ -1019,6 +979,7 @@
+ EGG_SMCLIENT_LIBS
+@@ -1021,6 +981,7 @@
program_transform_name
prefix
exec_prefix
@@ -4926,8 +5059,8 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1072,6 +1033,8 @@
- PKG_CONFIG
+@@ -1076,6 +1037,8 @@
+ EGG_SMCLIENT_LIBS
PANEL_CFLAGS
PANEL_LIBS
+LOGOUT_CFLAGS
@@ -4935,7 +5068,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
FISH_CFLAGS
-@@ -1199,8 +1162,7 @@
+@@ -1203,8 +1166,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4945,7 +5078,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1226,8 +1188,7 @@
+@@ -1230,8 +1192,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4955,7 +5088,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1431,8 +1392,7 @@
+@@ -1435,8 +1396,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4965,7 +5098,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1448,8 +1408,7 @@
+@@ -1452,8 +1412,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4975,7 +5108,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1479,17 +1438,17 @@
+@@ -1483,17 +1442,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4999,7 +5132,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1506,15 +1465,13 @@
+@@ -1510,15 +1469,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -5017,7 +5150,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1537,8 +1494,7 @@
+@@ -1541,8 +1498,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -5027,7 +5160,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1568,11 +1524,9 @@
+@@ -1572,11 +1528,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -5041,7 +5174,7 @@
# Find the source files, if location was not specified.
-@@ -1611,13 +1565,11 @@
+@@ -1615,13 +1569,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -5057,7 +5190,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1746,11 +1698,12 @@
+@@ -1750,11 +1702,12 @@
--enable-polkit Enable PolicyKit support (auto)
--enable-network-manager
Enable NetworkManager support (auto)
@@ -5074,7 +5207,7 @@
--disable-rebuilds disable all source autogeneration rules
Optional Packages:
-@@ -1780,13 +1733,16 @@
+@@ -1784,7 +1737,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -5083,6 +5216,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+@@ -1795,6 +1748,9 @@
PANEL_CFLAGS
C compiler flags for PANEL, overriding pkg-config
PANEL_LIBS linker flags for PANEL, overriding pkg-config
@@ -5092,10 +5226,10 @@
LIBPANEL_APPLET_CFLAGS
C compiler flags for LIBPANEL_APPLET, overriding pkg-config
LIBPANEL_APPLET_LIBS
-@@ -1886,21 +1842,378 @@
+@@ -1894,21 +1850,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- gnome-panel configure 2.28.0
+ gnome-panel configure 2.30.0
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -5469,13 +5603,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-panel $as_me 2.28.0, which was
+ It was created by gnome-panel $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1936,8 +2249,8 @@
+@@ -1944,8 +2257,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5486,7 +5620,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1974,9 +2287,9 @@
+@@ -1982,9 +2295,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5498,7 +5632,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1992,13 +2305,13 @@
+@@ -2000,13 +2313,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5515,7 +5649,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2023,13 +2336,13 @@
+@@ -2031,13 +2344,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5531,7 +5665,7 @@
esac ;;
esac
done
-@@ -2101,39 +2414,41 @@
+@@ -2109,39 +2422,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5578,7 +5712,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2151,8 +2466,8 @@
+@@ -2159,8 +2474,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -5589,7 +5723,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2160,10 +2475,10 @@
+@@ -2168,10 +2483,10 @@
done
if test -r "$cache_file"; then
@@ -5604,7 +5738,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2171,7 +2486,7 @@
+@@ -2179,7 +2494,7 @@
esac
fi
else
@@ -5613,7 +5747,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2186,11 +2501,11 @@
+@@ -2194,11 +2509,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5627,7 +5761,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2200,17 +2515,17 @@
+@@ -2208,17 +2523,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -5649,7 +5783,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2222,43 +2537,20 @@
+@@ -2230,43 +2545,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5700,7 +5834,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2273,24 +2565,16 @@
+@@ -2281,24 +2573,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5733,7 +5867,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2316,10 +2600,10 @@
+@@ -2324,10 +2608,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5746,7 +5880,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2327,11 +2611,11 @@
+@@ -2335,11 +2619,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5762,7 +5896,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2368,7 +2652,7 @@
+@@ -2376,7 +2660,7 @@
;;
esac
@@ -5771,7 +5905,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2384,7 +2668,7 @@
+@@ -2392,7 +2676,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5780,7 +5914,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2395,7 +2679,7 @@
+@@ -2403,7 +2687,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5789,7 +5923,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2406,15 +2690,11 @@
+@@ -2414,15 +2698,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5807,7 +5941,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2436,11 +2716,8 @@
+@@ -2444,11 +2724,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -5821,7 +5955,7 @@
fi
test "$2" = conftest.file
-@@ -2449,13 +2726,10 @@
+@@ -2457,13 +2734,10 @@
# Ok.
:
else
@@ -5838,7 +5972,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2483,7 +2757,7 @@
+@@ -2491,7 +2765,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5847,7 +5981,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2504,9 +2778,9 @@
+@@ -2512,9 +2786,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5859,7 +5993,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2517,24 +2791,24 @@
+@@ -2525,24 +2799,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5889,7 +6023,7 @@
$as_echo "no" >&6; }
fi
-@@ -2544,9 +2818,9 @@
+@@ -2552,9 +2826,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5901,7 +6035,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2557,24 +2831,24 @@
+@@ -2565,24 +2839,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5931,7 +6065,7 @@
$as_echo "no" >&6; }
fi
-@@ -2583,7 +2857,7 @@
+@@ -2591,7 +2865,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5940,7 +6074,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2596,10 +2870,10 @@
+@@ -2604,10 +2878,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5953,7 +6087,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2607,7 +2881,7 @@
+@@ -2615,7 +2889,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5962,7 +6096,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2619,11 +2893,12 @@
+@@ -2627,11 +2901,12 @@
esac
done
done
@@ -5976,7 +6110,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2631,11 +2906,10 @@
+@@ -2639,11 +2914,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -5989,7 +6123,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2648,9 +2922,9 @@
+@@ -2656,9 +2930,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6001,7 +6135,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2661,24 +2935,24 @@
+@@ -2669,24 +2943,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6031,7 +6165,7 @@
$as_echo "no" >&6; }
fi
-@@ -2686,11 +2960,11 @@
+@@ -2694,11 +2968,11 @@
test -n "$AWK" && break
done
@@ -6045,7 +6179,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2708,11 +2982,11 @@
+@@ -2716,11 +2990,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -6059,7 +6193,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2732,9 +3006,7 @@
+@@ -2740,9 +3014,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -6070,7 +6204,7 @@
fi
fi
-@@ -2791,7 +3063,7 @@
+@@ -2799,7 +3071,7 @@
# Check whether --enable-silent-rules was given.
@@ -6079,7 +6213,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2827,16 +3099,16 @@
+@@ -2835,16 +3107,16 @@
@@ -6099,7 +6233,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2864,16 +3136,16 @@
+@@ -2872,16 +3144,16 @@
@@ -6119,7 +6253,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2889,7 +3161,7 @@
+@@ -2897,7 +3169,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6128,7 +6262,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3189,12 @@
+@@ -2925,12 +3197,12 @@
fi
@@ -6143,7 +6277,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3219,9 @@
+@@ -2955,9 +3227,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6155,7 +6289,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3232,24 @@
+@@ -2968,24 +3240,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6185,7 +6319,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3259,9 @@
+@@ -2995,9 +3267,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -6197,7 +6331,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3272,24 @@
+@@ -3008,24 +3280,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6227,7 +6361,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3298,7 @@
+@@ -3034,7 +3306,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6236,7 +6370,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3312,9 @@
+@@ -3048,9 +3320,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -6248,7 +6382,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3325,24 @@
+@@ -3061,24 +3333,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6278,7 +6412,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3352,9 @@
+@@ -3088,9 +3360,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -6290,7 +6424,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3366,18 @@
+@@ -3102,18 +3374,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6312,7 +6446,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3396,10 @@
+@@ -3132,10 +3404,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6325,7 +6459,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3411,9 @@
+@@ -3147,9 +3419,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6337,7 +6471,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3424,24 @@
+@@ -3160,24 +3432,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6367,7 +6501,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3455,9 @@
+@@ -3191,9 +3463,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6379,7 +6513,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3468,24 @@
+@@ -3204,24 +3476,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6409,7 +6543,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3498,7 @@
+@@ -3234,7 +3506,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6418,7 +6552,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,57 +3509,37 @@
+@@ -3245,57 +3517,37 @@
fi
@@ -6496,7 +6630,7 @@
/* end confdefs.h. */
int
-@@ -3303,8 +3555,8 @@
+@@ -3311,8 +3563,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -6507,7 +6641,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3320,17 +3572,17 @@
+@@ -3328,17 +3580,17 @@
done
rm -f $ac_rmfiles
@@ -6530,7 +6664,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3599,7 @@
+@@ -3355,7 +3607,7 @@
# certainly right.
break;;
*.* )
@@ -6539,7 +6673,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3366,84 +3618,42 @@
+@@ -3374,84 +3626,42 @@
else
ac_file=''
fi
@@ -6645,7 +6779,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3668,83 @@
+@@ -3466,32 +3676,83 @@
esac
done
else
@@ -6745,7 +6879,7 @@
/* end confdefs.h. */
int
-@@ -3495,17 +3756,17 @@
+@@ -3503,17 +3764,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6768,7 +6902,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3518,31 +3779,23 @@
+@@ -3526,31 +3787,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6807,7 +6941,7 @@
/* end confdefs.h. */
int
-@@ -3556,37 +3809,16 @@
+@@ -3564,37 +3817,16 @@
return 0;
}
_ACEOF
@@ -6848,7 +6982,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3595,20 +3827,16 @@
+@@ -3603,20 +3835,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6872,7 +7006,7 @@
/* end confdefs.h. */
int
-@@ -3619,35 +3847,11 @@
+@@ -3627,35 +3855,11 @@
return 0;
}
_ACEOF
@@ -6911,7 +7045,7 @@
/* end confdefs.h. */
int
-@@ -3658,36 +3862,12 @@
+@@ -3666,36 +3870,12 @@
return 0;
}
_ACEOF
@@ -6952,7 +7086,7 @@
/* end confdefs.h. */
int
-@@ -3698,42 +3878,17 @@
+@@ -3706,42 +3886,17 @@
return 0;
}
_ACEOF
@@ -6997,7 +7131,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3905,14 @@
+@@ -3758,18 +3913,14 @@
CFLAGS=
fi
fi
@@ -7019,7 +7153,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3818,32 +3969,9 @@
+@@ -3826,32 +3977,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -7053,7 +7187,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3854,17 +3982,19 @@
+@@ -3862,17 +3990,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -7076,7 +7210,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +4004,9 @@
+@@ -3882,9 +4012,9 @@
depcc="$CC" am_compiler_list=
@@ -7088,7 +7222,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4114,7 @@
+@@ -3992,7 +4122,7 @@
fi
fi
@@ -7097,7 +7231,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4004,35 +4134,31 @@
+@@ -4012,35 +4142,31 @@
case "$am__api_version" in
1.01234)
@@ -7139,7 +7273,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -4045,14 +4171,14 @@
+@@ -4053,14 +4179,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7157,7 +7291,7 @@
IFS=$as_save_IFS
;;
-@@ -4060,19 +4186,19 @@
+@@ -4068,19 +4194,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -7181,7 +7315,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -4085,14 +4211,14 @@
+@@ -4093,14 +4219,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7199,7 +7333,7 @@
IFS=$as_save_IFS
;;
-@@ -4100,19 +4226,19 @@
+@@ -4108,19 +4234,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -7223,7 +7357,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -4125,14 +4251,14 @@
+@@ -4133,14 +4259,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7241,7 +7375,7 @@
IFS=$as_save_IFS
;;
-@@ -4140,18 +4266,16 @@
+@@ -4148,18 +4274,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -7263,7 +7397,7 @@
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 $< $@'
-@@ -4197,9 +4321,9 @@
+@@ -4281,9 +4405,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -7275,7 +7409,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -4212,14 +4336,14 @@
+@@ -4296,14 +4420,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7293,7 +7427,7 @@
IFS=$as_save_IFS
;;
-@@ -4227,19 +4351,19 @@
+@@ -4311,19 +4435,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -7317,7 +7451,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -4252,14 +4376,14 @@
+@@ -4336,14 +4460,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7335,7 +7469,7 @@
IFS=$as_save_IFS
;;
-@@ -4267,19 +4391,19 @@
+@@ -4351,19 +4475,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -7359,7 +7493,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -4292,14 +4416,14 @@
+@@ -4376,14 +4500,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7377,7 +7511,7 @@
IFS=$as_save_IFS
;;
-@@ -4307,19 +4431,19 @@
+@@ -4391,19 +4515,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -7401,7 +7535,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -4332,14 +4456,14 @@
+@@ -4416,14 +4540,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7419,7 +7553,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4348,33 +4472,29 @@
+@@ -4432,33 +4556,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -7459,7 +7593,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -4387,14 +4507,14 @@
+@@ -4471,14 +4591,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7477,7 +7611,7 @@
IFS=$as_save_IFS
;;
-@@ -4402,34 +4522,28 @@
+@@ -4486,41 +4606,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -7492,16 +7626,25 @@
if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found; required for intltool" "$LINENO" 5
- fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
++ as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.x required for intltool" "$LINENO" 5
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -7519,7 +7662,7 @@
fi
fi
-@@ -4439,11 +4553,7 @@
+@@ -4530,11 +4644,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -7532,7 +7675,7 @@
/* end confdefs.h. */
int
-@@ -4455,61 +4565,41 @@
+@@ -4546,61 +4656,41 @@
return 0;
}
_ACEOF
@@ -7622,7 +7765,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -4517,104 +4607,11 @@
+@@ -4608,104 +4698,11 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -7729,7 +7872,7 @@
;
return 0;
}
-@@ -4626,54 +4623,27 @@
+@@ -4717,54 +4714,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -7792,7 +7935,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -4686,9 +4656,9 @@
+@@ -4777,9 +4747,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7804,7 +7947,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4699,24 +4669,24 @@
+@@ -4790,24 +4760,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7834,7 +7977,7 @@
$as_echo "no" >&6; }
fi
-@@ -4726,9 +4696,9 @@
+@@ -4817,9 +4787,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7846,7 +7989,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4739,24 +4709,24 @@
+@@ -4830,24 +4800,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7876,7 +8019,7 @@
$as_echo "no" >&6; }
fi
-@@ -4765,7 +4735,7 @@
+@@ -4856,7 +4826,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7885,7 +8028,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4779,9 +4749,9 @@
+@@ -4870,9 +4840,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7897,7 +8040,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4792,24 +4762,24 @@
+@@ -4883,24 +4853,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7927,7 +8070,7 @@
$as_echo "no" >&6; }
fi
-@@ -4819,9 +4789,9 @@
+@@ -4910,9 +4880,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7939,7 +8082,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4833,18 +4803,18 @@
+@@ -4924,18 +4894,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7961,7 +8104,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -4863,10 +4833,10 @@
+@@ -4954,10 +4924,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7974,7 +8117,7 @@
$as_echo "no" >&6; }
fi
-@@ -4878,9 +4848,9 @@
+@@ -4969,9 +4939,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7986,7 +8129,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4891,24 +4861,24 @@
+@@ -4982,24 +4952,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8016,7 +8159,7 @@
$as_echo "no" >&6; }
fi
-@@ -4922,9 +4892,9 @@
+@@ -5013,9 +4983,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8028,7 +8171,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4935,24 +4905,24 @@
+@@ -5026,24 +4996,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8058,7 +8201,7 @@
$as_echo "no" >&6; }
fi
-@@ -4965,7 +4935,7 @@
+@@ -5056,7 +5026,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8067,7 +8210,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4976,62 +4946,42 @@
+@@ -5067,62 +5037,42 @@
fi
@@ -8152,7 +8295,7 @@
/* end confdefs.h. */
int
-@@ -5045,37 +4995,16 @@
+@@ -5136,37 +5086,16 @@
return 0;
}
_ACEOF
@@ -8193,7 +8336,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5084,20 +5013,16 @@
+@@ -5175,20 +5104,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8217,7 +8360,7 @@
/* end confdefs.h. */
int
-@@ -5108,35 +5033,11 @@
+@@ -5199,35 +5124,11 @@
return 0;
}
_ACEOF
@@ -8256,7 +8399,7 @@
/* end confdefs.h. */
int
-@@ -5147,36 +5048,12 @@
+@@ -5238,36 +5139,12 @@
return 0;
}
_ACEOF
@@ -8297,7 +8440,7 @@
/* end confdefs.h. */
int
-@@ -5187,42 +5064,17 @@
+@@ -5278,42 +5155,17 @@
return 0;
}
_ACEOF
@@ -8342,7 +8485,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5239,18 +5091,14 @@
+@@ -5330,18 +5182,14 @@
CFLAGS=
fi
fi
@@ -8364,7 +8507,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5307,32 +5155,9 @@
+@@ -5398,32 +5246,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8398,7 +8541,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5343,17 +5168,19 @@
+@@ -5434,17 +5259,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8421,7 +8564,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5363,9 +5190,9 @@
+@@ -5454,9 +5281,9 @@
depcc="$CC" am_compiler_list=
@@ -8433,7 +8576,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5473,7 +5300,7 @@
+@@ -5564,7 +5391,7 @@
fi
fi
@@ -8442,7 +8585,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5493,14 +5320,14 @@
+@@ -5584,14 +5411,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8459,7 +8602,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5515,11 +5342,7 @@
+@@ -5606,11 +5433,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8472,7 +8615,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5528,78 +5351,34 @@
+@@ -5619,78 +5442,34 @@
#endif
Syntax error
_ACEOF
@@ -8556,7 +8699,7 @@
break
fi
-@@ -5611,7 +5390,7 @@
+@@ -5702,7 +5481,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8565,7 +8708,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5622,11 +5401,7 @@
+@@ -5713,11 +5492,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8578,7 +8721,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5635,87 +5410,40 @@
+@@ -5726,87 +5501,40 @@
#endif
Syntax error
_ACEOF
@@ -8675,7 +8818,7 @@
fi
ac_ext=c
-@@ -5725,9 +5453,9 @@
+@@ -5816,9 +5544,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8687,7 +8830,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5738,7 +5466,7 @@
+@@ -5829,7 +5557,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8696,7 +8839,7 @@
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
-@@ -5758,7 +5486,7 @@
+@@ -5849,7 +5577,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8705,7 +8848,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5773,26 +5501,24 @@
+@@ -5864,26 +5592,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -8737,7 +8880,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5806,7 +5532,7 @@
+@@ -5897,7 +5623,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8746,7 +8889,7 @@
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
-@@ -5826,7 +5552,7 @@
+@@ -5917,7 +5643,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8755,7 +8898,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5841,12 +5567,10 @@
+@@ -5932,12 +5658,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -8770,7 +8913,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5854,21 +5578,17 @@
+@@ -5945,21 +5669,17 @@
fi
fi
@@ -8796,7 +8939,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5883,48 +5603,23 @@
+@@ -5974,48 +5694,23 @@
return 0;
}
_ACEOF
@@ -8850,7 +8993,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5934,18 +5629,14 @@
+@@ -6025,18 +5720,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8872,7 +9015,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5955,14 +5646,10 @@
+@@ -6046,14 +5737,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8889,7 +9032,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5989,85 +5676,48 @@
+@@ -6080,85 +5767,48 @@
return 0;
}
_ACEOF
@@ -8989,7 +9132,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6083,28 +5733,24 @@
+@@ -6174,28 +5824,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -9023,7 +9166,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6127,9 +5773,9 @@
+@@ -6218,9 +5864,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -9035,7 +9178,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6140,24 +5786,24 @@
+@@ -6231,24 +5877,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9065,7 +9208,7 @@
$as_echo "no" >&6; }
fi
-@@ -6167,9 +5813,9 @@
+@@ -6258,9 +5904,9 @@
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -9077,7 +9220,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6180,24 +5826,24 @@
+@@ -6271,24 +5917,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9107,7 +9250,7 @@
$as_echo "no" >&6; }
fi
-@@ -6206,7 +5852,7 @@
+@@ -6297,7 +5943,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9116,7 +9259,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6219,9 +5865,9 @@
+@@ -6310,9 +5956,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -9128,7 +9271,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6232,24 +5878,24 @@
+@@ -6323,24 +5969,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9158,7 +9301,7 @@
$as_echo "no" >&6; }
fi
-@@ -6259,9 +5905,9 @@
+@@ -6350,9 +5996,9 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -9170,7 +9313,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6272,24 +5918,24 @@
+@@ -6363,24 +6009,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9200,7 +9343,7 @@
$as_echo "no" >&6; }
fi
-@@ -6298,7 +5944,7 @@
+@@ -6389,7 +6035,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9209,7 +9352,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6311,9 +5957,9 @@
+@@ -6402,9 +6048,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9221,7 +9364,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6324,24 +5970,24 @@
+@@ -6415,24 +6061,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9251,7 +9394,7 @@
$as_echo "no" >&6; }
fi
-@@ -6351,9 +5997,9 @@
+@@ -6442,9 +6088,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9263,7 +9406,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6364,24 +6010,24 @@
+@@ -6455,24 +6101,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9293,7 +9436,7 @@
$as_echo "no" >&6; }
fi
-@@ -6390,7 +6036,7 @@
+@@ -6481,7 +6127,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9302,7 +9445,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6425,7 +6071,7 @@
+@@ -6516,14 +6162,14 @@
case `pwd` in
*\ * | *\ *)
@@ -9311,7 +9454,16 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6448,9 +6094,9 @@
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -6539,9 +6185,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9323,7 +9475,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6458,7 +6104,7 @@
+@@ -6549,7 +6195,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -9332,7 +9484,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6467,7 +6113,7 @@
+@@ -6558,7 +6204,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9341,7 +9493,7 @@
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
-@@ -6487,7 +6133,7 @@
+@@ -6578,7 +6224,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9350,7 +9502,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6502,19 +6148,17 @@
+@@ -6593,19 +6239,17 @@
$ac_path_SED_found && break 3
done
done
@@ -9373,7 +9525,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6532,9 +6176,9 @@
+@@ -6623,9 +6267,9 @@
@@ -9385,7 +9537,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6548,7 +6192,7 @@
+@@ -6639,7 +6283,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9394,7 +9546,7 @@
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
-@@ -6568,7 +6212,7 @@
+@@ -6659,7 +6303,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9403,7 +9555,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6583,12 +6227,10 @@
+@@ -6674,12 +6318,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -9418,7 +9570,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6596,7 +6238,7 @@
+@@ -6687,7 +6329,7 @@
fi
fi
@@ -9427,7 +9579,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6622,7 +6264,7 @@
+@@ -6713,7 +6355,7 @@
# Check whether --with-gnu-ld was given.
@@ -9436,7 +9588,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6631,7 +6273,7 @@
+@@ -6722,7 +6364,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9445,7 +9597,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6661,13 +6303,13 @@
+@@ -6752,13 +6394,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9462,7 +9614,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6698,18 +6340,16 @@
+@@ -6789,18 +6431,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9486,7 +9638,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6722,7 +6362,7 @@
+@@ -6813,7 +6453,7 @@
;;
esac
fi
@@ -9495,7 +9647,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6734,9 +6374,9 @@
+@@ -6825,9 +6465,9 @@
@@ -9507,7 +9659,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6783,7 +6423,7 @@
+@@ -6874,7 +6514,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -9516,7 +9668,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6794,9 +6434,9 @@
+@@ -6885,9 +6525,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9528,7 +9680,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6807,24 +6447,24 @@
+@@ -6898,24 +6538,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9558,7 +9710,7 @@
$as_echo "no" >&6; }
fi
-@@ -6838,9 +6478,9 @@
+@@ -6929,9 +6569,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9570,7 +9722,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6851,24 +6491,24 @@
+@@ -6942,24 +6582,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9600,7 +9752,7 @@
$as_echo "no" >&6; }
fi
-@@ -6881,7 +6521,7 @@
+@@ -6972,7 +6612,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9609,7 +9761,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6901,44 +6541,44 @@
+@@ -6992,44 +6632,44 @@
@@ -9622,16 +9774,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6911: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6551: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:7002: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6642: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6554: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:7005: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6645: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6917: output\"" >&5)
-+ (eval echo "\"\$as_me:6557: output\"" >&5)
+- (eval echo "\"\$as_me:7008: output\"" >&5)
++ (eval echo "\"\$as_me:6648: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9665,7 +9817,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7056,10 +6696,10 @@
+@@ -7147,10 +6787,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9678,7 +9830,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7073,7 +6713,7 @@
+@@ -7164,7 +6804,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9687,7 +9839,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7083,17 +6723,17 @@
+@@ -7174,17 +6814,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9708,7 +9860,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7128,14 +6768,14 @@
+@@ -7219,14 +6859,14 @@
@@ -9726,7 +9878,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7164,9 +6804,9 @@
+@@ -7255,9 +6895,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9738,7 +9890,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7177,24 +6817,24 @@
+@@ -7268,24 +6908,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9768,7 +9920,7 @@
$as_echo "no" >&6; }
fi
-@@ -7204,9 +6844,9 @@
+@@ -7295,9 +6935,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9780,7 +9932,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7217,24 +6857,24 @@
+@@ -7308,24 +6948,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9810,7 +9962,7 @@
$as_echo "no" >&6; }
fi
-@@ -7243,7 +6883,7 @@
+@@ -7334,7 +6974,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9819,7 +9971,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7260,9 +6900,9 @@
+@@ -7351,9 +6991,9 @@
@@ -9831,7 +9983,12 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7381,7 +7021,7 @@
+@@ -7468,11 +7108,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9840,7 +9997,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7456,7 +7096,7 @@
+@@ -7547,7 +7187,7 @@
esac
fi
@@ -9849,7 +10006,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7476,9 +7116,9 @@
+@@ -7567,9 +7207,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9861,7 +10018,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7489,24 +7129,24 @@
+@@ -7580,24 +7220,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9891,7 +10048,7 @@
$as_echo "no" >&6; }
fi
-@@ -7516,9 +7156,9 @@
+@@ -7607,9 +7247,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9903,7 +10060,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7529,24 +7169,24 @@
+@@ -7620,24 +7260,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9933,7 +10090,7 @@
$as_echo "no" >&6; }
fi
-@@ -7555,7 +7195,7 @@
+@@ -7646,7 +7286,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9942,7 +10099,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7581,9 +7221,9 @@
+@@ -7672,9 +7312,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9954,7 +10111,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7594,24 +7234,24 @@
+@@ -7685,24 +7325,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9984,7 +10141,7 @@
$as_echo "no" >&6; }
fi
-@@ -7621,9 +7261,9 @@
+@@ -7712,9 +7352,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9996,7 +10153,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7634,24 +7274,24 @@
+@@ -7725,24 +7365,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10026,7 +10183,7 @@
$as_echo "no" >&6; }
fi
-@@ -7660,7 +7300,7 @@
+@@ -7751,7 +7391,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10035,7 +10192,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7680,9 +7320,9 @@
+@@ -7771,9 +7411,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -10047,7 +10204,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7693,24 +7333,24 @@
+@@ -7784,24 +7424,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10077,7 +10234,7 @@
$as_echo "no" >&6; }
fi
-@@ -7720,9 +7360,9 @@
+@@ -7811,9 +7451,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -10089,7 +10246,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7733,24 +7373,24 @@
+@@ -7824,24 +7464,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10119,7 +10276,7 @@
$as_echo "no" >&6; }
fi
-@@ -7759,7 +7399,7 @@
+@@ -7850,7 +7490,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10128,7 +10285,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7837,9 +7477,9 @@
+@@ -7928,9 +7568,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10140,7 +10297,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7955,18 +7595,18 @@
+@@ -8046,18 +7686,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -10165,7 +10322,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8019,11 +7659,11 @@
+@@ -8110,11 +7750,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -10180,7 +10337,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8057,10 +7697,10 @@
+@@ -8148,10 +7788,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -10193,7 +10350,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8086,7 +7726,7 @@
+@@ -8177,7 +7817,7 @@
# Check whether --enable-libtool-lock was given.
@@ -10202,7 +10359,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8098,11 +7738,11 @@
+@@ -8189,11 +7829,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10217,13 +10374,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8116,12 +7756,12 @@
+@@ -8207,12 +7847,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 8119 "configure"' > conftest.$ac_ext
+- echo '#line 8210 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7759 "configure"' > conftest.$ac_ext
++ echo '#line 7850 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10234,7 +10391,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8155,11 +7795,11 @@
+@@ -8246,11 +7886,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10249,7 +10406,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8208,9 +7848,9 @@
+@@ -8299,9 +7939,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -10261,7 +10418,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8219,11 +7859,7 @@
+@@ -8310,11 +7950,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -10274,7 +10431,7 @@
/* end confdefs.h. */
int
-@@ -8234,38 +7870,13 @@
+@@ -8325,38 +7961,13 @@
return 0;
}
_ACEOF
@@ -10317,7 +10474,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8273,7 +7884,7 @@
+@@ -8364,7 +7975,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -10326,7 +10483,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8283,11 +7894,11 @@
+@@ -8374,11 +7985,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10341,7 +10498,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8313,9 +7924,9 @@
+@@ -8404,9 +8015,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -10353,7 +10510,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8326,24 +7937,24 @@
+@@ -8417,24 +8028,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10383,7 +10540,7 @@
$as_echo "no" >&6; }
fi
-@@ -8353,9 +7964,9 @@
+@@ -8444,9 +8055,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -10395,7 +10552,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8366,24 +7977,24 @@
+@@ -8457,24 +8068,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10425,7 +10582,7 @@
$as_echo "no" >&6; }
fi
-@@ -8392,7 +8003,7 @@
+@@ -8483,7 +8094,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10434,7 +10591,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8405,9 +8016,9 @@
+@@ -8496,9 +8107,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -10446,7 +10603,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8418,24 +8029,24 @@
+@@ -8509,24 +8120,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10476,7 +10633,7 @@
$as_echo "no" >&6; }
fi
-@@ -8445,9 +8056,9 @@
+@@ -8536,9 +8147,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -10488,7 +10645,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8458,24 +8069,24 @@
+@@ -8549,24 +8160,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10518,7 +10675,7 @@
$as_echo "no" >&6; }
fi
-@@ -8484,7 +8095,7 @@
+@@ -8575,7 +8186,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10527,7 +10684,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8497,9 +8108,9 @@
+@@ -8588,9 +8199,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10539,7 +10696,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8510,24 +8121,24 @@
+@@ -8601,24 +8212,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10569,7 +10726,7 @@
$as_echo "no" >&6; }
fi
-@@ -8537,9 +8148,9 @@
+@@ -8628,9 +8239,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -10581,7 +10738,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8550,24 +8161,24 @@
+@@ -8641,24 +8252,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10611,7 +10768,7 @@
$as_echo "no" >&6; }
fi
-@@ -8576,7 +8187,7 @@
+@@ -8667,7 +8278,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10620,7 +10777,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8589,9 +8200,9 @@
+@@ -8680,9 +8291,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10632,7 +10789,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8602,24 +8213,24 @@
+@@ -8693,24 +8304,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10662,7 +10819,7 @@
$as_echo "no" >&6; }
fi
-@@ -8629,9 +8240,9 @@
+@@ -8720,9 +8331,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -10674,7 +10831,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8642,24 +8253,24 @@
+@@ -8733,24 +8344,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10704,7 +10861,7 @@
$as_echo "no" >&6; }
fi
-@@ -8668,7 +8279,7 @@
+@@ -8759,7 +8370,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10713,7 +10870,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8681,9 +8292,9 @@
+@@ -8772,9 +8383,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10725,7 +10882,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8694,24 +8305,24 @@
+@@ -8785,24 +8396,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10755,7 +10912,7 @@
$as_echo "no" >&6; }
fi
-@@ -8721,9 +8332,9 @@
+@@ -8812,9 +8423,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10767,7 +10924,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8734,24 +8345,24 @@
+@@ -8825,24 +8436,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10797,7 +10954,7 @@
$as_echo "no" >&6; }
fi
-@@ -8760,7 +8371,7 @@
+@@ -8851,7 +8462,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10806,7 +10963,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8407,9 @@
+@@ -8887,9 +8498,9 @@
@@ -10818,7 +10975,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8823,22 +8434,18 @@
+@@ -8914,22 +8525,18 @@
rm -f conftest.*
fi
fi
@@ -10845,7 +11002,7 @@
/* end confdefs.h. */
int
-@@ -8849,42 +8456,17 @@
+@@ -8940,42 +8547,17 @@
return 0;
}
_ACEOF
@@ -10893,7 +11050,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8922,69 +8504,14 @@
+@@ -9013,69 +8595,14 @@
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -10969,7 +11126,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8994,62 +8521,13 @@
+@@ -9085,62 +8612,13 @@
done
@@ -11037,7 +11194,7 @@
_ACEOF
fi
-@@ -9067,7 +8545,7 @@
+@@ -9158,7 +8636,7 @@
# Check whether --enable-shared was given.
@@ -11046,7 +11203,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9098,7 +8576,7 @@
+@@ -9189,7 +8667,7 @@
# Check whether --enable-static was given.
@@ -11055,7 +11212,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -9130,7 +8608,7 @@
+@@ -9221,7 +8699,7 @@
# Check whether --with-pic was given.
@@ -11064,7 +11221,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9146,7 +8624,7 @@
+@@ -9237,7 +8715,7 @@
# Check whether --enable-fast-install was given.
@@ -11073,7 +11230,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9227,9 +8705,9 @@
+@@ -9318,9 +8796,9 @@
setopt NO_GLOB_SUBST
fi
@@ -11085,7 +11242,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9242,7 +8720,7 @@
+@@ -9333,7 +8811,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -11094,7 +11251,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9335,9 +8813,9 @@
+@@ -9426,9 +8904,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -11106,7 +11263,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9388,10 +8866,10 @@
+@@ -9479,10 +8957,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11119,7 +11276,7 @@
$as_echo "no" >&6; }
fi
-@@ -9401,9 +8879,9 @@
+@@ -9492,9 +8970,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -11131,7 +11288,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9454,10 +8932,10 @@
+@@ -9545,10 +9023,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11144,7 +11301,7 @@
$as_echo "no" >&6; }
fi
-@@ -9538,9 +9016,9 @@
+@@ -9629,9 +9107,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11156,21 +11313,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9556,11 +9034,11 @@
+@@ -9647,11 +9125,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9037: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9650: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9128: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9563: \$? = $ac_status" >&5
-+ echo "$as_me:9041: \$? = $ac_status" >&5
+- echo "$as_me:9654: \$? = $ac_status" >&5
++ echo "$as_me:9132: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9573,7 +9051,7 @@
+@@ -9664,7 +9142,7 @@
$RM conftest*
fi
@@ -11179,7 +11336,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9593,7 +9071,7 @@
+@@ -9684,7 +9162,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11188,7 +11345,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9865,7 +9343,7 @@
+@@ -9816,7 +9294,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9956,7 +9434,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -11197,7 +11363,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9877,9 +9355,9 @@
+@@ -9968,9 +9446,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -11209,21 +11375,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9895,11 +9373,11 @@
+@@ -9986,11 +9464,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9898: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9376: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9989: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9467: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9902: \$? = $ac_status" >&5
-+ echo "$as_me:9380: \$? = $ac_status" >&5
+- echo "$as_me:9993: \$? = $ac_status" >&5
++ echo "$as_me:9471: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9912,7 +9390,7 @@
+@@ -10003,7 +9481,7 @@
$RM conftest*
fi
@@ -11232,7 +11398,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9936,9 +9414,9 @@
+@@ -10027,9 +9505,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -11244,7 +11410,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9964,7 +9442,7 @@
+@@ -10055,7 +9533,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -11253,7 +11419,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9979,9 +9457,9 @@
+@@ -10070,9 +9548,9 @@
@@ -11265,21 +11431,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10000,11 +9478,11 @@
+@@ -10091,11 +9569,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10003: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9481: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10094: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9572: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10007: \$? = $ac_status" >&5
-+ echo "$as_me:9485: \$? = $ac_status" >&5
+- echo "$as_me:10098: \$? = $ac_status" >&5
++ echo "$as_me:9576: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10026,7 +9504,7 @@
+@@ -10117,7 +9595,7 @@
$RM conftest*
fi
@@ -11288,7 +11454,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10034,9 +9512,9 @@
+@@ -10125,9 +9603,9 @@
@@ -11300,21 +11466,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10055,11 +9533,11 @@
+@@ -10146,11 +9624,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10149: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9627: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10062: \$? = $ac_status" >&5
-+ echo "$as_me:9540: \$? = $ac_status" >&5
+- echo "$as_me:10153: \$? = $ac_status" >&5
++ echo "$as_me:9631: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10081,7 +9559,7 @@
+@@ -10172,7 +9650,7 @@
$RM conftest*
fi
@@ -11323,7 +11489,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10090,7 +9568,7 @@
+@@ -10181,7 +9659,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -11332,7 +11498,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10098,10 +9576,10 @@
+@@ -10189,10 +9667,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -11345,7 +11511,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10114,7 +9592,7 @@
+@@ -10205,7 +9683,7 @@
@@ -11354,7 +11520,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10174,6 +9652,9 @@
+@@ -10265,6 +9743,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -11364,7 +11530,24 @@
esac
ld_shlibs=yes
-@@ -10356,7 +9837,7 @@
+@@ -10286,6 +9767,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10377,7 +9859,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -10447,7 +9929,7 @@
fi
;;
@@ -11373,7 +11556,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10531,6 +10012,7 @@
+@@ -10622,6 +10104,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -11381,7 +11564,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10556,11 +10038,7 @@
+@@ -10647,11 +10130,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11394,7 +11577,7 @@
/* end confdefs.h. */
int
-@@ -10571,27 +10049,7 @@
+@@ -10662,27 +10141,7 @@
return 0;
}
_ACEOF
@@ -11423,7 +11606,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10605,16 +10063,9 @@
+@@ -10696,16 +10155,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11442,7 +11625,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10627,11 +10078,7 @@
+@@ -10718,11 +10170,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11455,7 +11638,7 @@
/* end confdefs.h. */
int
-@@ -10642,27 +10089,7 @@
+@@ -10733,27 +10181,7 @@
return 0;
}
_ACEOF
@@ -11484,7 +11667,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10676,16 +10103,9 @@
+@@ -10767,16 +10195,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11503,7 +11686,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10897,42 +10317,16 @@
+@@ -10988,42 +10409,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11551,7 +11734,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10945,7 +10339,7 @@
+@@ -11036,7 +10431,7 @@
link_all_deplibs=yes
;;
@@ -11560,7 +11743,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11188,7 +10582,7 @@
+@@ -11279,7 +10674,7 @@
fi
fi
@@ -11569,7 +11752,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11225,16 +10619,16 @@
+@@ -11316,16 +10711,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11590,7 +11773,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11248,11 +10642,11 @@
+@@ -11339,11 +10734,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11605,7 +11788,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11263,7 +10657,7 @@
+@@ -11354,7 +10749,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11614,7 +11797,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11427,7 +10821,7 @@
+@@ -11518,7 +10913,7 @@
@@ -11623,7 +11806,16 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11849,11 +11243,7 @@
+@@ -11926,7 +11321,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11940,11 +11335,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11636,7 +11828,7 @@
/* end confdefs.h. */
int
-@@ -11864,41 +11254,13 @@
+@@ -11955,41 +11346,13 @@
return 0;
}
_ACEOF
@@ -11682,7 +11874,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11922,6 +11284,18 @@
+@@ -12013,6 +11376,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11701,7 +11893,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12110,7 +11484,7 @@
+@@ -12201,7 +11576,7 @@
dynamic_linker=no
;;
esac
@@ -11710,7 +11902,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12212,7 +11586,7 @@
+@@ -12303,7 +11678,7 @@
@@ -11719,7 +11911,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12237,7 +11611,7 @@
+@@ -12328,7 +11703,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -11728,7 +11920,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12282,18 +11656,14 @@
+@@ -12373,18 +11748,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -11750,7 +11942,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12311,43 +11681,18 @@
+@@ -12402,43 +11773,18 @@
return 0;
}
_ACEOF
@@ -11800,7 +11992,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12360,106 +11705,18 @@
+@@ -12451,106 +11797,18 @@
;;
*)
@@ -11912,7 +12104,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12477,145 +11734,32 @@
+@@ -12568,145 +11826,32 @@
return 0;
}
_ACEOF
@@ -12069,7 +12261,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12633,57 +11777,28 @@
+@@ -12724,57 +11869,28 @@
return 0;
}
_ACEOF
@@ -12136,7 +12328,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12701,57 +11816,28 @@
+@@ -12792,57 +11908,28 @@
return 0;
}
_ACEOF
@@ -12203,7 +12395,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12769,43 +11855,18 @@
+@@ -12860,43 +11947,18 @@
return 0;
}
_ACEOF
@@ -12253,7 +12445,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12844,9 +11905,9 @@
+@@ -12935,9 +11997,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -12265,16 +12457,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12855,7 +11916,7 @@
+@@ -12946,7 +12008,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12858 "configure"
-+#line 11919 "configure"
+-#line 12949 "configure"
++#line 12011 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12914,11 +11975,11 @@
+@@ -13005,11 +12067,11 @@
return status;
}
_LT_EOF
@@ -12289,7 +12481,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12935,14 +11996,14 @@
+@@ -13026,14 +12088,14 @@
fi
@@ -12307,16 +12499,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12951,7 +12012,7 @@
+@@ -13042,7 +12104,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12954 "configure"
-+#line 12015 "configure"
+-#line 13045 "configure"
++#line 12107 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13010,11 +12071,11 @@
+@@ -13101,11 +12163,11 @@
return status;
}
_LT_EOF
@@ -12331,7 +12523,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13031,7 +12092,7 @@
+@@ -13122,7 +12184,7 @@
fi
@@ -12340,7 +12532,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13070,12 +12131,12 @@
+@@ -13161,12 +12223,12 @@
striplib=
old_striplib=
@@ -12355,7 +12547,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13084,15 +12145,15 @@
+@@ -13175,15 +12237,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -12374,7 +12566,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13110,12 +12171,12 @@
+@@ -13201,12 +12263,12 @@
# Report which library types will actually be built
@@ -12390,7 +12582,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13136,14 +12197,14 @@
+@@ -13227,14 +12289,14 @@
fi
;;
esac
@@ -12408,7 +12600,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13180,22 +12241,18 @@
+@@ -13271,22 +12333,18 @@
#AC_PROG_SED available in 2.59b
if test "x$CC" != xcc; then
@@ -12435,7 +12627,7 @@
/* end confdefs.h. */
int
-@@ -13211,63 +12268,63 @@
+@@ -13302,63 +12360,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -12524,7 +12716,7 @@
then
# cc works too.
:
-@@ -13284,15 +12341,13 @@
+@@ -13375,15 +12433,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -12543,7 +12735,7 @@
fi
-@@ -13322,9 +12377,9 @@
+@@ -13413,9 +12469,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12555,7 +12747,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -13337,14 +12392,14 @@
+@@ -13428,14 +12484,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12573,7 +12765,7 @@
IFS=$as_save_IFS
;;
-@@ -13352,10 +12407,10 @@
+@@ -13443,10 +12499,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -12586,7 +12778,7 @@
$as_echo "no" >&6; }
fi
-@@ -13369,20 +12424,18 @@
+@@ -13460,20 +12516,18 @@
if test "$PYTHON" = :; then
@@ -12611,7 +12803,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -13394,23 +12447,23 @@
+@@ -13485,23 +12539,23 @@
@@ -12640,7 +12832,18 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -13429,7 +12482,7 @@
+@@ -13517,10 +12571,18 @@
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
esac
fi
@@ -12649,7 +12852,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -13438,9 +12491,9 @@
+@@ -13529,9 +12591,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -12661,7 +12864,18 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -13459,7 +12512,7 @@
+@@ -13547,10 +12609,18 @@
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
esac
fi
@@ -12670,7 +12884,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -13474,9 +12527,9 @@
+@@ -13565,9 +12635,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -12682,7 +12896,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13489,14 +12542,14 @@
+@@ -13580,14 +12650,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12700,7 +12914,7 @@
IFS=$as_save_IFS
;;
-@@ -13504,19 +12557,19 @@
+@@ -13595,19 +12665,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -12724,7 +12938,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -13529,14 +12582,14 @@
+@@ -13620,14 +12690,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12742,7 +12956,7 @@
IFS=$as_save_IFS
;;
-@@ -13544,10 +12597,10 @@
+@@ -13635,10 +12705,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -12755,7 +12969,7 @@
$as_echo "no" >&6; }
fi
-@@ -13556,7 +12609,7 @@
+@@ -13647,7 +12717,7 @@
# Check whether --enable-compile-warnings was given.
@@ -12764,7 +12978,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -13587,13 +12640,9 @@
+@@ -13678,13 +12748,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -12780,7 +12994,7 @@
/* end confdefs.h. */
int
-@@ -13604,35 +12653,14 @@
+@@ -13695,35 +12761,14 @@
return 0;
}
_ACEOF
@@ -12819,7 +13033,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -13646,26 +12674,24 @@
+@@ -13737,26 +12782,24 @@
fi
;;
*)
@@ -12851,7 +13065,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -13680,7 +12706,7 @@
+@@ -13771,7 +12814,7 @@
esac
fi
fi
@@ -12860,7 +13074,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13688,7 +12714,7 @@
+@@ -13779,7 +12822,7 @@
# Check whether --enable-deprecations was given.
@@ -12869,7 +13083,7 @@
enableval=$enable_deprecations;
else
enable_deprecations=no
-@@ -13700,253 +12726,24 @@
+@@ -13791,253 +12834,24 @@
fi
@@ -13132,7 +13346,7 @@
_ACEOF
fi
-@@ -13979,9 +12776,9 @@
+@@ -14068,9 +12882,9 @@
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
@@ -13144,7 +13358,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13994,14 +12791,14 @@
+@@ -14083,14 +12897,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13162,7 +13376,7 @@
IFS=$as_save_IFS
;;
-@@ -14009,10 +12806,10 @@
+@@ -14098,10 +12912,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -13175,7 +13389,7 @@
$as_echo "no" >&6; }
fi
-@@ -14022,9 +12819,9 @@
+@@ -14111,9 +12925,9 @@
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
@@ -13187,7 +13401,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14037,14 +12834,14 @@
+@@ -14126,14 +12940,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13205,7 +13419,7 @@
IFS=$as_save_IFS
;;
-@@ -14052,10 +12849,10 @@
+@@ -14141,10 +12955,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -13218,7 +13432,7 @@
$as_echo "no" >&6; }
fi
-@@ -14064,7 +12861,7 @@
+@@ -14153,7 +12967,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13227,7 +13441,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14077,13 +12874,13 @@
+@@ -14166,13 +12980,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -13244,8 +13458,141 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14091,40 +12888,44 @@
- fi
+@@ -14180,40 +12994,44 @@
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EGG_SMCLIENT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5
+ $as_echo_n "checking for EGG_SMCLIENT... " >&6; }
+
+-if test -n "$EGG_SMCLIENT_CFLAGS"; then
+- pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice sm gtk+-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EGG_SMCLIENT_CFLAGS"; then
++ pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ice sm gtk+-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ice sm gtk+-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "ice sm gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$EGG_SMCLIENT_LIBS"; then
+- pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice sm gtk+-2.0\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EGG_SMCLIENT_LIBS"; then
++ pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ice sm gtk+-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ice sm gtk+-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "ice sm gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14226,25 +13044,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ice sm gtk+-2.0" 2>&1`
++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ice sm gtk+-2.0"`
+ else
+- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ice sm gtk+-2.0" 2>&1`
++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ice sm gtk+-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (ice sm gtk+-2.0) were not met:
+-
+-$EGG_SMCLIENT_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 EGG_SMCLIENT_CFLAGS
+-and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (ice sm gtk+-2.0) were not met:
++ as_fn_error "Package requirements (ice sm gtk+-2.0) were not met:
+
+ $EGG_SMCLIENT_PKG_ERRORS
+
+@@ -14254,22 +13061,11 @@
+ Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
+ and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: 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 EGG_SMCLIENT_CFLAGS
+-and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++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.
+
+@@ -14278,52 +13074,55 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS
+ EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PANEL" >&5
@@ -13256,20 +13603,20 @@
- pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED libcanberra-gtk\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PANEL_CFLAGS"; then
+ pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED libcanberra-gtk\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13283,20 +13630,20 @@
- pkg_cv_PANEL_LIBS="$PANEL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED libcanberra-gtk\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PANEL_LIBS"; then
+ pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu >= \$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED libcanberra-gtk\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13308,20 +13655,20 @@
fi
-@@ -14137,25 +12938,14 @@
+@@ -14336,25 +13135,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk" 2>&1`
++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk"`
else
-- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
-+ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk" 2>&1`
++ PANEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk"`
fi
# Put the nasty error message in config.log where it belongs
echo "$PANEL_PKG_ERRORS" >&5
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk) were not met:
-
-$PANEL_PKG_ERRORS
-
@@ -13332,12 +13679,12 @@
-and PANEL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
--$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
-+ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+-$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk) were not met:
++ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk) were not met:
$PANEL_PKG_ERRORS
-@@ -14165,12 +12955,11 @@
+@@ -14364,22 +13152,11 @@
Alternatively, you may set the environment variables PANEL_CFLAGS
and PANEL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13349,32 +13696,54 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: 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 PANEL_CFLAGS
+-and PANEL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+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.
-@@ -14179,22 +12968,104 @@
+@@ -14388,12 +13165,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+ PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
-+ PANEL_LIBS=$pkg_cv_PANEL_LIBS
+ else
+ PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
+ PANEL_LIBS=$pkg_cv_PANEL_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-+
-+
-+
-+
-+pkg_failed=no
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -14402,40 +13178,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
+-$as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOGOUT" >&5
+$as_echo_n "checking for LOGOUT... " >&6; }
-+
+
+-if test -n "$LIBPANEL_APPLET_CFLAGS"; then
+- pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LOGOUT_CFLAGS"; then
+ pkg_cv_LOGOUT_CFLAGS="$LOGOUT_CFLAGS"
@@ -13386,13 +13755,25 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LOGOUT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
+ fi
+-if test -n "$LIBPANEL_APPLET_LIBS"; then
+- pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LOGOUT_LIBS"; then
+ pkg_cv_LOGOUT_LIBS="$LOGOUT_LIBS"
@@ -13404,6 +13785,257 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LOGOUT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14448,64 +13228,41 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
++ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ else
+- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
++ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
+-
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
+-
+-$LIBPANEL_APPLET_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++ echo "$LOGOUT_PKG_ERRORS" >&5
+
+-Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+-$LIBPANEL_APPLET_PKG_ERRORS
++$LOGOUT_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 LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: 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 LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++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 LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LOGOUT_CFLAGS
++and LOGOUT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+- LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
+- LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
++ LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -14514,40 +13271,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for FISH" >&5
+-$as_echo_n "checking for FISH... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPANEL_APPLET" >&5
++$as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
+
+-if test -n "$FISH_CFLAGS"; then
+- pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPANEL_APPLET_CFLAGS"; then
++ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$FISH_LIBS"; then
+- pkg_cv_FISH_LIBS="$FISH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBPANEL_APPLET_LIBS"; then
++ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14560,27 +13321,109 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
+ else
+- FISH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
++ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$FISH_PKG_ERRORS" >&5
++ echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
++ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
+
+-$FISH_PKG_ERRORS
++$LIBPANEL_APPLET_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 FISH_CFLAGS
+-and FISH_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+-
+-$FISH_PKG_ERRORS
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { { $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 LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." "$LINENO" 5; }
++else
++ LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
++ LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
++
++
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FISH" >&5
++$as_echo_n "checking for FISH... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FISH_CFLAGS"; then
++ pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$FISH_LIBS"; then
++ pkg_cv_FISH_LIBS="$FISH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
@@ -13422,279 +14054,20 @@
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
-+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
+ else
-+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
-+ echo "$LOGOUT_PKG_ERRORS" >&5
++ echo "$FISH_PKG_ERRORS" >&5
+
-+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+
-+$LOGOUT_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 LOGOUT_CFLAGS
-+and LOGOUT_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}: 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 PANEL_CFLAGS
--and PANEL_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables LOGOUT_CFLAGS
-+and LOGOUT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
-- PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
-- PANEL_LIBS=$pkg_cv_PANEL_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
-+ LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-@@ -14203,40 +13074,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPANEL_APPLET" >&5
- $as_echo_n "checking for LIBPANEL_APPLET... " >&6; }
-
--if test -n "$LIBPANEL_APPLET_CFLAGS"; then
-- pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBPANEL_APPLET_CFLAGS"; then
-+ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$LIBPANEL_APPLET_LIBS"; then
-- pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBPANEL_APPLET_LIBS"; then
-+ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ORBit-2.0 >= \$ORBIT_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14249,25 +13124,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
- else
-- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
--
--$LIBPANEL_APPLET_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 LIBPANEL_APPLET_CFLAGS
--and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
-+ as_fn_error "Package requirements (ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED) were not met:
-
- $LIBPANEL_APPLET_PKG_ERRORS
-
-@@ -14277,22 +13141,11 @@
- Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
- and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: 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 LIBPANEL_APPLET_CFLAGS
--and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+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.
-
-@@ -14301,12 +13154,11 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
- LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- fi
-@@ -14315,40 +13167,44 @@
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for FISH" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FISH" >&5
- $as_echo_n "checking for FISH... " >&6; }
-
--if test -n "$FISH_CFLAGS"; then
-- pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$FISH_CFLAGS"; then
-+ pkg_cv_FISH_CFLAGS="$FISH_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_FISH_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$FISH_LIBS"; then
-- pkg_cv_FISH_LIBS="$FISH_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$FISH_LIBS"; then
-+ pkg_cv_FISH_LIBS="$FISH_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED cairo >= \$CAIRO_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- pkg_cv_FISH_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14361,25 +13217,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
-+ FISH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
- else
-- FISH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED" 2>&1`
-+ FISH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$FISH_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
--
--$FISH_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 FISH_CFLAGS
--and FISH_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
-+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
-
- $FISH_PKG_ERRORS
-
-@@ -14389,22 +13234,11 @@
++$FISH_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+@@ -14588,22 +13431,11 @@
Alternatively, you may set the environment variables FISH_CFLAGS
and FISH_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13720,7 +14093,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14413,12 +13247,11 @@
+@@ -14612,12 +13444,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13735,7 +14108,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14427,40 +13260,44 @@
+@@ -14626,40 +13457,44 @@
pkg_failed=no
@@ -13775,14 +14148,13 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NOTIFICATION_AREA_LIBS"; then
+ pkg_cv_NOTIFICATION_AREA_LIBS="$NOTIFICATION_AREA_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
@@ -13800,7 +14172,7 @@
fi
-@@ -14473,25 +13310,14 @@
+@@ -14672,25 +13507,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13829,7 +14201,7 @@
$NOTIFICATION_AREA_PKG_ERRORS
-@@ -14501,22 +13327,11 @@
+@@ -14700,22 +13524,11 @@
Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS
and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13855,7 +14227,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14525,12 +13340,11 @@
+@@ -14724,12 +13537,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13870,7 +14242,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14539,40 +13353,44 @@
+@@ -14738,40 +13550,44 @@
pkg_failed=no
@@ -13934,7 +14306,7 @@
fi
-@@ -14585,14 +13403,14 @@
+@@ -14784,25 +13600,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13948,25 +14320,25 @@
echo "$WNCKLET_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met:
+-
+-$WNCKLET_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 WNCKLET_CFLAGS
+-and WNCKLET_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met:
+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met:
$WNCKLET_PKG_ERRORS
-@@ -14602,33 +13420,11 @@
+@@ -14812,22 +13617,11 @@
Alternatively, you may set the environment variables WNCKLET_CFLAGS
and WNCKLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED) were not met:
--
--$WNCKLET_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 WNCKLET_CFLAGS
--and WNCKLET_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -13989,7 +14361,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14637,265 +13433,35 @@
+@@ -14836,265 +13630,35 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14265,7 +14637,7 @@
_ACEOF
fi
-@@ -14903,7 +13469,7 @@
+@@ -15102,7 +13666,7 @@
# Check whether --enable-eds was given.
@@ -14274,7 +14646,7 @@
enableval=$enable_eds;
else
enable_eds=auto
-@@ -14915,24 +13481,22 @@
+@@ -15115,25 +13679,23 @@
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
else
if test "x$enable_eds" != "xno"; then
@@ -14287,6 +14659,7 @@
$as_echo "yes" >&6; }
LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
+ HAVE_EDS=yes
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14303,7 +14676,7 @@
fi
if test -n "$LIBECAL_REQUIREMENT"; then
-@@ -14947,40 +13511,44 @@
+@@ -15148,40 +13710,44 @@
pkg_failed=no
@@ -14315,23 +14688,20 @@
- pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CLOCK_CFLAGS"; then
+ pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
-+ ac_status=$?
+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
+ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -14345,23 +14715,20 @@
- pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CLOCK_LIBS"; then
+ pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
-+ ac_status=$?
+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
+ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -14373,20 +14740,20 @@
fi
-@@ -14993,25 +13561,14 @@
+@@ -15194,25 +13760,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
+- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
else
-- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
+- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
fi
# Put the nasty error message in config.log where it belongs
echo "$CLOCK_PKG_ERRORS" >&5
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
-
-$CLOCK_PKG_ERRORS
-
@@ -14397,12 +14764,12 @@
-and CLOCK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
--$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
+-$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
+ as_fn_error "Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
$CLOCK_PKG_ERRORS
-@@ -15021,22 +13578,11 @@
+@@ -15222,22 +13777,11 @@
Alternatively, you may set the environment variables CLOCK_CFLAGS
and CLOCK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14428,7 +14795,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15045,12 +13591,11 @@
+@@ -15246,12 +13790,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14443,7 +14810,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15059,40 +13604,44 @@
+@@ -15260,40 +13803,44 @@
pkg_failed=no
@@ -14507,7 +14874,7 @@
fi
-@@ -15105,25 +13654,14 @@
+@@ -15306,25 +13853,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14536,7 +14903,7 @@
$CLOCK_MECHANISM_PKG_ERRORS
-@@ -15133,12 +13671,11 @@
+@@ -15334,22 +13870,11 @@
Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14548,24 +14915,24 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: 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 CLOCK_MECHANISM_CFLAGS
+-and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+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.
-@@ -15147,22 +13684,11 @@
+@@ -15358,12 +13883,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
--and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -14577,7 +14944,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15179,7 +13705,7 @@
+@@ -15380,7 +13904,7 @@
POLKIT_CFLAGS=
POLKIT_LIBS=
# Check whether --enable-polkit was given.
@@ -14586,7 +14953,7 @@
enableval=$enable_polkit; enable_polkit=$enableval
else
enable_polkit=auto
-@@ -15191,40 +13717,44 @@
+@@ -15392,40 +13916,44 @@
HAVE_POLKIT=no
pkg_failed=no
@@ -14650,7 +15017,7 @@
fi
-@@ -15237,14 +13767,14 @@
+@@ -15438,14 +13966,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14668,7 +15035,7 @@
$as_echo "no" >&6; }
HAVE_POLKIT=no
elif test $pkg_failed = untried; then
-@@ -15252,22 +13782,18 @@
+@@ -15453,22 +13981,18 @@
else
POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
@@ -14694,7 +15061,7 @@
fi
fi
-@@ -15283,7 +13809,7 @@
+@@ -15484,7 +14008,7 @@
# Check whether --enable-network_manager was given.
@@ -14703,7 +15070,7 @@
enableval=$enable_network_manager; enable_network_manager=$enableval
else
enable_network_manager=auto
-@@ -15294,40 +13820,44 @@
+@@ -15495,40 +14019,44 @@
else
pkg_failed=no
@@ -14767,7 +15134,7 @@
fi
-@@ -15340,14 +13870,14 @@
+@@ -15541,14 +14069,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14785,7 +15152,7 @@
$as_echo "no" >&6; }
HAVE_NETWORK_MANAGER=no
elif test $pkg_failed = untried; then
-@@ -15355,16 +13885,14 @@
+@@ -15556,16 +14084,14 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -14804,7 +15171,7 @@
fi
-@@ -15374,7 +13902,7 @@
+@@ -15575,7 +14101,7 @@
PANEL_INPROCESS_APPLETS=
# Check whether --with-in-process-applets was given.
@@ -14813,7 +15180,7 @@
withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
if test $i = "none"; then
PANEL_INPROCESS_NONE=1
-@@ -15405,30 +13933,22 @@
+@@ -15606,30 +14132,22 @@
if test $i = "clock"; then
CLOCK_COMPILE_INPROCESS=1
@@ -14848,7 +15215,7 @@
fi; fi; fi; fi
done
-@@ -15467,24 +13987,15 @@
+@@ -15671,24 +14189,15 @@
# For the run dialog
@@ -14876,7 +15243,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
-@@ -15498,41 +14009,18 @@
+@@ -15702,41 +14211,18 @@
return 0;
}
_ACEOF
@@ -14924,7 +15291,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
-@@ -15543,17 +14031,13 @@
+@@ -15747,17 +14233,13 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -14945,7 +15312,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15578,70 +14062,39 @@
+@@ -15782,70 +14264,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15027,7 +15394,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15666,70 +14119,39 @@
+@@ -15870,70 +14321,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15109,7 +15476,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -15756,60 +14178,33 @@
+@@ -15960,60 +14380,33 @@
return 0;
}
_ACEOF
@@ -15178,7 +15545,7 @@
withval=$with_x;
fi
-@@ -15819,10 +14214,8 @@
+@@ -16023,10 +14416,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15191,7 +15558,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -15870,21 +14263,25 @@
+@@ -16074,21 +14465,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -15217,7 +15584,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -15906,37 +14303,14 @@
+@@ -16110,37 +14505,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -15257,7 +15624,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -15944,7 +14318,6 @@
+@@ -16148,7 +14520,6 @@
fi
done
fi
@@ -15265,7 +15632,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -15954,11 +14327,7 @@
+@@ -16158,11 +14529,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15278,7 +15645,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -15969,35 +14338,12 @@
+@@ -16173,35 +14540,12 @@
return 0;
}
_ACEOF
@@ -15316,7 +15683,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16009,10 +14355,8 @@
+@@ -16213,10 +14557,8 @@
done
done
fi
@@ -15329,7 +15696,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16033,7 +14377,7 @@
+@@ -16237,7 +14579,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15338,7 +15705,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16044,46 +14388,50 @@
+@@ -16248,46 +14590,50 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15409,7 +15776,7 @@
fi
-@@ -16096,14 +14444,14 @@
+@@ -16300,14 +14646,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15427,7 +15794,7 @@
$as_echo "no" >&6; }
# pkg-config modules not found (only present since X11R7 aka Xorg); use
-@@ -16111,9 +14459,7 @@
+@@ -16315,9 +14661,7 @@
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -15438,7 +15805,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16126,16 +14472,12 @@
+@@ -16330,16 +14674,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -15457,7 +15824,7 @@
/* end confdefs.h. */
int
-@@ -16146,40 +14488,13 @@
+@@ -16350,40 +14690,13 @@
return 0;
}
_ACEOF
@@ -15502,7 +15869,7 @@
/* end confdefs.h. */
int
-@@ -16190,46 +14505,19 @@
+@@ -16394,46 +14707,19 @@
return 0;
}
_ACEOF
@@ -15556,7 +15923,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -16245,11 +14533,7 @@
+@@ -16449,11 +14735,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -15569,7 +15936,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16267,44 +14551,17 @@
+@@ -16471,44 +14753,17 @@
return 0;
}
_ACEOF
@@ -15619,7 +15986,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16322,59 +14579,30 @@
+@@ -16526,59 +14781,30 @@
return 0;
}
_ACEOF
@@ -15688,7 +16055,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16392,52 +14620,25 @@
+@@ -16596,52 +14822,25 @@
return 0;
}
_ACEOF
@@ -15749,33 +16116,21 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -16448,33 +14649,21 @@
+@@ -16652,105 +14851,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
@@ -15792,154 +16147,6 @@
-#endif
-
-#undef gethostbyname
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -16483,13 +14672,6 @@
- extern "C"
- #endif
- char gethostbyname ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_gethostbyname || defined __stub___gethostbyname
--choke me
--#endif
--
- int
- main ()
- {
-@@ -16498,55 +14680,30 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_gethostbyname=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_nsl_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
-- if test $ac_cv_func_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+ if test $ac_cv_lib_nsl_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lbsd $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16564,113 +14721,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_nsl_gethostbyname=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_nsl_gethostbyname=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
--if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
--fi
--
-- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
--if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbsd $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -15948,6 +16155,13 @@
-extern "C"
-#endif
-char gethostbyname ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+-choke me
+-#endif
+-
-int
-main ()
-{
@@ -15977,14 +16191,75 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_gethostbyname=yes
- else
+- ac_cv_func_gethostbyname=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_bsd_gethostbyname=no
-+ ac_cv_lib_bsd_gethostbyname=no
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
+- ac_cv_func_gethostbyname=no
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+-
+ if test $ac_cv_func_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16768,59 +14882,30 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_nsl_gethostbyname=no
++ ac_cv_lib_nsl_gethostbyname=no
fi
-
-rm -rf conftest.dSYM
@@ -15994,6 +16269,75 @@
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16838,43 +14923,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_bsd_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
@@ -16002,7 +16346,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -16684,105 +14746,20 @@
+@@ -16888,105 +14948,20 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -16113,7 +16457,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16800,76 +14777,39 @@
+@@ -17004,76 +14979,39 @@
return 0;
}
_ACEOF
@@ -16208,7 +16552,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -16878,13 +14818,6 @@
+@@ -17082,13 +15020,6 @@
extern "C"
#endif
char remove ();
@@ -16222,7 +16566,7 @@
int
main ()
{
-@@ -16893,55 +14826,38 @@
+@@ -17097,55 +15028,38 @@
return 0;
}
_ACEOF
@@ -16302,7 +16646,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16950,85 +14866,51 @@
+@@ -17154,216 +15068,32 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -16367,35 +16711,19 @@
fi
fi
-+ fi
-
+-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-+ # Check for libraries that X11R6 Xt/Xaw programs need.
-+ ac_save_LDFLAGS=$LDFLAGS
-+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+ # check for ICE first), but we must link in the order -lSM -lICE or
-+ # we get undefined symbols. So assume we have SM if we have ICE.
-+ # These have to be linked with before -lX11, unlike the other
-+ # libraries we check for below, so use a different variable.
-+ # John Interrante, Karl Berry
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shmat innocuous_shmat
@@ -16412,13 +16740,13 @@
-#endif
-
-#undef shmat
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -17036,206 +14918,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -16427,16 +16755,14 @@
-choke me
-#endif
-
-+char IceConnectionNumber ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return shmat ();
-+return IceConnectionNumber ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16545,45 +16871,36 @@
-
- fi
- fi
--
-- # Check for libraries that X11R6 Xt/Xaw programs need.
-- ac_save_LDFLAGS=$LDFLAGS
-- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-- # check for ICE first), but we must link in the order -lSM -lICE or
-- # we get undefined symbols. So assume we have SM if we have ICE.
-- # These have to be linked with before -lX11, unlike the other
-- # libraries we check for below, so use a different variable.
-- # John Interrante, Karl Berry
++ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS=$LDFLAGS
+@@ -17374,18 +15104,14 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char IceConnectionNumber ();
--int
--main ()
--{
--return IceConnectionNumber ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17403,43 +15129,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16630,7 +16947,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -17245,28 +14948,21 @@
+@@ -17449,28 +15150,21 @@
# X not found
if test x$no_x = xyes ; then
@@ -16663,7 +16980,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17284,43 +14980,18 @@
+@@ -17488,43 +15182,18 @@
return 0;
}
_ACEOF
@@ -16713,7 +17030,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
_ACEOF
-@@ -17328,24 +14999,17 @@
+@@ -17532,24 +15201,17 @@
LIBS="-lX11 $LIBS"
else
@@ -16742,7 +17059,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17363,43 +15027,18 @@
+@@ -17567,43 +15229,18 @@
return 0;
}
_ACEOF
@@ -16792,7 +17109,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
_ACEOF
-@@ -17407,9 +15046,7 @@
+@@ -17611,9 +15248,7 @@
LIBS="-lXau $LIBS"
else
@@ -16803,7 +17120,7 @@
fi
CFLAGS="$gp_save_cflags"
-@@ -17424,9 +15061,7 @@
+@@ -17628,9 +15263,7 @@
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -16814,7 +17131,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -17439,16 +15074,12 @@
+@@ -17643,16 +15276,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -16833,7 +17150,7 @@
/* end confdefs.h. */
int
-@@ -17459,40 +15090,13 @@
+@@ -17663,40 +15292,13 @@
return 0;
}
_ACEOF
@@ -16878,7 +17195,7 @@
/* end confdefs.h. */
int
-@@ -17503,46 +15107,19 @@
+@@ -17707,46 +15309,19 @@
return 0;
}
_ACEOF
@@ -16932,7 +17249,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -17558,11 +15135,7 @@
+@@ -17762,11 +15337,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -16945,7 +17262,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17580,44 +15153,17 @@
+@@ -17784,44 +15355,17 @@
return 0;
}
_ACEOF
@@ -16995,7 +17312,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17635,59 +15181,30 @@
+@@ -17839,59 +15383,30 @@
return 0;
}
_ACEOF
@@ -17064,7 +17381,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17705,52 +15222,25 @@
+@@ -17909,52 +15424,25 @@
return 0;
}
_ACEOF
@@ -17125,15 +17442,24 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17761,341 +15251,20 @@
+@@ -17965,105 +15453,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -17204,12 +17530,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-
- ac_cv_func_gethostbyname=no
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -17217,10 +17541,9 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
+- if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
- $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
@@ -17231,23 +17554,16 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char gethostbyname ();
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18081,59 +15484,30 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17269,55 +17585,54 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_nsl_gethostbyname=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_gethostbyname=no
--fi
++ ac_cv_lib_nsl_gethostbyname=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
--fi
--
-- if test $ac_cv_lib_nsl_gethostbyname = no; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbsd $LIBS"
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char gethostbyname ();
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18151,43 +15525,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17339,35 +17654,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_bsd_gethostbyname=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
--fi
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
--fi
--
-- fi
-- fi
--
-- # lieder at skyler.mavd.honeywell.com says without -lsocket,
-- # socket/setsockopt and other routines are undefined under SCO ODT
-- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-- # on later versions), says Simon Leinen: it contains gethostby*
-- # variants that don't use the name server (or something). -lsocket
-- # must be given before -lnsl if both are needed. We assume that
-- # if connect needs -lnsl, so does gethostbyname.
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -18201,105 +15550,20 @@
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
@@ -17446,46 +17761,36 @@
-
- ac_cv_func_connect=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
--
-- if test $ac_cv_func_connect = no; then
+
+ if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--$as_echo_n "checking for connect in -lsocket... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18104,85 +15273,40 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char connect ();
-+char gethostbyname ();
- int
- main ()
- {
--return connect ();
-+return gethostbyname ();
- ;
+@@ -18317,148 +15581,38 @@
return 0;
}
_ACEOF
@@ -17510,15 +17815,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_socket_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_nsl_gethostbyname=yes
+ ac_cv_lib_socket_connect=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_nsl_gethostbyname=no
++ ac_cv_lib_socket_connect=no
fi
-
-rm -rf conftest.dSYM
@@ -17529,36 +17833,27 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--$as_echo "$ac_cv_lib_socket_connect" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
-- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
-- fi
--
-- # Guillermo Gomez says -lposix is necessary on A/UX.
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
-+ if test $ac_cv_lib_nsl_gethostbyname = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define remove innocuous_remove
@@ -17575,13 +17870,13 @@
-#endif
-
-#undef remove
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -18190,71 +15314,54 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -17590,13 +17885,72 @@
-choke me
-#endif
-
-+char gethostbyname ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return remove ();
-+return gethostbyname ();
- ;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_remove=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_remove=no
+-fi
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18476,76 +15630,39 @@
return 0;
}
_ACEOF
@@ -17621,113 +17975,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_bsd_gethostbyname=yes
+ ac_cv_lib_posix_remove=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_remove=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-+fi
-+
-+ fi
-+ fi
-+
-+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
-+ # socket/setsockopt and other routines are undefined under SCO ODT
-+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-+ # on later versions), says Simon Leinen: it contains gethostby*
-+ # variants that don't use the name server (or something). -lsocket
-+ # must be given before -lnsl if both are needed. We assume that
-+ # if connect needs -lnsl, so does gethostbyname.
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
-
-- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+ if test $ac_cv_func_connect = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18263,85 +15370,48 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char remove ();
-+char connect ();
- int
- main ()
- {
--return remove ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_posix_remove=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- ac_cv_lib_posix_remove=no
-+ ac_cv_lib_socket_connect=no
++ ac_cv_lib_posix_remove=no
fi
-
-rm -rf conftest.dSYM
@@ -17738,31 +17993,28 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-+$as_echo "$ac_cv_lib_socket_connect" >&6; }
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
fi
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-+ # Guillermo Gomez says -lposix is necessary on A/UX.
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
+fi
+
-+ if test $ac_cv_func_remove = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-+$as_echo_n "checking for remove in -lposix... " >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then :
++ if test $ac_cv_func_shmat = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
++$as_echo_n "checking for shmat in -lipc... " >&6; }
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -17771,7 +18023,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix $LIBS"
++LIBS="-lipc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
@@ -17793,11 +18045,10 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -18349,71 +15419,47 @@
- #ifdef __cplusplus
+@@ -18554,13 +15671,6 @@
extern "C"
#endif
--char shmat ();
+ char shmat ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -17805,13 +18056,10 @@
-choke me
-#endif
-
-+char remove ();
int
main ()
{
--return shmat ();
-+return remove ();
- ;
+@@ -18569,109 +15679,18 @@
return 0;
}
_ACEOF
@@ -17837,61 +18085,50 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shmat=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shmat=no
-+ ac_cv_lib_posix_remove=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-+$as_echo "$ac_cv_lib_posix_remove" >&6; }
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ fi
-+
-+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-+
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
+-
+- if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
- $as_echo_n "checking for shmat in -lipc... " >&6; }
+-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lipc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18431,43 +15477,18 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shmat ();
+-int
+-main ()
+-{
+-return shmat ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17938,7 +18175,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -18483,18 +15504,14 @@
+@@ -18687,18 +15706,14 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -17960,7 +18197,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18512,43 +15529,18 @@
+@@ -18716,43 +15731,18 @@
return 0;
}
_ACEOF
@@ -18010,7 +18247,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18558,28 +15550,21 @@
+@@ -18762,28 +15752,21 @@
# X not found
if test x$no_x = xyes ; then
@@ -18043,7 +18280,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18597,43 +15582,18 @@
+@@ -18801,43 +15784,18 @@
return 0;
}
_ACEOF
@@ -18093,7 +18330,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
_ACEOF
-@@ -18641,24 +15601,17 @@
+@@ -18845,24 +15803,17 @@
LIBS="-lX11 $LIBS"
else
@@ -18122,7 +18359,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18676,43 +15629,18 @@
+@@ -18880,43 +15831,18 @@
return 0;
}
_ACEOF
@@ -18172,7 +18409,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
_ACEOF
-@@ -18720,9 +15648,7 @@
+@@ -18924,9 +15850,7 @@
LIBS="-lXau $LIBS"
else
@@ -18183,7 +18420,7 @@
fi
CFLAGS="$gp_save_cflags"
-@@ -18733,7 +15659,7 @@
+@@ -18937,7 +15861,7 @@
else
X_CFLAGS=$pkg_cv_X_CFLAGS
X_LIBS=$pkg_cv_X_LIBS
@@ -18192,7 +18429,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -18743,9 +15669,7 @@
+@@ -18947,9 +15871,7 @@
if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
@@ -18201,27 +18438,13 @@
-_ACEOF
+$as_echo "#define HAVE_RANDR 1" >>confdefs.h
- fi
-
-@@ -18756,164 +15680,25 @@
- BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-
-
--BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
--
--
--
--GETTEXT_PACKAGE=gnome-panel-2.0
--
--cat >>confdefs.h <<_ACEOF
--#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
--_ACEOF
--
--
--
--
-+BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-
+ have_randr=yes
+ else
+@@ -18976,151 +15898,12 @@
+
+
+
+-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -18270,15 +18493,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+GETTEXT_PACKAGE=gnome-panel-2.0
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -18289,9 +18511,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -18313,14 +18533,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
-fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -18362,7 +18582,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -18377,7 +18597,7 @@
_ACEOF
fi
-@@ -18921,16 +15706,12 @@
+@@ -19128,16 +15911,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -18397,7 +18617,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -18941,46 +15722,19 @@
+@@ -19148,46 +15927,19 @@
return 0;
}
_ACEOF
@@ -18450,7 +18670,7 @@
fi
fi
-@@ -18993,155 +15747,20 @@
+@@ -19200,155 +15952,20 @@
XGETTEXT=:
INTLLIBS=
@@ -18611,7 +18831,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19154,54 +15773,25 @@
+@@ -19361,54 +15978,25 @@
return 0;
}
_ACEOF
@@ -18674,7 +18894,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19214,141 +15804,26 @@
+@@ -19421,141 +16009,26 @@
return 0;
}
_ACEOF
@@ -18826,7 +19046,7 @@
_ACEOF
fi
-@@ -19363,18 +15838,14 @@
+@@ -19570,18 +16043,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -18848,7 +19068,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19384,63 +15855,34 @@
+@@ -19591,63 +16060,34 @@
extern "C"
#endif
char bindtextdomain ();
@@ -18929,7 +19149,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19458,55 +15900,26 @@
+@@ -19665,55 +16105,26 @@
return 0;
}
_ACEOF
@@ -18994,7 +19214,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19524,43 +15937,18 @@
+@@ -19731,43 +16142,18 @@
return 0;
}
_ACEOF
@@ -19044,7 +19264,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -19570,22 +15958,18 @@
+@@ -19777,22 +16163,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -19072,7 +19292,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19603,55 +15987,26 @@
+@@ -19810,55 +16192,26 @@
return 0;
}
_ACEOF
@@ -19137,7 +19357,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19669,43 +16024,18 @@
+@@ -19876,43 +16229,18 @@
return 0;
}
_ACEOF
@@ -19187,7 +19407,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -19727,102 +16057,12 @@
+@@ -19934,102 +16262,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -19295,7 +19515,7 @@
_ACEOF
fi
-@@ -19852,15 +16092,13 @@
+@@ -20059,15 +16297,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -19314,7 +19534,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -19885,118 +16123,28 @@
+@@ -20092,118 +16328,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -19441,7 +19661,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -20011,14 +16159,14 @@
+@@ -20218,14 +16364,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -19461,7 +19681,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -20026,9 +16174,9 @@
+@@ -20233,9 +16379,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -19473,7 +19693,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -20041,14 +16189,14 @@
+@@ -20248,14 +16394,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19491,7 +19711,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -20057,19 +16205,19 @@
+@@ -20264,19 +16410,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -19515,7 +19735,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -20094,144 +16242,33 @@
+@@ -20301,144 +16447,33 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -19676,7 +19896,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -20246,10 +16283,8 @@
+@@ -20453,10 +16488,8 @@
;;
esac
fi
@@ -19689,7 +19909,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -20263,9 +16298,7 @@
+@@ -20470,9 +16503,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -19700,7 +19920,7 @@
fi
-@@ -20273,7 +16306,7 @@
+@@ -20480,7 +16511,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -19709,7 +19929,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -20306,7 +16339,7 @@
+@@ -20513,7 +16544,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -19718,7 +19938,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -20331,7 +16364,7 @@
+@@ -20538,7 +16569,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -19727,7 +19947,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -20369,9 +16402,9 @@
+@@ -20576,9 +16607,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -19739,7 +19959,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -20384,14 +16417,14 @@
+@@ -20591,14 +16622,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19757,7 +19977,7 @@
IFS=$as_save_IFS
;;
-@@ -20399,10 +16432,10 @@
+@@ -20606,10 +16637,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -19770,7 +19990,7 @@
$as_echo "no" >&6; }
fi
-@@ -20411,9 +16444,9 @@
+@@ -20618,9 +16649,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19782,7 +20002,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -20426,14 +16459,14 @@
+@@ -20633,14 +16664,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19800,7 +20020,7 @@
IFS=$as_save_IFS
;;
-@@ -20441,10 +16474,10 @@
+@@ -20648,10 +16679,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -19813,7 +20033,7 @@
$as_echo "no" >&6; }
fi
-@@ -20455,9 +16488,9 @@
+@@ -20662,9 +16693,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -19825,7 +20045,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -20470,14 +16503,14 @@
+@@ -20677,14 +16708,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19843,7 +20063,7 @@
IFS=$as_save_IFS
;;
-@@ -20485,10 +16518,10 @@
+@@ -20692,10 +16723,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -19856,7 +20076,7 @@
$as_echo "no" >&6; }
fi
-@@ -20496,7 +16529,7 @@
+@@ -20703,7 +16734,7 @@
# Check whether --with-html-dir was given.
@@ -19865,7 +20085,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -20506,7 +16539,7 @@
+@@ -20713,7 +16744,7 @@
# Check whether --enable-gtk-doc was given.
@@ -19874,7 +20094,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -20515,33 +16548,31 @@
+@@ -20722,33 +16753,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -19916,9 +20136,13 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -20600,11 +16631,11 @@
+@@ -20806,35 +16835,33 @@
+
gdu_cv_version_required=0.3.2
+-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+ $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
@@ -19931,10 +20155,17 @@
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
-@@ -20613,15 +16644,13 @@
+ fi
+
if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
:
else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
- { (exit 1); exit 1; }; }
@@ -19949,7 +20180,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -20632,7 +16661,7 @@
+@@ -20845,7 +16872,7 @@
# Check whether --with-omf-dir was given.
@@ -19958,7 +20189,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -20643,7 +16672,7 @@
+@@ -20856,7 +16883,7 @@
# Check whether --with-help-formats was given.
@@ -19967,7 +20198,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -20653,7 +16682,7 @@
+@@ -20866,7 +16893,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -19976,7 +20207,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -20691,13 +16720,13 @@
+@@ -20904,13 +16931,13 @@
# Check whether --with-gconf-source was given.
@@ -19992,7 +20223,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -20706,22 +16735,20 @@
+@@ -20919,22 +16946,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -20019,7 +20250,7 @@
esac
fi
-@@ -20739,9 +16766,7 @@
+@@ -20952,9 +16977,7 @@
*-*-solaris*)
ostype=solaris
@@ -20030,7 +20261,7 @@
;;
esac
-@@ -20750,9 +16775,9 @@
+@@ -20963,9 +16986,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -20042,7 +20273,7 @@
$as_echo_n "(cached) " >&6
else
case $AWK in
-@@ -20765,14 +16790,14 @@
+@@ -20978,14 +17001,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20060,7 +20291,7 @@
IFS=$as_save_IFS
;;
-@@ -20780,10 +16805,10 @@
+@@ -20993,10 +17016,10 @@
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -20073,7 +20304,7 @@
$as_echo "no" >&6; }
fi
-@@ -20795,9 +16820,9 @@
+@@ -21008,9 +17031,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -20085,7 +20316,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -20810,14 +16835,14 @@
+@@ -21023,14 +17046,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20103,7 +20334,7 @@
IFS=$as_save_IFS
;;
-@@ -20825,10 +16850,10 @@
+@@ -21038,10 +17061,10 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -20116,7 +20347,7 @@
$as_echo "no" >&6; }
fi
-@@ -20838,7 +16863,7 @@
+@@ -21051,7 +17074,7 @@
# Check whether --enable-rebuilds was given.
@@ -20125,7 +20356,7 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
-@@ -20882,13 +16907,13 @@
+@@ -21095,13 +17118,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -20141,7 +20372,7 @@
esac ;;
esac
done
-@@ -20896,8 +16921,8 @@
+@@ -21109,8 +17132,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -20152,7 +20383,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20920,11 +16945,11 @@
+@@ -21133,11 +17156,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -20166,7 +20397,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20944,8 +16969,8 @@
+@@ -21157,8 +17180,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -20177,7 +20408,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20961,143 +16986,90 @@
+@@ -21174,143 +17197,90 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -20360,7 +20591,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -21107,17 +17079,18 @@
+@@ -21320,17 +17290,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -20386,7 +20617,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -21125,23 +17098,15 @@
+@@ -21338,23 +17309,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -20415,7 +20646,7 @@
as_nl='
'
export as_nl
-@@ -21149,7 +17114,13 @@
+@@ -21362,7 +17325,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -20430,7 +20661,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -21160,7 +17131,7 @@
+@@ -21373,7 +17342,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -20439,7 +20670,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -21183,13 +17154,6 @@
+@@ -21396,13 +17365,6 @@
}
fi
@@ -20453,7 +20684,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -21199,15 +17163,15 @@
+@@ -21412,15 +17374,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -20472,7 +20703,7 @@
IFS=$as_save_IFS
;;
-@@ -21219,12 +17183,16 @@
+@@ -21432,12 +17394,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -20493,7 +20724,7 @@
done
PS1='$ '
PS2='> '
-@@ -21236,7 +17204,89 @@
+@@ -21449,7 +17415,89 @@
LANGUAGE=C
export LANGUAGE
@@ -20584,7 +20815,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -21250,8 +17300,12 @@
+@@ -21463,8 +17511,12 @@
as_basename=false
fi
@@ -20598,7 +20829,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -21271,76 +17325,25 @@
+@@ -21484,76 +17536,25 @@
}
s/.*/./; q'`
@@ -20686,7 +20917,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -21369,8 +17372,56 @@
+@@ -21582,8 +17583,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -20744,7 +20975,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -21389,10 +17440,10 @@
+@@ -21602,10 +17651,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -20757,7 +20988,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -21407,13 +17458,19 @@
+@@ -21620,13 +17669,19 @@
exec 6>&1
@@ -20773,13 +21004,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gnome-panel $as_me 2.28.0, which was
+ This file was extended by gnome-panel $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -21445,13 +17502,15 @@
+@@ -21658,13 +17713,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -20798,7 +21029,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -21470,16 +17529,17 @@
+@@ -21683,16 +17740,17 @@
Configuration commands:
$config_commands
@@ -20809,7 +21040,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gnome-panel config.status 2.28.0
+ gnome-panel config.status 2.30.0
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -20820,7 +21051,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21515,6 +17575,8 @@
+@@ -21728,6 +17786,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -20829,7 +21060,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -21522,20 +17584,19 @@
+@@ -21735,20 +17795,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -20854,7 +21085,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21543,11 +17604,10 @@
+@@ -21756,11 +17815,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -20869,7 +21100,7 @@
ac_need_defaults=false ;;
esac
-@@ -21890,9 +17950,7 @@
+@@ -22104,9 +18162,7 @@
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -20880,7 +21111,7 @@
esac
done
-@@ -21919,7 +17977,7 @@
+@@ -22133,7 +18189,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -20889,7 +21120,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21930,11 +17988,7 @@
+@@ -22144,11 +18200,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -20902,7 +21133,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21942,10 +17996,16 @@
+@@ -22156,10 +18208,16 @@
if test -n "$CONFIG_FILES"; then
@@ -20921,7 +21152,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21959,24 +18019,18 @@
+@@ -22173,24 +18231,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -20949,7 +21180,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21998,7 +18052,7 @@
+@@ -22212,7 +18264,7 @@
t delim
:nl
h
@@ -20958,7 +21189,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -22012,7 +18066,7 @@
+@@ -22226,7 +18278,7 @@
t nl
:delim
h
@@ -20967,7 +21198,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -22065,9 +18119,7 @@
+@@ -22279,9 +18331,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -20978,7 +21209,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -22108,9 +18160,7 @@
+@@ -22322,9 +18372,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -20989,7 +21220,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22195,9 +18245,7 @@
+@@ -22409,9 +18457,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -21000,7 +21231,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -22210,9 +18258,7 @@
+@@ -22424,9 +18470,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -21011,7 +21242,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -22240,12 +18286,10 @@
+@@ -22454,12 +18498,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -21026,7 +21257,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -22256,7 +18300,7 @@
+@@ -22470,7 +18512,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -21035,7 +21266,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -22269,9 +18313,7 @@
+@@ -22483,9 +18525,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -21046,7 +21277,7 @@
esac
;;
esac
-@@ -22299,47 +18341,7 @@
+@@ -22513,47 +18553,7 @@
q
}
s/.*/./; q'`
@@ -21095,7 +21326,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -22396,7 +18398,6 @@
+@@ -22610,7 +18610,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -21103,7 +21334,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -22406,12 +18407,11 @@
+@@ -22620,12 +18619,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -21118,7 +21349,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -22421,7 +18421,7 @@
+@@ -22635,7 +18633,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -21127,7 +21358,7 @@
esac
_ACEOF
-@@ -22450,14 +18450,12 @@
+@@ -22664,14 +18662,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -21144,7 +21375,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -22467,9 +18465,7 @@
+@@ -22681,9 +18677,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -21155,7 +21386,7 @@
;;
:H)
#
-@@ -22480,25 +18476,19 @@
+@@ -22694,25 +18688,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -21185,7 +21416,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22536,7 +18526,7 @@
+@@ -22750,7 +18738,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -21194,7 +21425,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22631,47 +18621,7 @@
+@@ -22845,47 +18833,7 @@
q
}
s/.*/./; q'`
@@ -21243,10 +21474,10 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -23324,9 +19274,7 @@
+@@ -23538,9 +19486,7 @@
esac ;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
- { (exit 1); exit 1; }; }
@@ -21254,7 +21485,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -23349,15 +19297,12 @@
+@@ -23563,15 +19509,12 @@
done # for ac_tag
@@ -21272,7 +21503,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -23378,10 +19323,10 @@
+@@ -23592,10 +19535,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -21285,9 +21516,16 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -194,6 +194,8 @@
+diff -Naur gnome-panel-2.30.0.old/doc/Makefile.in gnome-panel-2.30.0/doc/Makefile.in
+--- gnome-panel-2.30.0.old/doc/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/doc/Makefile.in 2010-05-05 10:03:30.110499290 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -177,6 +177,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21296,7 +21534,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@
+@@ -202,6 +204,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21304,9 +21542,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/doc/reference/Makefile.in
-+++ b/doc/reference/Makefile.in
-@@ -194,6 +194,8 @@
+@@ -344,7 +347,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -369,7 +372,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/doc/reference/Makefile.in gnome-panel-2.30.0/doc/reference/Makefile.in
+--- gnome-panel-2.30.0.old/doc/reference/Makefile.in 2010-03-30 02:52:45.000000000 +0200
++++ gnome-panel-2.30.0/doc/reference/Makefile.in 2010-05-05 10:03:30.166500476 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -177,6 +177,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21315,7 +21578,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@
+@@ -202,6 +204,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21323,9 +21586,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/doc/reference/panel-applet/Makefile.in
-+++ b/doc/reference/panel-applet/Makefile.in
-@@ -161,6 +161,8 @@
+@@ -340,7 +343,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -365,7 +368,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/doc/reference/panel-applet/Makefile.in gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in
+--- gnome-panel-2.30.0.old/doc/reference/panel-applet/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/doc/reference/panel-applet/Makefile.in 2010-05-05 10:03:30.234500883 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -144,6 +144,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21334,7 +21622,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@
+@@ -169,6 +171,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21342,8 +21630,95 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/gnome-panel/Makefile.in
-+++ b/gnome-panel/Makefile.in
+diff -Naur gnome-panel-2.30.0.old/gnome-panel/libegg/Makefile.in gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in
+--- gnome-panel-2.30.0.old/gnome-panel/libegg/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/libegg/Makefile.in 2010-05-05 10:03:30.458499659 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -170,6 +170,8 @@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -195,6 +197,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANEL_CFLAGS = @PANEL_CFLAGS@
+ PANEL_LIBS = @PANEL_LIBS@
+diff -Naur gnome-panel-2.30.0.old/gnome-panel/libpanel-util/Makefile.in gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in
+--- gnome-panel-2.30.0.old/gnome-panel/libpanel-util/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/libpanel-util/Makefile.in 2010-05-05 10:03:30.554499783 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -55,8 +55,8 @@
+ am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
+ panel-error.lo panel-glib.lo panel-gtk.lo \
+ panel-icon-chooser.lo panel-keyfile.lo panel-launch.lo \
+- panel-list.lo panel-session-manager.lo panel-show.lo \
+- panel-xdg.lo $(am__objects_1)
++ panel-list.lo panel-power-manager.lo panel-session-manager.lo \
++ panel-show.lo panel-xdg.lo $(am__objects_1)
+ libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -172,6 +172,8 @@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -197,6 +199,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANEL_CFLAGS = @PANEL_CFLAGS@
+ PANEL_LIBS = @PANEL_LIBS@
+@@ -318,6 +321,8 @@
+ panel-launch.h \
+ panel-list.c \
+ panel-list.h \
++ panel-power-manager.c \
++ panel-power-manager.h \
+ panel-session-manager.c \
+ panel-session-manager.h \
+ panel-show.c \
+@@ -387,6 +392,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-launch.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-list.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-power-manager.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-session-manager.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-show.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-xdg.Plo at am__quote@
+diff -Naur gnome-panel-2.30.0.old/gnome-panel/Makefile.in gnome-panel-2.30.0/gnome-panel/Makefile.in
+--- gnome-panel-2.30.0.old/gnome-panel/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/gnome-panel/Makefile.in 2010-05-05 10:03:30.374499675 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,7 +36,8 @@
POST_UNINSTALL = :
build_triplet = @build@
@@ -21364,7 +21739,7 @@
$(am__objects_1)
am__objects_4 = $(am__objects_1)
am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \
-@@ -109,6 +111,21 @@
+@@ -110,6 +112,21 @@
gnome_panel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
@@ -21386,7 +21761,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -157,9 +174,10 @@
+@@ -158,9 +175,10 @@
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
@@ -21399,7 +21774,7 @@
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
-@@ -300,6 +318,8 @@
+@@ -284,6 +302,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21408,7 +21783,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -325,6 +345,7 @@
+@@ -309,6 +329,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21416,7 +21791,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-@@ -503,6 +524,8 @@
+@@ -486,6 +507,8 @@
panel-force-quit.c \
panel-lockdown.c \
panel-addto.c \
@@ -21425,7 +21800,7 @@
panel-ditem-editor.c \
$(NULL)
-@@ -549,6 +572,8 @@
+@@ -532,6 +555,8 @@
panel-force-quit.h \
panel-lockdown.h \
panel-addto.h \
@@ -21434,7 +21809,7 @@
panel-ditem-editor.h \
panel-icon-names.h \
$(NULL)
-@@ -565,6 +590,21 @@
+@@ -549,6 +574,21 @@
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
@@ -21456,7 +21831,7 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-@@ -713,6 +753,9 @@
+@@ -697,6 +737,9 @@
gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES)
@rm -f gnome-panel$(EXEEXT)
$(AM_V_CCLD)$(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
@@ -21466,7 +21841,7 @@
install-libexecSCRIPTS: $(libexec_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -761,6 +804,12 @@
+@@ -745,6 +788,12 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/button-widget.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-desktop-item-edit.Po at am__quote@
@@ -21479,7 +21854,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/launcher.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu.Po at am__quote@
-@@ -779,7 +828,9 @@
+@@ -763,7 +812,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-force-quit.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-frame.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gconf.Po at am__quote@
@@ -21489,7 +21864,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-marshal.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-bar.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-button.Po at am__quote@
-@@ -826,6 +877,102 @@
+@@ -810,6 +861,102 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -21592,9 +21967,34 @@
mostlyclean-libtool:
-rm -f *.lo
---- a/help/clock/Makefile.in
-+++ b/help/clock/Makefile.in
-@@ -179,6 +179,8 @@
+@@ -943,7 +1090,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -968,7 +1115,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/help/clock/Makefile.in gnome-panel-2.30.0/help/clock/Makefile.in
+--- gnome-panel-2.30.0.old/help/clock/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/clock/Makefile.in 2010-05-05 10:03:30.694500476 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -162,6 +162,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21603,7 +22003,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@
+@@ -187,6 +189,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21611,9 +22011,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/help/fish/Makefile.in
-+++ b/help/fish/Makefile.in
-@@ -179,6 +179,8 @@
+diff -Naur gnome-panel-2.30.0.old/help/fish/Makefile.in gnome-panel-2.30.0/help/fish/Makefile.in
+--- gnome-panel-2.30.0.old/help/fish/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/fish/Makefile.in 2010-05-05 10:03:30.778499771 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -162,6 +162,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21622,7 +22029,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@
+@@ -187,6 +189,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21630,9 +22037,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/help/Makefile.in
-+++ b/help/Makefile.in
-@@ -194,6 +194,8 @@
+diff -Naur gnome-panel-2.30.0.old/help/Makefile.in gnome-panel-2.30.0/help/Makefile.in
+--- gnome-panel-2.30.0.old/help/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/help/Makefile.in 2010-05-05 10:03:30.614500427 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -177,6 +177,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21641,7 +22055,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@
+@@ -202,6 +204,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21649,9 +22063,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/16x16/Makefile.in
-+++ b/icons/16x16/Makefile.in
-@@ -178,6 +178,8 @@
+@@ -340,7 +343,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -365,7 +368,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/icons/16x16/Makefile.in gnome-panel-2.30.0/icons/16x16/Makefile.in
+--- gnome-panel-2.30.0.old/icons/16x16/Makefile.in 2010-03-30 02:52:46.000000000 +0200
++++ gnome-panel-2.30.0/icons/16x16/Makefile.in 2010-05-05 10:03:30.838500061 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21660,7 +22099,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21668,9 +22107,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/22x22/Makefile.in
-+++ b/icons/22x22/Makefile.in
-@@ -178,6 +178,8 @@
+diff -Naur gnome-panel-2.30.0.old/icons/22x22/Makefile.in gnome-panel-2.30.0/icons/22x22/Makefile.in
+--- gnome-panel-2.30.0.old/icons/22x22/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/22x22/Makefile.in 2010-05-05 10:03:30.898499022 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21679,7 +22125,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21687,9 +22133,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/24x24/Makefile.in
-+++ b/icons/24x24/Makefile.in
-@@ -178,6 +178,8 @@
+diff -Naur gnome-panel-2.30.0.old/icons/24x24/Makefile.in gnome-panel-2.30.0/icons/24x24/Makefile.in
+--- gnome-panel-2.30.0.old/icons/24x24/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/24x24/Makefile.in 2010-05-05 10:03:30.978499339 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21698,7 +22151,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21706,9 +22159,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/32x32/Makefile.in
-+++ b/icons/32x32/Makefile.in
-@@ -178,6 +178,8 @@
+diff -Naur gnome-panel-2.30.0.old/icons/32x32/Makefile.in gnome-panel-2.30.0/icons/32x32/Makefile.in
+--- gnome-panel-2.30.0.old/icons/32x32/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/32x32/Makefile.in 2010-05-05 10:03:31.038500543 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21717,7 +22177,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21725,9 +22185,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/48x48/Makefile.in
-+++ b/icons/48x48/Makefile.in
-@@ -178,6 +178,8 @@
+diff -Naur gnome-panel-2.30.0.old/icons/48x48/Makefile.in gnome-panel-2.30.0/icons/48x48/Makefile.in
+--- gnome-panel-2.30.0.old/icons/48x48/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/48x48/Makefile.in 2010-05-05 10:03:31.098500558 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21736,7 +22203,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21744,9 +22211,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/Makefile.in
-+++ b/icons/Makefile.in
-@@ -218,6 +218,8 @@
+diff -Naur gnome-panel-2.30.0.old/icons/Makefile.in gnome-panel-2.30.0/icons/Makefile.in
+--- gnome-panel-2.30.0.old/icons/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/Makefile.in 2010-05-05 10:03:31.158501204 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -201,6 +201,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21755,7 +22229,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -243,6 +245,7 @@
+@@ -226,6 +228,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21763,9 +22237,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/icons/scalable/Makefile.in
-+++ b/icons/scalable/Makefile.in
-@@ -178,6 +178,8 @@
+@@ -393,7 +396,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -418,7 +421,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur gnome-panel-2.30.0.old/icons/scalable/Makefile.in gnome-panel-2.30.0/icons/scalable/Makefile.in
+--- gnome-panel-2.30.0.old/icons/scalable/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/icons/scalable/Makefile.in 2010-05-05 10:03:31.218500594 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21774,7 +22273,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21782,9 +22281,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/idl/Makefile.in
-+++ b/idl/Makefile.in
-@@ -178,6 +178,8 @@
+diff -Naur gnome-panel-2.30.0.old/idl/Makefile.in gnome-panel-2.30.0/idl/Makefile.in
+--- gnome-panel-2.30.0.old/idl/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/idl/Makefile.in 2010-05-05 10:03:31.274499123 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21793,7 +22299,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21801,9 +22307,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/libpanel-applet/Makefile.in
-+++ b/libpanel-applet/Makefile.in
-@@ -244,6 +244,8 @@
+diff -Naur gnome-panel-2.30.0.old/libpanel-applet/Makefile.in gnome-panel-2.30.0/libpanel-applet/Makefile.in
+--- gnome-panel-2.30.0.old/libpanel-applet/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/libpanel-applet/Makefile.in 2010-05-05 10:03:31.382499294 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -227,6 +227,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21812,7 +22325,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -269,6 +271,7 @@
+@@ -252,6 +254,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21820,26 +22333,38 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
---- a/ltmain.sh
-+++ b/ltmain.sh
+diff -Naur gnome-panel-2.30.0.old/ltmain.sh gnome-panel-2.30.0/ltmain.sh
+--- gnome-panel-2.30.0.old/ltmain.sh 2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/ltmain.sh 2010-05-05 10:03:23.597530530 +0200
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
-@@ -73,7 +73,7 @@
+@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3012
-
+-package_revision=1.3012
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@
: ${CP="cp -f"}
@@ -21920,93 +22445,30 @@
esac
;;
no)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -210,6 +210,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -235,6 +237,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANEL_CFLAGS = @PANEL_CFLAGS@
- PANEL_LIBS = @PANEL_LIBS@
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -179,6 +179,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANEL_CFLAGS = @PANEL_CFLAGS@
- PANEL_LIBS = @PANEL_LIBS@
---- a/gnome-panel/libpanel-util/Makefile.in
-+++ b/gnome-panel/libpanel-util/Makefile.in
-@@ -54,8 +54,8 @@
- am__objects_1 =
- am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
- panel-error.lo panel-glib.lo panel-keyfile.lo panel-launch.lo \
-- panel-list.lo panel-session-manager.lo panel-show.lo \
-- $(am__objects_1)
-+ panel-list.lo panel-power-manager.lo panel-session-manager.lo \
-+ panel-show.lo $(am__objects_1)
- libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -188,6 +188,8 @@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LIPO = @LIPO@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -213,6 +215,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANEL_CFLAGS = @PANEL_CFLAGS@
- PANEL_LIBS = @PANEL_LIBS@
-@@ -338,6 +341,8 @@
- panel-launch.h \
- panel-list.c \
- panel-list.h \
-+ panel-power-manager.c \
-+ panel-power-manager.h \
- panel-session-manager.c \
- panel-session-manager.h \
- panel-show.c \
-@@ -403,6 +408,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-launch.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-list.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-power-manager.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-session-manager.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-show.Plo at am__quote@
-
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
+diff -Naur gnome-panel-2.30.0.old/m4/intltool.m4 gnome-panel-2.30.0/m4/intltool.m4
+--- gnome-panel-2.30.0.old/m4/intltool.m4 2010-03-30 02:52:33.000000000 +0200
++++ gnome-panel-2.30.0/m4/intltool.m4 2010-05-05 10:03:24.381510760 +0200
+@@ -172,7 +172,7 @@
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+diff -Naur gnome-panel-2.30.0.old/m4/libtool.m4 gnome-panel-2.30.0/m4/libtool.m4
+--- gnome-panel-2.30.0.old/m4/libtool.m4 2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/m4/libtool.m4 2010-05-05 10:03:23.701503879 +0200
+@@ -2445,7 +2445,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -2485,6 +2485,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22026,7 +22488,12 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3076,7 +3088,7 @@
+@@ -3072,11 +3084,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -22035,6 +22502,15 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
+@@ -3693,7 +3705,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
@@ -3757,7 +3769,7 @@
;;
esac
@@ -22044,6 +22520,15 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3977,7 +3989,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
@@ -4182,6 +4194,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
@@ -22064,7 +22549,24 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4428,7 +4446,7 @@
+@@ -4267,6 +4285,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4358,7 +4377,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -4428,7 +4447,7 @@
fi
;;
@@ -22073,7 +22575,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4603,6 +4621,7 @@
+@@ -4603,6 +4622,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -22081,7 +22583,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4841,7 +4860,7 @@
+@@ -4841,7 +4861,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -22090,401 +22592,159 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
---- a/INSTALL
-+++ b/INSTALL
-@@ -2,15 +2,15 @@
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007 Free Software Foundation, Inc.
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
--This file is free documentation; the Free Software Foundation gives
-+ This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-
- Basic Installation
- ==================
-
--Briefly, the shell commands `./configure; make; make install' should
-+ Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
- instructions specific to this package.
-@@ -73,9 +73,9 @@
- Compilers and Options
- =====================
-
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@
- Compiling For Multiple Architectures
- ====================================
-
--You can compile the package for more than one kind of computer at the
-+ You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@
- installed the package for one architecture, use `make distclean' before
- reconfiguring for another architecture.
-
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
- Installation Names
- ==================
-
--By default, `make install' installs the package's commands under
-+ By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@
- Optional Features
- =================
-
--Some packages pay attention to `--enable-FEATURE' options to
-+ Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +152,46 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
-
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option. TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
-
-@@ -153,7 +199,8 @@
-
- where SYSTEM can have one of these forms:
-
-- OS KERNEL-OS
-+ OS
-+ KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@
- Sharing Defaults
- ================
-
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists. Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@
- Defining Variables
- ==================
-
--Variables not defined in a site shell script can be set in the
-+ Variables not defined in a site shell script can be set in the
- environment passed to `configure'. However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@
- `configure' Invocation
- ======================
-
--`configure' recognizes the following options to control how it operates.
-+ `configure' recognizes the following options to control how it
-+operates.
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -232,6 +287,16 @@
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *Note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
- `configure' also accepts some other, not widely useful, options. Run
- `configure --help' for more details.
-
---- a/config.guess
-+++ b/config.guess
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-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
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ 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}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
+@@ -5841,7 +5861,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+diff -Naur gnome-panel-2.30.0.old/m4/ltversion.m4 gnome-panel-2.30.0/m4/ltversion.m4
+--- gnome-panel-2.30.0.old/m4/ltversion.m4 2010-03-30 02:52:32.000000000 +0200
++++ gnome-panel-2.30.0/m4/ltversion.m4 2010-05-05 10:03:23.961516103 +0200
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff -Naur gnome-panel-2.30.0.old/Makefile.in gnome-panel-2.30.0/Makefile.in
+--- gnome-panel-2.30.0.old/Makefile.in 2010-03-30 02:52:48.000000000 +0200
++++ gnome-panel-2.30.0/Makefile.in 2010-05-05 10:03:31.522499556 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -193,6 +193,8 @@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -218,6 +220,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANEL_CFLAGS = @PANEL_CFLAGS@
+ PANEL_LIBS = @PANEL_LIBS@
+@@ -420,7 +423,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -445,7 +448,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -609,7 +612,8 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -652,17 +656,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
---- a/config.h.in
-+++ b/config.h.in
-@@ -135,6 +135,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
-
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
-
---- a/config.sub
-+++ b/config.sub
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
+diff -Naur gnome-panel-2.30.0.old/man/Makefile.in gnome-panel-2.30.0/man/Makefile.in
+--- gnome-panel-2.30.0.old/man/Makefile.in 2010-03-30 02:52:47.000000000 +0200
++++ gnome-panel-2.30.0/man/Makefile.in 2010-05-05 10:03:31.454501176 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -162,6 +162,8 @@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -187,6 +189,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANEL_CFLAGS = @PANEL_CFLAGS@
+ PANEL_LIBS = @PANEL_LIBS@
+diff -Naur gnome-panel-2.30.0.old/po/Makefile.in.in gnome-panel-2.30.0/po/Makefile.in.in
+--- gnome-panel-2.30.0.old/po/Makefile.in.in 2010-03-30 02:52:33.000000000 +0200
++++ gnome-panel-2.30.0/po/Makefile.in.in 2010-05-05 10:03:24.350529731 +0200
+@@ -56,7 +56,7 @@
+
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+ USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+@@ -129,7 +129,7 @@
+ done
+
+ # Empty stubs to satisfy archaic automake needs
+-dvi info tags TAGS ID:
++dvi info ctags tags CTAGS TAGS ID:
+
+ # Define this as empty until I found a useful application.
+ install-exec installcheck:
Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=24254&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Wed May 5 08:05:04 2010
@@ -5,7 +5,5 @@
06_clock_permissions.patch
08_clock_applet_event.patch
09_default_icons.patch
-10_clock_applet_link_gnome_desktop.patch
-30_xrandr_crashes.patch
70_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list