r15699 - in /desktop/experimental/gnome-applets/debian: changelog control control.in patches/98_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Apr 19 19:02:40 UTC 2008
Author: slomo
Date: Sat Apr 19 19:02:40 2008
New Revision: 15699
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15699
Log:
New upstream bugfix release:
+ debian/control.in:
- Update build dependencies.
+ debian/patches/98_autoreconf.patch:
- Updated to apply cleanly again.
Modified:
desktop/experimental/gnome-applets/debian/changelog
desktop/experimental/gnome-applets/debian/control
desktop/experimental/gnome-applets/debian/control.in
desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=15699&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog (original)
+++ desktop/experimental/gnome-applets/debian/changelog Sat Apr 19 19:02:40 2008
@@ -1,3 +1,13 @@
+gnome-applets (2.22.1-1) experimental; urgency=low
+
+ * New upstream bugfix release:
+ + debian/control.in:
+ - Update build dependencies.
+ + debian/patches/98_autoreconf.patch:
+ - Updated to apply cleanly again.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 19 Apr 2008 20:54:49 +0200
+
gnome-applets (2.22.0-1) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=15699&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control (original)
+++ desktop/experimental/gnome-applets/debian/control Sat Apr 19 19:02:40 2008
@@ -22,7 +22,7 @@
libglade2-dev (>= 1:2.5.1-1),
libgail-dev (>= 1.1.0),
libwnck-dev (>= 2.9.3),
- libgweather-dev (>= 2.21.1),
+ libgweather-dev (>= 2.22.1),
system-tools-backends-dev (>= 1.1.3),
libgnome-desktop-dev (>= 2.11.1),
libnotify-dev (>= 0.3.2),
@@ -51,7 +51,6 @@
sharutils,
libxres-dev,
python-support (>= 0.4),
- libxml2-dev (>= 2.5.0),
libgnomekbdui-dev (>= 2.21.4.1),
liboobs-1-dev,
po-debconf
Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=15699&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in (original)
+++ desktop/experimental/gnome-applets/debian/control.in Sat Apr 19 19:02:40 2008
@@ -22,7 +22,7 @@
libglade2-dev (>= 1:2.5.1-1),
libgail-dev (>= 1.1.0),
libwnck-dev (>= 2.9.3),
- libgweather-dev (>= 2.21.1),
+ libgweather-dev (>= 2.22.1),
system-tools-backends-dev (>= 1.1.3),
libgnome-desktop-dev (>= 2.11.1),
libnotify-dev (>= 0.3.2),
@@ -51,7 +51,6 @@
sharutils,
libxres-dev,
python-support (>= 0.4),
- libxml2-dev (>= 2.5.0),
libgnomekbdui-dev (>= 2.21.4.1),
liboobs-1-dev,
po-debconf
Modified: desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch?rev=15699&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch Sat Apr 19 19:02:40 2008
@@ -1,6 +1,6 @@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/docs/Makefile.in gnome-applets-2.22.0/accessx-status/docs/Makefile.in
---- gnome-applets-2.22.0.old/accessx-status/docs/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/docs/Makefile.in 2008-03-17 21:34:22.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/accessx-status/docs/Makefile.in gnome-applets-2.22.1/accessx-status/docs/Makefile.in
+--- gnome-applets-2.22.1.old/accessx-status/docs/Makefile.in 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/accessx-status/docs/Makefile.in 2008-04-19 20:59:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -12,99 +12,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -821,6 +824,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -870,8 +878,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -889,6 +897,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -956,7 +970,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/Makefile.in gnome-applets-2.22.0/accessx-status/Makefile.in
---- gnome-applets-2.22.0.old/accessx-status/Makefile.in 2008-03-10 06:54:34.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/Makefile.in 2008-03-17 21:34:22.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/accessx-status/Makefile.in gnome-applets-2.22.1/accessx-status/Makefile.in
+--- gnome-applets-2.22.1.old/accessx-status/Makefile.in 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/accessx-status/Makefile.in 2008-04-19 20:59:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -116,15 +50,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -57,7 +56,7 @@
+@@ -57,7 +57,7 @@
am__DEPENDENCIES_1 =
accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -133,44 +59,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -124,7 +123,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -126,6 +126,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -232,10 +233,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -237,6 +238,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -263,11 +267,10 @@
+@@ -264,6 +266,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -402,8 +405,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -401,8 +404,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -181,7 +94,7 @@
else :; fi; \
done
-@@ -569,8 +572,8 @@
+@@ -568,8 +571,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -192,7 +105,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -595,8 +598,8 @@
+@@ -594,8 +597,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -203,7 +116,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -606,13 +609,12 @@
+@@ -605,13 +608,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -219,9 +132,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.0/accessx-status/pixmaps/Makefile.in
---- gnome-applets-2.22.0.old/accessx-status/pixmaps/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/pixmaps/Makefile.in 2008-03-17 21:34:23.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.1/accessx-status/pixmaps/Makefile.in
+--- gnome-applets-2.22.1.old/accessx-status/pixmaps/Makefile.in 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/accessx-status/pixmaps/Makefile.in 2008-04-19 20:59:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -233,54 +146,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -90,7 +89,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -92,6 +92,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -198,10 +199,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -203,6 +204,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -229,11 +233,10 @@
+@@ -230,6 +232,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/aclocal.m4 gnome-applets-2.22.0/aclocal.m4
---- gnome-applets-2.22.0.old/aclocal.m4 2008-03-10 06:54:25.000000000 +0100
-+++ gnome-applets-2.22.0/aclocal.m4 2008-03-17 21:34:11.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/aclocal.m4 gnome-applets-2.22.1/aclocal.m4
+--- gnome-applets-2.22.1.old/aclocal.m4 2008-04-08 00:16:17.000000000 +0200
++++ gnome-applets-2.22.1/aclocal.m4 2008-04-19 20:59:33.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -295,8 +187,8 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
--m4_if(m4_PACKAGE_VERSION, [2.60],,
--[m4_fatal([this file was generated for autoconf 2.60.
+-m4_if(m4_PACKAGE_VERSION, [2.61],,
+-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
@@ -1392,7 +1284,7 @@
-# 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 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
-# serial 4
@@ -9016,7 +8908,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4487,3770 +4831,3690 @@
+@@ -4487,3767 +4831,3687 @@
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -11291,6 +11183,9 @@
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+ break
@@ -11309,11 +11204,11 @@
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
@@ -11321,8 +11216,8 @@
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+ # C++ specific cases for pic, static, wl, etc.
@@ -11330,8 +11225,8 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
@@ -11614,8 +11509,8 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
@@ -11625,8 +11520,8 @@
+ fi
+ ;;
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
@@ -11634,14 +11529,14 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
@@ -11651,23 +11546,23 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
@@ -11675,16 +11570,17 @@
+ enable_shared=no
+ ;;
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
@@ -11698,9 +11594,10 @@
+ esac
+ ;;
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
@@ -11728,10 +11625,8 @@
+ esac
+ ;;
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
@@ -11739,8 +11634,9 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+ hpux9* | hpux10* | hpux11*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
@@ -11757,26 +11653,26 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+ irix5* | irix6* | nonstopux*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC (with -KPIC) is the default.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+ newsos6)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
@@ -11815,24 +11711,23 @@
+ esac
+ ;;
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+ osf3* | osf4* | osf5*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All OSF/1 code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ rdos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ solaris*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -11844,24 +11739,24 @@
+ esac
+ ;;
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ sunos4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
@@ -11869,30 +11764,30 @@
+ fi
+ ;;
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ unicos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
@@ -11901,8 +11796,9 @@
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
+#
+# Check to make sure the PIC flag actually works.
+#
@@ -11927,9 +11823,7 @@
+ ;;
+esac
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
+-__EOF__
+#
+# Check to make sure the static flag actually works.
+#
@@ -11941,9 +11835,19 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
--__EOF__
-
-ifelse([$1],[], [
+- case $host_os in
+- aix3*)
+- cat <<\EOF >> "$cfgfile"
+
+-# AIX sometimes has problems with the GCC collect2 program. For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+-fi
+-EOF
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
@@ -11952,18 +11856,7 @@
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-- aix3*)
-- cat <<\EOF >> "$cfgfile"
--
--# AIX sometimes has problems with the GCC collect2 program. For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
-- COLLECT_NAMES=
-- export COLLECT_NAMES
--fi
--EOF
++ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -13378,30 +13271,11 @@
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- else
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-- fi
-- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- esac
-- ;;
+ fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-- mingw* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-- ;;
++
+#
+# Do we need to explicitly link libc?
+#
@@ -13409,26 +13283,12 @@
+x|xyes)
+ # Assume -lc should be added
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-- hpux9* | hpux10* | hpux11*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-- ;;
-- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_AC_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
- ;;
++ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
@@ -13436,11 +13296,7 @@
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- irix5* | irix6* | nonstopux*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC (with -KPIC) is the default.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
@@ -13462,43 +13318,49 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+ else
+ else
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ cat conftest.err 1>&5
-+ fi
+ fi
+ $rm conftest*
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
;;
+- darwin*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- case $cc_basename in
+- xlc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- ;;
+- esac
+- ;;
+ esac
+ fi
+ ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
-- newsos6)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- mingw* | pw32* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-- linux*)
-- case $cc_basename in
-- icc* | ecc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- ;;
-- pgcc* | pgf77* | pgf90* | pgf95*)
-- # Portland Group compilers (*not* the Pentium gcc compiler,
-- # which looks to be a dead project)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-- ccc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All Alpha code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
+- hpux9* | hpux10* | hpux11*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+- ;;
- esac
+- # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
+# _LT_AC_FILE_LTDLL_C
+# -------------------
@@ -13538,17 +13400,56 @@
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
-+
-+
+
+- irix5* | irix6* | nonstopux*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC (with -KPIC) is the default.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+
+- newsos6)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+- linux*)
+- case $cc_basename in
+- icc* | ecc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
+- # Portland Group compilers (*not* the Pentium gcc compiler,
+- # which looks to be a dead project)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+- ccc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All Alpha code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+- esac
+- ;;
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -13560,26 +13461,12 @@
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
- sunos4*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-
-- sysv4 | sysv4.2uw2* | sysv4.3*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
+AC_DEFUN([LT_AC_PROG_GCJ],
@@ -13588,32 +13475,33 @@
+ AC_SUBST(GCJFLAGS)
+])
+- sysv4 | sysv4.2uw2* | sysv4.3*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
+
- sysv4*MP*)
- if test -d /usr/nec ;then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
- unicos*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- ;;
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-- uts4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
+# _AS_TEST_PREPARE
+# ----------------
@@ -13626,10 +13514,10 @@
+fi
+])])# _AS_TEST_PREPARE
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- uts4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-- esac
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
@@ -13638,7 +13526,11 @@
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
-+
+
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- ;;
+- esac
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
@@ -13840,6 +13732,16 @@
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-#
-# Check to make sure the static flag actually works.
@@ -13851,18 +13753,10 @@
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
++$$1_PKG_ERRORS
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
@@ -13947,14 +13841,22 @@
- with_gnu_ld=no
- ;;
- esac
-+$$1_PKG_ERRORS
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
@@ -13977,14 +13879,6 @@
- *) supports_anon_versioning=yes ;;
- esac
+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
- # See if GNU ld supports shared libraries.
- case $host_os in
@@ -13993,13 +13887,6 @@
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+_PKG_TEXT
-
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support. If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
@@ -14010,19 +13897,20 @@
+fi[]dnl
+])# PKG_CHECK_MODULES
--EOF
-- fi
-- ;;
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 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.
-- amigaos*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-EOF
+- fi
+- ;;
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -14036,6 +13924,17 @@
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+- amigaos*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
@@ -14044,12 +13943,15 @@
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14061,15 +13963,7 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -14079,8 +13973,6 @@
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -15516,11 +15408,15 @@
+ am_display_PYTHON=$am_cv_pathless_PYTHON
+ fi
+ ])
-
++
+ if test "$PYTHON" = :; then
+ dnl Run any user-specified action, or abort.
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+ else
+
++ dnl Query Python for its version number. Getting [:3] seems to be
++ dnl the best way to do this; it's what "site.py" does in the standard
++ dnl library.
-# _LT_AC_FILE_LTDLL_C
-# -------------------
@@ -15560,24 +15456,23 @@
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-+ dnl Query Python for its version number. Getting [:3] seems to be
-+ dnl the best way to do this; it's what "site.py" does in the standard
-+ dnl library.
-
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+ [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
--# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
--# ---------------------------------
--AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+ dnl Use the values of $prefix and $exec_prefix for the corresponding
+ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
+ dnl distinct variables so they can be overridden if need be. However,
+ dnl general consensus is that you shouldn't need this ability.
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+
++ dnl At times (like when building shared libraries) you may want
++ dnl to know which OS platform Python thinks this is.
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
@@ -15587,25 +15482,35 @@
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+ dnl At times (like when building shared libraries) you may want
-+ dnl to know which OS platform Python thinks this is.
-
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
+ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+ [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
+ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
-])
++ dnl Set up 4 directories:
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-+ dnl Set up 4 directories:
++ dnl pythondir -- where to install python scripts. This is the
++ dnl site-packages directory, not the python standard library
++ dnl directory like in previous automake betas. This behavior
++ dnl is more consistent with lispdir.m4 for example.
++ dnl Query distutils for this directory. distutils does not exist in
++ dnl Python 1.5, so we fall back to the hardcoded directory if it
++ dnl doesn't work.
++ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
++ [am_cv_python_pythondir],
++ [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
++ AC_SUBST([pythondir], [$am_cv_python_pythondir])
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
@@ -15646,19 +15551,6 @@
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
-+ dnl pythondir -- where to install python scripts. This is the
-+ dnl site-packages directory, not the python standard library
-+ dnl directory like in previous automake betas. This behavior
-+ dnl is more consistent with lispdir.m4 for example.
-+ dnl Query distutils for this directory. distutils does not exist in
-+ dnl Python 1.5, so we fall back to the hardcoded directory if it
-+ dnl doesn't work.
-+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-+ [am_cv_python_pythondir],
-+ [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
-+
+ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
+ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
+ dnl more consistent with the rest of automake.
@@ -16026,7 +15918,8 @@
-_PKG_TEXT
-])],
-- [$4])
+- [AC_MSG_RESULT([no])
+- $4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
@@ -16067,13 +15960,9 @@
m4_include([m4/ac-define-dir.m4])
m4_include([m4/acinclude.m4])
- m4_include([m4/gnome-doc-utils.m4])
- m4_include([m4/intltool.m4])
- m4_include([m4/python.m4])
--m4_include([m4/system-tools-backends.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/apmlib/Makefile.in gnome-applets-2.22.0/battstat/apmlib/Makefile.in
---- gnome-applets-2.22.0.old/battstat/apmlib/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/apmlib/Makefile.in 2008-03-17 21:34:24.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/battstat/apmlib/Makefile.in gnome-applets-2.22.1/battstat/apmlib/Makefile.in
+--- gnome-applets-2.22.1.old/battstat/apmlib/Makefile.in 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/battstat/apmlib/Makefile.in 2008-04-19 20:59:43.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16085,15 +15974,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -44,7 +44,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -57,7 +56,7 @@
+@@ -57,7 +57,7 @@
libapm_a_LIBADD =
am_libapm_a_OBJECTS = apmlib.$(OBJEXT)
libapm_a_OBJECTS = $(am_libapm_a_OBJECTS)
@@ -16102,44 +15983,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -105,7 +104,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -107,6 +107,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -213,10 +214,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -218,6 +219,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -244,11 +248,10 @@
+@@ -245,6 +247,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -410,8 +413,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -409,8 +412,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16150,7 +16018,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -423,8 +426,8 @@
+@@ -422,8 +425,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16161,7 +16029,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -434,13 +437,12 @@
+@@ -433,13 +436,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -16177,9 +16045,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/docs/Makefile.in gnome-applets-2.22.0/battstat/docs/Makefile.in
---- gnome-applets-2.22.0.old/battstat/docs/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/docs/Makefile.in 2008-03-17 21:34:24.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/battstat/docs/Makefile.in gnome-applets-2.22.1/battstat/docs/Makefile.in
+--- gnome-applets-2.22.1.old/battstat/docs/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/battstat/docs/Makefile.in 2008-04-19 20:59:43.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16191,99 +16059,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -815,6 +818,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -864,8 +872,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -883,6 +891,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -950,7 +964,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/Makefile.in gnome-applets-2.22.0/battstat/Makefile.in
---- gnome-applets-2.22.0.old/battstat/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/Makefile.in 2008-03-17 21:34:23.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/battstat/Makefile.in gnome-applets-2.22.1/battstat/Makefile.in
+--- gnome-applets-2.22.1.old/battstat/Makefile.in 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/battstat/Makefile.in 2008-04-19 20:59:43.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16295,15 +16097,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -63,7 +62,7 @@
+@@ -63,7 +63,7 @@
battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
@@ -16312,44 +16106,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -131,7 +130,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -133,6 +133,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -239,10 +240,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -244,6 +245,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -270,11 +274,10 @@
+@@ -271,6 +273,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -445,8 +448,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -444,8 +447,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -16360,7 +16141,7 @@
else :; fi; \
done
-@@ -651,8 +654,8 @@
+@@ -650,8 +653,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16371,7 +16152,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -677,8 +680,8 @@
+@@ -676,8 +679,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16382,7 +16163,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -688,13 +691,12 @@
+@@ -687,13 +690,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -16398,9 +16179,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/sounds/Makefile.in gnome-applets-2.22.0/battstat/sounds/Makefile.in
---- gnome-applets-2.22.0.old/battstat/sounds/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/sounds/Makefile.in 2008-03-17 21:34:24.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/battstat/sounds/Makefile.in gnome-applets-2.22.1/battstat/sounds/Makefile.in
+--- gnome-applets-2.22.1.old/battstat/sounds/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/battstat/sounds/Makefile.in 2008-04-19 20:59:44.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16412,54 +16193,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -88,7 +87,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -90,6 +90,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -196,10 +197,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -201,6 +202,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -227,11 +231,10 @@
+@@ -228,6 +230,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/charpick/help/Makefile.in gnome-applets-2.22.0/charpick/help/Makefile.in
---- gnome-applets-2.22.0.old/charpick/help/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/charpick/help/Makefile.in 2008-03-17 21:34:25.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/charpick/help/Makefile.in gnome-applets-2.22.1/charpick/help/Makefile.in
+--- gnome-applets-2.22.1.old/charpick/help/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/charpick/help/Makefile.in 2008-04-19 20:59:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16471,99 +16231,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -814,6 +817,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -863,8 +871,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -882,6 +890,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -949,7 +963,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/charpick/Makefile.in gnome-applets-2.22.0/charpick/Makefile.in
---- gnome-applets-2.22.0.old/charpick/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/charpick/Makefile.in 2008-03-17 21:34:24.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/charpick/Makefile.in gnome-applets-2.22.1/charpick/Makefile.in
+--- gnome-applets-2.22.1.old/charpick/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/charpick/Makefile.in 2008-04-19 20:59:44.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16575,15 +16269,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -57,7 +56,7 @@
+@@ -57,7 +57,7 @@
am__DEPENDENCIES_1 =
charpick_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -16592,44 +16278,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -127,7 +126,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -129,6 +129,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -235,10 +236,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -240,6 +241,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -266,11 +270,10 @@
+@@ -267,6 +269,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -417,8 +420,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -416,8 +419,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -16640,7 +16313,7 @@
else :; fi; \
done
-@@ -619,8 +622,8 @@
+@@ -618,8 +621,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16651,7 +16324,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -645,8 +648,8 @@
+@@ -644,8 +647,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16662,7 +16335,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -656,13 +659,12 @@
+@@ -655,13 +658,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -16678,218 +16351,10 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/config.h.in gnome-applets-2.22.0/config.h.in
---- gnome-applets-2.22.0.old/config.h.in 2008-03-10 06:54:29.000000000 +0100
-+++ gnome-applets-2.22.0/config.h.in 2008-03-17 21:34:20.000000000 +0100
-@@ -135,15 +135,9 @@
- /* install prefix */
- #undef PREFIX
-
--/* System tools backends */
--#undef STB_SCRIPTS_DIR
--
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-
--/* su executable path */
--#undef SU_PATH
--
- /* sysconfdir */
- #undef SYSCONFDIR
-
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/configure gnome-applets-2.22.0/configure
---- gnome-applets-2.22.0.old/configure 2008-03-10 06:54:29.000000000 +0100
-+++ gnome-applets-2.22.0/configure 2008-03-17 21:34:19.000000000 +0100
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gnome-applets 2.22.0.
-+# Generated by GNU Autoconf 2.61 for gnome-applets 2.22.0.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -10,7 +10,8 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-@@ -19,10 +20,13 @@
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
- else
-- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-
-
- # PATH needs CR
-@@ -215,7 +219,7 @@
- else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-@@ -233,7 +237,6 @@
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-@@ -242,10 +245,12 @@
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
- else
-- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-
- :
- _ASEOF
-@@ -253,7 +258,6 @@
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-@@ -262,10 +266,12 @@
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
- else
-- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-
- :
- (as_func_return () {
-@@ -512,19 +518,28 @@
- as_mkdir_p=false
- fi
-
--# Find out whether ``test -x'' works. Don't use a zero-byte file, as
--# systems may use methods other than mode bits to determine executability.
--cat >conf$$.file <<_ASEOF
--#! /bin/sh
--exit 0
--_ASEOF
--chmod +x conf$$.file
--if test -x conf$$.file >/dev/null 2>&1; then
-- as_executable_p="test -x"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
- else
-- as_executable_p=:
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
- fi
--rm -f conf$$.file
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -718,36 +733,36 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
--#if HAVE_STDINT_H
-+#ifdef HAVE_STDINT_H
- # include <stdint.h>
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
-@@ -832,6 +847,9 @@
- INTLTOOL_THEME_RULE
- INTLTOOL_SERVICE_RULE
- INTLTOOL_POLICY_RULE
-+XGETTEXT
-+MSGMERGE
-+MSGFMT
- INTLTOOL_EXTRACT
- INTLTOOL_MERGE
- INTLTOOL_UPDATE
-@@ -866,10 +884,13 @@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/configure gnome-applets-2.22.1/configure
+--- gnome-applets-2.22.1.old/configure 2008-04-08 00:16:21.000000000 +0200
++++ gnome-applets-2.22.1/configure 2008-04-19 20:59:40.000000000 +0200
+@@ -884,10 +884,13 @@
host_cpu
host_vendor
host_os
@@ -16903,1102 +16368,7 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -964,10 +985,8 @@
- GETTEXT_PACKAGE
- GNOMELOCALEDIR
- USE_NLS
--MSGFMT
- MSGFMT_OPTS
- GMSGFMT
--XGETTEXT
- CATALOGS
- CATOBJEXT
- GMOFILES
-@@ -984,6 +1003,7 @@
- DOC_USER_FORMATS
- ENABLE_SK_TRUE
- ENABLE_SK_FALSE
-+DISTCHECK_CONFIGURE_FLAGS
- HAVE_GNOME_DOC_UTILS_TRUE
- HAVE_GNOME_DOC_UTILS_FALSE
- ENABLE_FLAGS_TRUE
-@@ -1012,8 +1032,7 @@
- HAVE_XKB
- APPLET_ACCESSX_TRUE
- APPLET_ACCESSX_FALSE
--SU_TOOL
--STB_SCRIPTS_DIR
-+MODEMLIGHTS_CFLAGS
- MODEMLIGHTS_LIBS
- APPLET_MODEMLIGHTS_TRUE
- APPLET_MODEMLIGHTS_FALSE
-@@ -1051,6 +1070,7 @@
- CC
- CFLAGS
- LDFLAGS
-+LIBS
- CPPFLAGS
- PKG_CONFIG
- CPP
-@@ -1104,7 +1124,9 @@
- LIBGWEATHER_CFLAGS
- LIBGWEATHER_LIBS
- MIXER_CFLAGS
--MIXER_LIBS'
-+MIXER_LIBS
-+MODEMLIGHTS_CFLAGS
-+MODEMLIGHTS_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1210,10 +1232,10 @@
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
-@@ -1229,10 +1251,10 @@
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1426,19 +1448,19 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
-
- --x)
-@@ -1739,6 +1761,7 @@
- CFLAGS C compiler flags
- 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>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- PKG_CONFIG path to pkg-config utility
-@@ -1824,6 +1847,10 @@
- MIXER_CFLAGS
- C compiler flags for MIXER, overriding pkg-config
- MIXER_LIBS linker flags for MIXER, overriding pkg-config
-+ MODEMLIGHTS_CFLAGS
-+ C compiler flags for MODEMLIGHTS, overriding pkg-config
-+ MODEMLIGHTS_LIBS
-+ linker flags for MODEMLIGHTS, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1889,7 +1916,7 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- gnome-applets configure 2.22.0
--generated by GNU Autoconf 2.60
-+generated by GNU Autoconf 2.61
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1903,7 +1930,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by gnome-applets $as_me 2.22.0, which was
--generated by GNU Autoconf 2.60. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
-@@ -2328,7 +2355,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -2456,7 +2483,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
-@@ -2509,7 +2536,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2648,7 +2675,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2688,7 +2715,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2742,14 +2769,6 @@
-
-
-
--case m4 in
-- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;;
-- *) ac_macro_dir=$srcdir/m4 ;;
--esac
--test -d "$ac_macro_dir" ||
-- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
--echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
-- { (exit 1); exit 1; }; }
-
-
- GTK_REQUIRED=2.11.0
-@@ -2766,6 +2785,7 @@
- LIBGAIL_REQUIRED=1.1.0
- LIBXKLAVIER_REQUIRED=2.91
- LIBWNCK_REQUIRED=2.9.3
-+LIBOOBS_REQUIRED=0.2.0
- SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
- LIBGNOME_DESKTOP_REQUIRED=2.11.1
- LIBNOTIFY_REQUIRED=0.3.2
-@@ -2886,7 +2906,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2926,7 +2946,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2983,7 +3003,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3024,7 +3044,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -3082,7 +3102,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3126,7 +3146,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3267,7 +3287,7 @@
- # in a Makefile. We should not override ac_cv_exeext if it was cached,
- # so that the user can short-circuit this test for compilers unknown to
- # Autoconf.
--for ac_file in $ac_files
-+for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-@@ -3295,6 +3315,12 @@
- test "$ac_cv_exeext" = no && ac_cv_exeext=
-
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -3306,8 +3332,6 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
-@@ -3485,27 +3509,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3560,27 +3567,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3615,27 +3605,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3671,27 +3644,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3807,27 +3763,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
-@@ -4040,6 +3979,141 @@
-
-
-
-+# 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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $XGETTEXT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+XGETTEXT=$ac_cv_path_XGETTEXT
-+if test -n "$XGETTEXT"; then
-+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MSGMERGE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+MSGMERGE=$ac_cv_path_MSGMERGE
-+if test -n "$MSGMERGE"; then
-+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+echo "${ECHO_T}$MSGMERGE" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_MSGFMT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+MSGFMT=$ac_cv_path_MSGFMT
-+if test -n "$MSGFMT"; then
-+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
- # Use the tools built into the package, not the ones that are installed.
- INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
-@@ -4066,7 +4140,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4146,27 +4220,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- DATADIRNAME=share
- else
- echo "$as_me: failed program was:" >&5
-@@ -4237,27 +4295,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_bind_textdomain_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4266,7 +4308,7 @@
- ac_cv_func_bind_textdomain_codeset=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -4284,7 +4326,7 @@
- esac
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-
-@@ -4318,7 +4360,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4361,7 +4403,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4439,7 +4481,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4479,7 +4521,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4536,7 +4578,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4577,7 +4619,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -4635,7 +4677,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4679,7 +4721,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4799,27 +4841,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4874,27 +4899,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -4929,27 +4937,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -4985,27 +4976,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5121,27 +5095,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
-@@ -5334,27 +5291,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_search_strerror=$ac_res
- else
- echo "$as_me: failed program was:" >&5
-@@ -5363,7 +5304,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then
- break
-@@ -5437,17 +5378,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -5481,17 +5415,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -5556,17 +5483,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -5600,17 +5520,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -5665,7 +5578,7 @@
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
-@@ -5747,7 +5660,7 @@
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5843,27 +5756,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6166,12 +6062,13 @@
+@@ -6045,12 +6048,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18013,7 +16383,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6206,6 +6103,7 @@
+@@ -6085,6 +6089,7 @@
fi
SED=$lt_cv_path_SED
@@ -18021,7 +16391,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6405,8 +6303,8 @@
+@@ -6284,8 +6289,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -18032,7 +16402,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6425,7 +6323,7 @@
+@@ -6304,7 +6309,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -18041,7 +16411,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6447,16 +6345,22 @@
+@@ -6326,16 +6331,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -18068,7 +16438,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6494,7 +6398,7 @@
+@@ -6373,7 +6384,7 @@
esac
;;
@@ -18077,7 +16447,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -6510,11 +6414,11 @@
+@@ -6389,11 +6400,11 @@
;;
# This must be Linux ELF.
@@ -18091,7 +16461,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
-@@ -6544,6 +6448,10 @@
+@@ -6423,6 +6434,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -18102,16 +16472,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6630,7 +6538,7 @@
+@@ -6509,7 +6524,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6633 "configure"' > conftest.$ac_ext
-+ echo '#line 6541 "configure"' > conftest.$ac_ext
+- echo '#line 6512 "configure"' > conftest.$ac_ext
++ echo '#line 6527 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6665,7 +6573,8 @@
+@@ -6544,7 +6559,8 @@
rm -rf conftest*
;;
@@ -18121,7 +16491,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6676,6 +6585,9 @@
+@@ -6555,6 +6571,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -18131,7 +16501,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6692,6 +6604,9 @@
+@@ -6571,6 +6590,9 @@
;;
*64-bit*)
case $host in
@@ -18141,49 +16511,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6754,27 +6669,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -6783,7 +6682,7 @@
- lt_cv_cc_needs_belf=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -6811,7 +6710,11 @@
+@@ -6674,7 +6696,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -18196,427 +16524,7 @@
esac
;;
esac
-@@ -6867,27 +6770,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -6950,27 +6836,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7006,17 +6875,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7103,7 +6965,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -7147,7 +7009,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -7260,27 +7122,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7335,27 +7180,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7390,27 +7218,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -7446,27 +7257,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -7668,17 +7462,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -7712,17 +7499,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -7787,17 +7567,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -7831,17 +7604,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # Broken: success on invalid input.
- continue
- else
-@@ -7882,7 +7648,7 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -7900,7 +7666,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -7926,7 +7692,7 @@
- fi
- if test -z "$F77"; then
- ac_ct_F77=$F77
-- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -7944,7 +7710,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8051,27 +7817,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_f77_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8114,27 +7863,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_f77_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_prog_f77_g=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -8174,7 +7906,6 @@
+@@ -7866,7 +7892,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -18624,7 +16532,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -8261,24 +7992,27 @@
+@@ -7953,24 +7978,27 @@
fi
;;
*)
@@ -18669,7 +16577,7 @@
;;
esac
-@@ -8295,6 +8029,7 @@
+@@ -7987,6 +8015,7 @@
@@ -18677,7 +16585,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8332,7 +8067,7 @@
+@@ -8024,7 +8053,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -18686,7 +16594,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8485,7 +8220,7 @@
+@@ -8177,7 +8206,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -18695,61 +16603,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8589,7 +8324,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8629,7 +8364,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8685,7 +8420,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8725,7 +8460,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8781,7 +8516,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8821,7 +8556,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8883,7 +8618,7 @@
+@@ -8575,7 +8604,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -18758,20 +16612,11 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -9045,89 +8780,401 @@
+@@ -8737,6 +8766,318 @@
;;
esac
--enable_dlopen=no
--enable_win32_dll=no
--
--# Check whether --enable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
-- enableval=$enable_libtool_lock;
--fi
--
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
++
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
@@ -18799,53 +16644,19 @@
+done
+done
+IFS=$as_save_IFS
-
--# Check whether --with-pic was given.
--if test "${with_pic+set}" = set; then
-- withval=$with_pic; pic_mode="$withval"
++
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
- else
-- pic_mode=default
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
-
--test -z "$pic_mode" && pic_mode=default
--
--# Use C for the default configuration in the libtool script
--tagname=
--lt_save_CC="$CC"
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--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
--
--
--# Source file extension for C test sources.
--ac_ext=c
--
--# Object file extension for compiled C test sources.
--objext=o
--objext=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
--
-
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
--
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++fi
++
++
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
@@ -18873,9 +16684,7 @@
+done
+done
+IFS=$as_save_IFS
-
--# Allow CC to be a program name with arguments.
--compiler=$CC
++
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
@@ -18886,7 +16695,7 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-
++
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
@@ -18905,13 +16714,7 @@
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
-
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_compiler_boilerplate=`cat conftest.err`
--$rm conftest*
++
+ 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
@@ -18937,12 +16740,7 @@
+done
+done
+IFS=$as_save_IFS
-
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
++
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
@@ -18953,8 +16751,8 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-
-
++
++
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
@@ -18982,8 +16780,7 @@
+done
+done
+IFS=$as_save_IFS
-
--lt_prog_compiler_no_builtin_flag=
++
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
@@ -18994,9 +16791,7 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-
--if test "$GCC" = yes; then
-- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
@@ -19015,19 +16810,13 @@
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
-
-
--{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++
++
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- lt_cv_prog_compiler_rtti_exceptions=no
-- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
@@ -19139,107 +16928,66 @@
+ esac
+
+
-+enable_dlopen=no
-+enable_win32_dll=no
-+
-+# Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+ enableval=$enable_libtool_lock;
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+
-+# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then
-+ withval=$with_pic; pic_mode="$withval"
-+else
-+ pic_mode=default
-+fi
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
-+
-+# Code to be used in simple compile tests
+ enable_dlopen=no
+ enable_win32_dll=no
+
+@@ -8775,10 +9116,10 @@
+ objext=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
+
+
+ # If no C compiler was specified, use CC.
+@@ -8793,16 +9134,16 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
+$rm -r conftest*
-+
-+
-+
-+lt_prog_compiler_no_builtin_flag=
-+
-+if test "$GCC" = yes; then
-+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-+
-+
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_rtti_exceptions=no
-+ ac_outfile=conftest.$ac_objext
+
+
+
+@@ -8819,7 +9160,7 @@
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9138,11 +9185,11 @@
+@@ -8830,11 +9171,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:9141: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9188: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8833: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9145: \$? = $ac_status" >&5
-+ echo "$as_me:9192: \$? = $ac_status" >&5
+- echo "$as_me:8837: \$? = $ac_status" >&5
++ echo "$as_me:9178: \$? = $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.
-@@ -9193,13 +9240,15 @@
+@@ -8885,13 +9226,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -19257,7 +17005,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -9209,7 +9258,7 @@
+@@ -8901,7 +9244,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -19266,7 +17014,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9267,7 +9316,7 @@
+@@ -8959,7 +9302,7 @@
esac
;;
@@ -19275,7 +17023,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9300,7 +9349,7 @@
+@@ -8992,7 +9335,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -19284,7 +17032,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9319,6 +9368,22 @@
+@@ -9011,6 +9354,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -19307,7 +17055,7 @@
esac
;;
-@@ -9328,6 +9393,10 @@
+@@ -9020,6 +9379,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -19318,7 +17066,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9390,12 +9459,12 @@
+@@ -9082,12 +9445,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -19334,17 +17082,17 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9406,27 +9475,27 @@
+@@ -9098,27 +9461,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9409: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9478: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9101: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9464: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9413: \$? = $ac_status" >&5
-+ echo "$as_me:9482: \$? = $ac_status" >&5
+- echo "$as_me:9105: \$? = $ac_status" >&5
++ echo "$as_me:9468: \$? = $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.
@@ -19368,7 +17116,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9453,13 +9522,13 @@
+@@ -9145,13 +9508,13 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -19385,7 +17133,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9469,20 +9538,20 @@
+@@ -9161,20 +9524,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -19412,7 +17160,7 @@
:
else
lt_prog_compiler_static=
-@@ -9499,7 +9568,7 @@
+@@ -9191,7 +9554,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -19421,21 +17169,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9510,11 +9579,11 @@
+@@ -9202,11 +9565,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:9513: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9582: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9517: \$? = $ac_status" >&5
-+ echo "$as_me:9586: \$? = $ac_status" >&5
+- echo "$as_me:9209: \$? = $ac_status" >&5
++ echo "$as_me:9572: \$? = $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
-@@ -9594,12 +9663,13 @@
+@@ -9286,12 +9649,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -19450,7 +17198,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -9658,7 +9728,7 @@
+@@ -9350,7 +9714,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -19459,7 +17207,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -9706,7 +9776,7 @@
+@@ -9398,7 +9762,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -19468,7 +17216,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9724,7 +9794,7 @@
+@@ -9416,7 +9780,7 @@
fi
;;
@@ -19477,7 +17225,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9739,7 +9809,7 @@
+@@ -9431,7 +9795,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'
;;
@@ -19486,7 +17234,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9757,20 +9827,30 @@
+@@ -9449,20 +9813,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -19520,7 +17268,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9868,7 +9948,7 @@
+@@ -9560,7 +9934,7 @@
fi
;;
@@ -19529,7 +17277,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -9888,7 +9968,7 @@
+@@ -9580,7 +9954,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -19538,7 +17286,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -9922,7 +10002,7 @@
+@@ -9614,7 +9988,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -19547,40 +17295,12 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9990,33 +10070,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -9688,11 +10062,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -19598,49 +17318,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10024,7 +10095,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -10065,33 +10136,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -9747,11 +10128,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -19658,16 +17341,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10099,7 +10161,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -10145,7 +10207,7 @@
+@@ -9805,7 +10193,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -19676,7 +17350,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -10178,19 +10240,18 @@
+@@ -9838,19 +10226,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -19702,7 +17376,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -10230,7 +10291,7 @@
+@@ -9890,7 +10277,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -19711,7 +17385,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10332,7 +10393,7 @@
+@@ -9992,7 +10379,7 @@
link_all_deplibs=yes
;;
@@ -19720,7 +17394,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10352,24 +10413,28 @@
+@@ -10012,24 +10399,28 @@
;;
openbsd*)
@@ -19766,7 +17440,7 @@
fi
;;
-@@ -10428,17 +10493,16 @@
+@@ -10088,17 +10479,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -19793,7 +17467,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10495,7 +10559,7 @@
+@@ -10155,7 +10545,7 @@
fi
;;
@@ -19802,7 +17476,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10572,7 +10636,7 @@
+@@ -10232,7 +10622,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -19811,7 +17485,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10630,17 +10694,55 @@
+@@ -10290,17 +10680,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19871,7 +17545,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10661,7 +10763,7 @@
+@@ -10321,7 +10749,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -19880,7 +17554,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10800,12 +10902,8 @@
+@@ -10460,12 +10888,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -19895,7 +17569,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10822,18 +10920,6 @@
+@@ -10482,18 +10906,6 @@
dynamic_linker=no
;;
@@ -19914,7 +17588,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10871,7 +10957,7 @@
+@@ -10531,7 +10943,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -19923,7 +17597,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10934,7 +11020,7 @@
+@@ -10594,7 +11006,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19932,7 +17606,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10989,7 +11075,7 @@
+@@ -10649,7 +11061,7 @@
;;
# This must be Linux ELF.
@@ -19941,7 +17615,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11003,31 +11089,10 @@
+@@ -10663,31 +11075,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -19949,7 +17623,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 11010 "configure"' > conftest.$ac_ext
+- echo '#line 10670 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -19975,7 +17649,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11039,7 +11104,7 @@
+@@ -10699,7 +11090,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19984,7 +17658,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11048,7 +11113,7 @@
+@@ -10708,7 +11099,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -19993,7 +17667,7 @@
;;
netbsd*)
-@@ -11132,6 +11197,10 @@
+@@ -10792,6 +11183,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -20004,7 +17678,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11228,6 +11297,21 @@
+@@ -10888,6 +11283,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -20026,7 +17700,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -11285,6 +11369,7 @@
+@@ -10945,6 +11355,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -20034,132 +17708,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11368,27 +11453,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11397,7 +11466,7 @@
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -11479,27 +11548,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11508,7 +11561,7 @@
- ac_cv_func_shl_load=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -11558,27 +11611,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11587,14 +11624,14 @@
- ac_cv_lib_dld_shl_load=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+@@ -11206,7 +11617,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -20168,174 +17717,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11659,27 +11696,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11688,7 +11709,7 @@
- ac_cv_func_dlopen=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -11738,27 +11759,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11767,7 +11772,7 @@
- ac_cv_lib_dl_dlopen=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -11818,27 +11823,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11847,7 +11836,7 @@
- ac_cv_lib_svld_dlopen=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -11898,27 +11887,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11927,14 +11900,14 @@
- ac_cv_lib_dld_dld_link=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+@@ -11482,7 +11893,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -20344,25 +17726,25 @@
fi
-@@ -11983,7 +11956,7 @@
+@@ -11531,7 +11942,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11986 "configure"
-+#line 11959 "configure"
+-#line 11534 "configure"
++#line 11945 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12083,7 +12056,7 @@
+@@ -11631,7 +12042,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 12086 "configure"
-+#line 12059 "configure"
+-#line 11634 "configure"
++#line 12045 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12210,7 +12183,7 @@
+@@ -11758,7 +12169,7 @@
fi
;;
@@ -20371,7 +17753,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -12266,6 +12239,7 @@
+@@ -11814,6 +12225,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -20379,7 +17761,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -12281,6 +12255,7 @@
+@@ -11829,6 +12241,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -20387,7 +17769,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -12325,7 +12300,7 @@
+@@ -11873,7 +12286,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -20396,7 +17778,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12561,6 +12536,10 @@
+@@ -12109,6 +12522,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -20407,7 +17789,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12649,7 +12628,7 @@
+@@ -12197,7 +12614,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -20416,7 +17798,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12809,6 +12788,7 @@
+@@ -12357,6 +12774,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -20424,7 +17806,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -12818,10 +12798,10 @@
+@@ -12366,10 +12784,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -20437,7 +17819,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12837,16 +12817,16 @@
+@@ -12385,16 +12803,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -20457,7 +17839,7 @@
# Allow CC to be a program name with arguments.
-@@ -13053,7 +13033,7 @@
+@@ -12601,7 +13019,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -20466,7 +17848,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -13066,7 +13046,7 @@
+@@ -12614,7 +13032,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -20475,7 +17857,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -13102,7 +13082,7 @@
+@@ -12650,7 +13068,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -20484,40 +17866,12 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -13170,33 +13150,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -12724,11 +13142,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -20535,49 +17889,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13204,7 +13175,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -13246,33 +13217,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -12784,11 +13209,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_cxx_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -20595,16 +17912,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13280,7 +13242,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -13342,59 +13304,31 @@
+@@ -12858,59 +13290,31 @@
fi
;;
darwin* | rhapsody*)
@@ -20675,7 +17983,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -13428,7 +13362,7 @@
+@@ -12944,7 +13348,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -20684,7 +17992,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13477,9 +13411,7 @@
+@@ -12993,9 +13397,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -20695,7 +18003,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13547,7 +13479,7 @@
+@@ -13063,7 +13465,7 @@
;;
esac
;;
@@ -20704,7 +18012,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13587,7 +13519,7 @@
+@@ -13103,7 +13505,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -20713,7 +18021,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13639,7 +13571,7 @@
+@@ -13155,7 +13557,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -20722,7 +18030,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -13667,6 +13599,29 @@
+@@ -13183,6 +13585,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -20752,7 +18060,7 @@
esac
;;
lynxos*)
-@@ -13689,7 +13644,7 @@
+@@ -13205,7 +13630,7 @@
;;
esac
;;
@@ -20761,7 +18069,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13705,16 +13660,20 @@
+@@ -13221,16 +13646,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -20791,7 +18099,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13876,15 +13835,10 @@
+@@ -13392,15 +13821,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -20810,7 +18118,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13931,6 +13885,12 @@
+@@ -13447,6 +13871,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -20823,7 +18131,7 @@
fi
;;
esac
-@@ -14018,7 +13978,6 @@
+@@ -13534,7 +13964,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -20831,7 +18139,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -14120,9 +14079,14 @@
+@@ -13636,9 +14065,14 @@
$rm -f confest.$objext
@@ -20847,7 +18155,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -14130,19 +14094,51 @@
+@@ -13646,19 +14080,51 @@
postdeps_CXX=
;;
@@ -20901,7 +18209,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -14173,12 +14169,14 @@
+@@ -13689,12 +14155,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -20918,7 +18226,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -14190,7 +14188,7 @@
+@@ -13706,7 +14174,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -20927,7 +18235,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14216,7 +14214,7 @@
+@@ -13732,7 +14200,7 @@
esac
else
case $host_os in
@@ -20936,7 +18244,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -14256,7 +14254,7 @@
+@@ -13772,7 +14240,7 @@
;;
esac
;;
@@ -20945,7 +18253,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -14299,7 +14297,7 @@
+@@ -13815,7 +14283,7 @@
;;
esac
;;
@@ -20954,7 +18262,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14312,7 +14310,7 @@
+@@ -13828,7 +14296,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -20963,7 +18271,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -14326,6 +14324,14 @@
+@@ -13842,6 +14310,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -20978,7 +18286,7 @@
;;
esac
;;
-@@ -14342,7 +14348,7 @@
+@@ -13858,7 +14334,7 @@
;;
esac
;;
@@ -20987,7 +18295,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14435,12 +14441,12 @@
+@@ -13951,12 +14427,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -21003,17 +18311,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14451,27 +14457,27 @@
+@@ -13967,27 +14443,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13970: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14458: \$? = $ac_status" >&5
-+ echo "$as_me:14464: \$? = $ac_status" >&5
+- echo "$as_me:13974: \$? = $ac_status" >&5
++ echo "$as_me:14450: \$? = $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.
@@ -21037,7 +18345,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -14498,13 +14504,13 @@
+@@ -14014,13 +14490,13 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -21054,7 +18362,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14514,20 +14520,20 @@
+@@ -14030,20 +14506,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -21081,7 +18389,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -14544,7 +14550,7 @@
+@@ -14060,7 +14536,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -21090,21 +18398,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14555,11 +14561,11 @@
+@@ -14071,11 +14547,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:14558: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14564: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14074: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14550: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14562: \$? = $ac_status" >&5
-+ echo "$as_me:14568: \$? = $ac_status" >&5
+- echo "$as_me:14078: \$? = $ac_status" >&5
++ echo "$as_me:14554: \$? = $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
-@@ -14612,7 +14618,7 @@
+@@ -14128,7 +14604,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -21113,7 +18421,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14625,12 +14631,16 @@
+@@ -14141,12 +14617,16 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -21131,7 +18439,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14656,7 +14666,7 @@
+@@ -14172,7 +14652,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -21140,7 +18448,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14714,20 +14724,7 @@
+@@ -14230,20 +14710,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21162,7 +18470,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14745,7 +14742,7 @@
+@@ -14261,7 +14728,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -21171,7 +18479,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14884,12 +14881,7 @@
+@@ -14400,12 +14867,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -21185,7 +18493,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14906,18 +14898,6 @@
+@@ -14422,18 +14884,6 @@
dynamic_linker=no
;;
@@ -21204,7 +18512,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14955,7 +14935,7 @@
+@@ -14471,7 +14921,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -21213,7 +18521,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -15018,7 +14998,7 @@
+@@ -14534,7 +14984,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21222,7 +18530,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15073,7 +15053,7 @@
+@@ -14589,7 +15039,7 @@
;;
# This must be Linux ELF.
@@ -21231,7 +18539,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15087,31 +15067,10 @@
+@@ -14603,31 +15053,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -21239,7 +18547,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 15094 "configure"' > conftest.$ac_ext
+- echo '#line 14610 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -21265,7 +18573,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15123,7 +15082,7 @@
+@@ -14639,7 +15068,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21274,7 +18582,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15132,7 +15091,7 @@
+@@ -14648,7 +15077,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -21283,7 +18591,7 @@
;;
netbsd*)
-@@ -15216,6 +15175,10 @@
+@@ -14732,6 +15161,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21294,13 +18602,10 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15312,9 +15275,24 @@
+@@ -14828,6 +15261,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
@@ -21316,13 +18621,10 @@
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-
- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-@@ -15395,6 +15373,7 @@
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -14911,6 +15359,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -21330,7 +18632,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -15410,6 +15389,7 @@
+@@ -14926,6 +15375,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -21338,7 +18640,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15642,6 +15622,10 @@
+@@ -15158,6 +15608,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -21349,7 +18651,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -15730,7 +15714,7 @@
+@@ -15246,7 +15700,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -21358,7 +18660,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15821,10 +15805,17 @@
+@@ -15337,10 +15791,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -21378,7 +18680,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15840,16 +15831,16 @@
+@@ -15356,16 +15817,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -21398,7 +18700,7 @@
# Allow CC to be a program name with arguments.
-@@ -15887,7 +15878,7 @@
+@@ -15403,7 +15864,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -21407,7 +18709,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15933,13 +15924,15 @@
+@@ -15449,13 +15910,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -21425,7 +18727,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15949,7 +15942,7 @@
+@@ -15465,7 +15928,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -21434,7 +18736,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16007,7 +16000,7 @@
+@@ -15523,7 +15986,7 @@
esac
;;
@@ -21443,7 +18745,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -16040,7 +16033,7 @@
+@@ -15556,7 +16019,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21452,7 +18754,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16059,6 +16052,22 @@
+@@ -15575,6 +16038,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -21475,7 +18777,7 @@
esac
;;
-@@ -16068,6 +16077,10 @@
+@@ -15584,6 +16063,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -21486,7 +18788,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16130,12 +16143,12 @@
+@@ -15646,12 +16129,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -21502,17 +18804,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16146,27 +16159,27 @@
+@@ -15662,27 +16145,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16162: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15665: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16153: \$? = $ac_status" >&5
-+ echo "$as_me:16166: \$? = $ac_status" >&5
+- echo "$as_me:15669: \$? = $ac_status" >&5
++ echo "$as_me:16152: \$? = $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.
@@ -21536,7 +18838,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -16193,13 +16206,13 @@
+@@ -15709,13 +16192,13 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -21553,7 +18855,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16209,20 +16222,20 @@
+@@ -15725,20 +16208,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -21580,7 +18882,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -16239,7 +16252,7 @@
+@@ -15755,7 +16238,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -21589,21 +18891,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16250,11 +16263,11 @@
+@@ -15766,11 +16249,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:16253: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16266: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15769: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16257: \$? = $ac_status" >&5
-+ echo "$as_me:16270: \$? = $ac_status" >&5
+- echo "$as_me:15773: \$? = $ac_status" >&5
++ echo "$as_me:16256: \$? = $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
-@@ -16334,12 +16347,13 @@
+@@ -15850,12 +16333,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -21618,7 +18920,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -16398,7 +16412,7 @@
+@@ -15914,7 +16398,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -21627,7 +18929,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -16446,7 +16460,7 @@
+@@ -15962,7 +16446,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -21636,7 +18938,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16464,7 +16478,7 @@
+@@ -15980,7 +16464,7 @@
fi
;;
@@ -21645,7 +18947,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16479,7 +16493,7 @@
+@@ -15995,7 +16479,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -21654,7 +18956,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16497,20 +16511,30 @@
+@@ -16013,20 +16497,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -21688,7 +18990,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16608,7 +16632,7 @@
+@@ -16124,7 +16618,7 @@
fi
;;
@@ -21697,7 +18999,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -16628,7 +16652,7 @@
+@@ -16144,7 +16638,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -21706,7 +19008,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -16662,7 +16686,7 @@
+@@ -16178,7 +16672,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -21715,40 +19017,12 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16720,33 +16744,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -16242,11 +16736,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_f77_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -21766,49 +19040,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16754,7 +16769,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -16785,33 +16800,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -16291,11 +16792,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_f77_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -21826,16 +19063,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16819,7 +16825,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -16865,7 +16871,7 @@
+@@ -16349,7 +16857,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -21844,7 +19072,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16898,19 +16904,18 @@
+@@ -16382,19 +16890,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -21870,7 +19098,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -16950,7 +16955,7 @@
+@@ -16434,7 +16941,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21879,7 +19107,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -17052,7 +17057,7 @@
+@@ -16536,7 +17043,7 @@
link_all_deplibs_F77=yes
;;
@@ -21888,7 +19116,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17072,24 +17077,28 @@
+@@ -16556,24 +17063,28 @@
;;
openbsd*)
@@ -21934,7 +19162,7 @@
fi
;;
-@@ -17148,17 +17157,16 @@
+@@ -16632,17 +17143,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -21961,7 +19189,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17215,7 +17223,7 @@
+@@ -16699,7 +17209,7 @@
fi
;;
@@ -21970,7 +19198,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -17292,7 +17300,7 @@
+@@ -16776,7 +17286,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -21979,7 +19207,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17350,20 +17358,7 @@
+@@ -16834,20 +17344,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22001,7 +19229,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17381,7 +17376,7 @@
+@@ -16865,7 +17362,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -22010,7 +19238,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17520,12 +17515,7 @@
+@@ -17004,12 +17501,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -22024,7 +19252,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17542,18 +17532,6 @@
+@@ -17026,18 +17518,6 @@
dynamic_linker=no
;;
@@ -22043,7 +19271,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17591,7 +17569,7 @@
+@@ -17075,7 +17555,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -22052,7 +19280,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17654,7 +17632,7 @@
+@@ -17138,7 +17618,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22061,7 +19289,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17709,7 +17687,7 @@
+@@ -17193,7 +17673,7 @@
;;
# This must be Linux ELF.
@@ -22070,7 +19298,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17723,31 +17701,10 @@
+@@ -17207,31 +17687,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -22078,7 +19306,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 17730 "configure"' > conftest.$ac_ext
+- echo '#line 17214 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -22104,7 +19332,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17759,7 +17716,7 @@
+@@ -17243,7 +17702,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22113,7 +19341,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17768,7 +17725,7 @@
+@@ -17252,7 +17711,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -22122,7 +19350,7 @@
;;
netbsd*)
-@@ -17852,6 +17809,10 @@
+@@ -17336,6 +17795,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22133,7 +19361,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17948,6 +17909,21 @@
+@@ -17432,6 +17895,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -22155,7 +19383,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18031,6 +18007,7 @@
+@@ -17515,6 +17993,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -22163,7 +19391,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -18046,6 +18023,7 @@
+@@ -17530,6 +18009,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -22171,7 +19399,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -18278,6 +18256,10 @@
+@@ -17762,6 +18242,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -22182,7 +19410,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -18366,7 +18348,7 @@
+@@ -17850,7 +18334,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -22191,7 +19419,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -18424,10 +18406,10 @@
+@@ -17908,10 +18392,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -22204,7 +19432,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18443,16 +18425,16 @@
+@@ -17927,16 +18411,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -22224,7 +19452,7 @@
# Allow CC to be a program name with arguments.
-@@ -18490,7 +18472,7 @@
+@@ -17974,7 +18458,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -22233,21 +19461,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18501,11 +18483,11 @@
+@@ -17985,11 +18469,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:18504: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18486: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17988: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18508: \$? = $ac_status" >&5
-+ echo "$as_me:18490: \$? = $ac_status" >&5
+- echo "$as_me:17992: \$? = $ac_status" >&5
++ echo "$as_me:18476: \$? = $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.
-@@ -18556,14 +18538,16 @@
+@@ -18040,14 +18524,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -22267,7 +19495,7 @@
;;
darwin* | rhapsody*)
-@@ -18572,7 +18556,7 @@
+@@ -18056,7 +18542,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22276,7 +19504,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18630,10 +18614,10 @@
+@@ -18114,10 +18600,10 @@
esac
;;
@@ -22289,7 +19517,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -18663,7 +18647,7 @@
+@@ -18147,7 +18633,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22298,7 +19526,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18682,6 +18666,22 @@
+@@ -18166,6 +18652,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22321,7 +19549,7 @@
esac
;;
-@@ -18691,6 +18691,10 @@
+@@ -18175,6 +18677,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22332,7 +19560,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18753,12 +18757,12 @@
+@@ -18237,12 +18743,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -22348,17 +19576,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18769,27 +18773,27 @@
+@@ -18253,27 +18759,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18772: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18776: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18256: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18762: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18776: \$? = $ac_status" >&5
-+ echo "$as_me:18780: \$? = $ac_status" >&5
+- echo "$as_me:18260: \$? = $ac_status" >&5
++ echo "$as_me:18766: \$? = $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.
@@ -22382,7 +19610,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18816,13 +18820,13 @@
+@@ -18300,13 +18806,13 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -22399,7 +19627,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18832,20 +18836,20 @@
+@@ -18316,20 +18822,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -22426,7 +19654,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -18862,7 +18866,7 @@
+@@ -18346,7 +18852,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -22435,21 +19663,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18873,11 +18877,11 @@
+@@ -18357,11 +18863,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:18876: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18880: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18360: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18866: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18880: \$? = $ac_status" >&5
-+ echo "$as_me:18884: \$? = $ac_status" >&5
+- echo "$as_me:18364: \$? = $ac_status" >&5
++ echo "$as_me:18870: \$? = $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
-@@ -18957,12 +18961,13 @@
+@@ -18441,12 +18947,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -22464,7 +19692,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -19021,7 +19026,7 @@
+@@ -18505,7 +19012,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -22473,7 +19701,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -19069,7 +19074,7 @@
+@@ -18553,7 +19060,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -22482,7 +19710,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -19087,7 +19092,7 @@
+@@ -18571,7 +19078,7 @@
fi
;;
@@ -22491,7 +19719,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -19102,7 +19107,7 @@
+@@ -18586,7 +19093,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -22500,7 +19728,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -19120,20 +19125,30 @@
+@@ -18604,20 +19111,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -22534,7 +19762,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19231,7 +19246,7 @@
+@@ -18715,7 +19232,7 @@
fi
;;
@@ -22543,7 +19771,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -19251,7 +19266,7 @@
+@@ -18735,7 +19252,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -22552,7 +19780,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -19285,7 +19300,7 @@
+@@ -18769,7 +19286,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -22561,40 +19789,12 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -19353,33 +19368,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -18843,11 +19360,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -22612,49 +19812,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19387,7 +19393,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -19428,33 +19434,24 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
+@@ -18902,11 +19426,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -22672,16 +19835,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19462,7 +19459,7 @@
-
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-@@ -19508,7 +19505,7 @@
+@@ -18960,7 +19491,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -22690,7 +19844,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19541,19 +19538,18 @@
+@@ -18993,19 +19524,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -22716,7 +19870,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -19593,7 +19589,7 @@
+@@ -19045,7 +19575,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22725,7 +19879,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19695,7 +19691,7 @@
+@@ -19147,7 +19677,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -22734,7 +19888,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19715,24 +19711,28 @@
+@@ -19167,24 +19697,28 @@
;;
openbsd*)
@@ -22780,7 +19934,7 @@
fi
;;
-@@ -19791,17 +19791,16 @@
+@@ -19243,17 +19777,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -22807,7 +19961,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19858,7 +19857,7 @@
+@@ -19310,7 +19843,7 @@
fi
;;
@@ -22816,7 +19970,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19935,7 +19934,7 @@
+@@ -19387,7 +19920,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -22825,7 +19979,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19993,20 +19992,7 @@
+@@ -19445,20 +19978,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22847,7 +20001,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -20024,7 +20010,7 @@
+@@ -19476,7 +19996,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -22856,7 +20010,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20163,12 +20149,7 @@
+@@ -19615,12 +20135,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -22870,7 +20024,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -20185,18 +20166,6 @@
+@@ -19637,18 +20152,6 @@
dynamic_linker=no
;;
@@ -22889,7 +20043,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -20234,7 +20203,7 @@
+@@ -19686,7 +20189,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -22898,7 +20052,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -20297,7 +20266,7 @@
+@@ -19749,7 +20252,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22907,7 +20061,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20352,7 +20321,7 @@
+@@ -19804,7 +20307,7 @@
;;
# This must be Linux ELF.
@@ -22916,7 +20070,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20366,31 +20335,10 @@
+@@ -19818,31 +20321,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -22924,7 +20078,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 20373 "configure"' > conftest.$ac_ext
+- echo '#line 19825 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -22950,7 +20104,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20402,7 +20350,7 @@
+@@ -19854,7 +20336,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22959,7 +20113,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20411,7 +20359,7 @@
+@@ -19863,7 +20345,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -22968,7 +20122,7 @@
;;
netbsd*)
-@@ -20495,6 +20443,10 @@
+@@ -19947,6 +20429,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22979,7 +20133,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20591,6 +20543,21 @@
+@@ -20043,6 +20529,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -23001,7 +20155,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -20674,6 +20641,7 @@
+@@ -20126,6 +20627,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -23009,7 +20163,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -20689,6 +20657,7 @@
+@@ -20141,6 +20643,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -23017,7 +20171,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20921,6 +20890,10 @@
+@@ -20373,6 +20876,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -23028,7 +20182,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -21009,7 +20982,7 @@
+@@ -20461,7 +20968,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -23037,7 +20191,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -21066,7 +21039,7 @@
+@@ -20518,7 +21025,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -23046,7 +20200,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -21085,16 +21058,16 @@
+@@ -20537,16 +21044,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -23066,7 +20220,7 @@
# Allow CC to be a program name with arguments.
-@@ -21154,6 +21127,7 @@
+@@ -20606,6 +21113,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -23074,7 +20228,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -21169,6 +21143,7 @@
+@@ -20621,6 +21129,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -23082,7 +20236,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -21401,6 +21376,10 @@
+@@ -20853,6 +21362,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -23093,7 +20247,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21489,7 +21468,7 @@
+@@ -20941,7 +21454,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -23102,922 +20256,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21710,17 +21689,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -21743,7 +21715,7 @@
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
-- LIBS="-lXt $LIBS"
-+ LIBS="-lX11 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21772,27 +21744,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -21805,7 +21761,7 @@
- do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r "$ac_dir/libXt.$ac_extension"; then
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
- fi
-@@ -21813,7 +21769,7 @@
- done
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
-
-@@ -21868,12 +21824,12 @@
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- case `(uname -sr) 2>/dev/null` in
-- "SunOS 5"*)
-- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21901,44 +21857,20 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_nospace=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ X_LIBS="$X_LIBS -R$x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_R_nospace=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_nospace = yes; then
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- X_LIBS="$X_LIBS -R$x_libraries"
-- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21966,48 +21898,30 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_space=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_R_space=no
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_space = yes; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-- X_LIBS="$X_LIBS -R $x_libraries"
-- else
-- { echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6; }
-- fi
-- fi
-- LIBS=$ac_xsave_LIBS
-- esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_xsave_c_werror_flag
-+ LIBS=$ac_xsave_LIBS
- fi
-
- # Check for system-dependent libraries X programs must link with.
-@@ -22056,27 +21970,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -22124,27 +22022,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22153,7 +22035,7 @@
- ac_cv_lib_dnet_dnet_ntoa=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22206,27 +22088,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22235,7 +22101,7 @@
- ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22248,7 +22114,7 @@
- fi
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
-@@ -22323,27 +22189,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22352,7 +22202,7 @@
- ac_cv_func_gethostbyname=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -22401,27 +22251,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22430,7 +22264,7 @@
- ac_cv_lib_nsl_gethostbyname=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22483,27 +22317,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_bsd_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22512,7 +22330,7 @@
- ac_cv_lib_bsd_gethostbyname=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22595,27 +22413,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22624,7 +22426,7 @@
- ac_cv_func_connect=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -22673,27 +22475,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_connect=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22702,7 +22488,7 @@
- ac_cv_lib_socket_connect=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22778,27 +22564,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_remove=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22807,7 +22577,7 @@
- ac_cv_func_remove=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -22856,27 +22626,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_posix_remove=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22885,7 +22639,7 @@
- ac_cv_lib_posix_remove=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -22961,27 +22715,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -22990,7 +22728,7 @@
- ac_cv_func_shmat=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -23039,27 +22777,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23068,7 +22790,7 @@
- ac_cv_lib_ipc_shmat=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -23132,27 +22854,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23161,7 +22867,7 @@
- ac_cv_lib_ICE_IceConnectionNumber=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -23256,7 +22962,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -23393,17 +23099,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- { echo "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6; }
- HAVE_PYHDRS="yes"
-@@ -23487,27 +23186,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- has_option=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23613,27 +23295,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23669,17 +23334,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23794,27 +23452,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- has_option=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -23930,7 +23571,7 @@
+@@ -23044,7 +23557,7 @@
and GIT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24026,7 +20265,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23940,7 +23581,7 @@
+@@ -23054,7 +23567,7 @@
and GIT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24035,7 +20274,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24042,7 +23683,7 @@
+@@ -23156,7 +23669,7 @@
and GAILUTIL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24044,7 +20283,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24052,7 +23693,7 @@
+@@ -23166,7 +23679,7 @@
and GAILUTIL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24053,7 +20292,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24156,7 +23797,7 @@
+@@ -23270,7 +23783,7 @@
and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24062,7 +20301,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24166,7 +23807,7 @@
+@@ -23280,7 +23793,7 @@
and GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24071,7 +20310,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24270,7 +23911,7 @@
+@@ -23384,7 +23897,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24080,7 +20319,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24280,7 +23921,7 @@
+@@ -23394,7 +23907,7 @@
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24089,7 +20328,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24384,7 +24025,7 @@
+@@ -23498,7 +24011,7 @@
and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24098,7 +20337,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24394,7 +24035,7 @@
+@@ -23508,7 +24021,7 @@
and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24107,7 +20346,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24498,7 +24139,7 @@
+@@ -23612,7 +24125,7 @@
and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24116,7 +20355,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24508,7 +24149,7 @@
+@@ -23622,7 +24135,7 @@
and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24125,7 +20364,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24612,7 +24253,7 @@
+@@ -23726,7 +24239,7 @@
and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24134,7 +20373,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24622,7 +24263,7 @@
+@@ -23736,7 +24249,7 @@
and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24143,7 +20382,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24727,7 +24368,7 @@
+@@ -23841,7 +24354,7 @@
and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24152,7 +20391,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24737,7 +24378,7 @@
+@@ -23851,7 +24364,7 @@
and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24161,7 +20400,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24849,7 +24490,7 @@
+@@ -23963,7 +24476,7 @@
and LIBGLADE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24170,7 +20409,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24859,7 +24500,7 @@
+@@ -23973,7 +24486,7 @@
and LIBGLADE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24179,62 +20418,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24932,7 +24573,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$GTOP_APPLETS_PKG_ERRORS" >&5
-
-- { echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
- echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}
- elif test $pkg_failed = untried; then
- { echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5
-@@ -25014,7 +24657,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5
-
-- HAVE_LIBGNOMEKBD=no
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_LIBGNOMEKBD=no
- elif test $pkg_failed = untried; then
- HAVE_LIBGNOMEKBD=no
- else
-@@ -25104,7 +24749,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5
-
-- HAVE_GNOME_SETTINGS_DAEMON=no
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_GNOME_SETTINGS_DAEMON=no
- elif test $pkg_failed = untried; then
- HAVE_GNOME_SETTINGS_DAEMON=no
- else
-@@ -25182,7 +24829,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$LIBWNCK_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ { { echo "$as_me:$LINENO: error: libwnck is required to build gnome-applets." >&5
- echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-@@ -25261,7 +24910,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$LIBNOTIFY_PKG_ERRORS" >&5
-
-- HAVE_LIBNOTIFY="no"
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_LIBNOTIFY="no"
- elif test $pkg_failed = untried; then
- HAVE_LIBNOTIFY="no"
- else
-@@ -25374,7 +25025,7 @@
+@@ -24498,7 +25011,7 @@
and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24243,7 +20427,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -25384,7 +25035,7 @@
+@@ -24508,7 +25021,7 @@
and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -24252,52 +20436,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -25457,7 +25108,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$DBUS_PKG_ERRORS" >&5
-
-- HAVE_DBUS=no
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_DBUS=no
- elif test $pkg_failed = untried; then
- HAVE_DBUS=no
- else
-@@ -25547,7 +25200,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$HAL_PKG_ERRORS" >&5
-
-- HAVE_HAL="no"
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_HAL="no"
- elif test $pkg_failed = untried; then
- HAVE_HAL="no"
- else
-@@ -25634,7 +25289,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$GUCHARMAP_PKG_ERRORS" >&5
-
-- HAVE_GUCHARMAP="no"
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_GUCHARMAP="no"
- elif test $pkg_failed = untried; then
- HAVE_GUCHARMAP="no"
- else
-@@ -25735,7 +25392,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$PYGTK_PKG_ERRORS" >&5
-
-- HAVE_PYGTK="no"
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_PYGTK="no"
- elif test $pkg_failed = untried; then
- HAVE_PYGTK="no"
- else
-@@ -25839,7 +25498,7 @@
- and XML2_LIBS to avoid the need to call pkg-config.
+@@ -24971,7 +25484,7 @@
+ and LIBGWEATHER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -24305,8 +20445,8 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -25849,7 +25508,7 @@
- and XML2_LIBS to avoid the need to call pkg-config.
+@@ -24981,7 +25494,7 @@
+ and LIBGWEATHER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -24314,1818 +20454,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -25953,7 +25612,7 @@
- and LIBGWEATHER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
- echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -25963,7 +25622,7 @@
- and LIBGWEATHER_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
-@@ -25997,7 +25656,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26046,7 +25705,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26087,7 +25746,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26134,7 +25793,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26181,7 +25840,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26229,7 +25888,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -26370,38 +26029,21 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-+case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26437,17 +26079,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26540,27 +26175,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- am_cv_val_LC_MESSAGES=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26569,7 +26188,7 @@
- am_cv_val_LC_MESSAGES=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -26625,27 +26244,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26681,17 +26283,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26782,27 +26377,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_ngettext_libc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26811,7 +26390,7 @@
- gt_cv_func_ngettext_libc=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
-@@ -26854,27 +26433,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gt_cv_func_dgettext_libc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -26883,7 +26446,7 @@
- gt_cv_func_dgettext_libc=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
-@@ -26959,27 +26522,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -26988,7 +26535,7 @@
- eval "$as_ac_var=no"
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27053,27 +26600,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_bindtextdomain=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27082,7 +26613,7 @@
- ac_cv_lib_intl_bindtextdomain=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -27131,27 +26662,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_ngettext=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27160,7 +26675,7 @@
- ac_cv_lib_intl_ngettext=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -27209,27 +26724,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_dgettext=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27238,7 +26737,7 @@
- ac_cv_lib_intl_dgettext=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -27300,27 +26799,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_ngettext=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27329,7 +26812,7 @@
- ac_cv_lib_intl_ngettext=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -27378,27 +26861,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_intl_dcgettext=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27407,7 +26874,7 @@
- ac_cv_lib_intl_dcgettext=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -27502,27 +26969,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -27531,7 +26982,7 @@
- eval "$as_ac_var=no"
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27678,27 +27129,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -27707,7 +27142,7 @@
- eval "$as_ac_var=no"
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27768,7 +27203,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -27856,27 +27291,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-@@ -27937,38 +27356,22 @@
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-+case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_bind_textdomain_codeset=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27977,7 +27380,7 @@
- ac_cv_func_bind_textdomain_codeset=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -27998,7 +27401,7 @@
- esac
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
-@@ -28190,6 +27593,9 @@
- fi
-
-
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+
-+
- if test "$gdu_cv_have_gdu" = "yes"; then
- HAVE_GNOME_DOC_UTILS_TRUE=
- HAVE_GNOME_DOC_UTILS_FALSE='#'
-@@ -28287,27 +27693,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28343,17 +27732,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28457,27 +27839,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_apm_apm_read=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28486,7 +27852,7 @@
- ac_cv_lib_apm_apm_read=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -28544,27 +27910,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_apm_apm_read=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28573,7 +27923,7 @@
- ac_cv_lib_apm_apm_read=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -28630,27 +27980,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28686,17 +28019,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -28917,7 +28243,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$MIXER_PKG_ERRORS" >&5
-
-- HAVE_GST_VER=none
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_GST_VER=none
- elif test $pkg_failed = untried; then
- HAVE_GST_VER=none
- else
-@@ -28992,7 +28320,9 @@
- # Put the nasty error message in config.log where it belongs
- echo "$MIXER_PKG_ERRORS" >&5
-
-- HAVE_GST_VER=none
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_GST_VER=none
- elif test $pkg_failed = untried; then
- HAVE_GST_VER=none
- else
-@@ -29090,27 +28420,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29146,17 +28459,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29210,233 +28516,101 @@
- else
- HAVE_XKB=false
- fi
--
--
--
--
-- if $HAVE_XKB; then
-- APPLET_ACCESSX_TRUE=
-- APPLET_ACCESSX_FALSE='#'
--else
-- APPLET_ACCESSX_TRUE='#'
-- APPLET_ACCESSX_FALSE=
--fi
--
--if test "x$APPLET_ACCESSX" = "xtrue"; then
-- { echo "$as_me:$LINENO: WARNING: *** keyboard accessibility status applet will not be built ***" >&5
--echo "$as_me: WARNING: *** keyboard accessibility status applet will not be built ***" >&2;}
--fi
--CPPFLAGS=$savecppflags
--
--
--SU_TOOL=
--P_MODEMLIGHTS=
--HAVE_LIBUTIL=
--
--# Extract the first word of "su", so it can be a program name with args.
--set dummy su; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_SU_TOOL+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $SU_TOOL in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_SU_TOOL="$SU_TOOL" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_SU_TOOL="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--SU_TOOL=$ac_cv_path_SU_TOOL
--if test -n "$SU_TOOL"; then
-- { echo "$as_me:$LINENO: result: $SU_TOOL" >&5
--echo "${ECHO_T}$SU_TOOL" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--{ echo "$as_me:$LINENO: checking for forkpty in -lutil" >&5
--echo $ECHO_N "checking for forkpty in -lutil... $ECHO_C" >&6; }
--if test "${ac_cv_lib_util_forkpty+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lutil $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 forkpty ();
--int
--main ()
--{
--return forkpty ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_util_forkpty=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_util_forkpty=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_forkpty" >&5
--echo "${ECHO_T}$ac_cv_lib_util_forkpty" >&6; }
--if test $ac_cv_lib_util_forkpty = yes; then
-- HAVE_LIBUTIL=true
--else
-- HAVE_LIBUTIL=false
--fi
--
--
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+
-+
-+
-+
-+ if $HAVE_XKB; then
-+ APPLET_ACCESSX_TRUE=
-+ APPLET_ACCESSX_FALSE='#'
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ APPLET_ACCESSX_TRUE='#'
-+ APPLET_ACCESSX_FALSE=
- fi
-
-+if test "x$APPLET_ACCESSX" = "xtrue"; then
-+ { echo "$as_me:$LINENO: WARNING: *** keyboard accessibility status applet will not be built ***" >&5
-+echo "$as_me: WARNING: *** keyboard accessibility status applet will not be built ***" >&2;}
-+fi
-+CPPFLAGS=$savecppflags
-
-- stb="system-tools-backends"
-
-- if test x$PKG_CONFIG != xno ; then
-- if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
-- min_version=$SYSTEM_TOOLS_BACKENDS_REQUIRED
-- { echo "$as_me:$LINENO: checking for $stb >= $min_version" >&5
--echo $ECHO_N "checking for $stb >= $min_version... $ECHO_C" >&6; }
--
-- if $PKG_CONFIG --atleast-version $min_version $stb ; then
-- STB_SCRIPTS_DIR=`$PKG_CONFIG --variable=backenddir $stb`
-- { echo "$as_me:$LINENO: result: yes ($STB_SCRIPTS_DIR)" >&5
--echo "${ECHO_T}yes ($STB_SCRIPTS_DIR)" >&6; }
-- P_MODEMLIGHTS=modemlights
-- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- :
-- fi
-- else
-- echo "*** pkg-config too old; version 0.12 or better required."
-- fi
-- fi
-+MODEMLIGHTS_LIBS=
-+MODEMLIGHTS_CFLAGS=
-
-
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for MODEMLIGHTS" >&5
-+echo $ECHO_N "checking for MODEMLIGHTS... $ECHO_C" >&6; }
-
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MODEMLIGHTS_CFLAGS"; then
-+ pkg_cv_MODEMLIGHTS_CFLAGS="$MODEMLIGHTS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MODEMLIGHTS_CFLAGS=`$PKG_CONFIG --cflags "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MODEMLIGHTS_LIBS"; then
-+ pkg_cv_MODEMLIGHTS_LIBS="$MODEMLIGHTS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liboobs-1 >= \$LIBOOBS_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MODEMLIGHTS_LIBS=`$PKG_CONFIG --libs "liboobs-1 >= $LIBOOBS_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-
--if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
-- MODEMLIGHTS_LIBS=" -lutil"
-
-
--cat >>confdefs.h <<_ACEOF
--#define STB_SCRIPTS_DIR "$STB_SCRIPTS_DIR"
--_ACEOF
-+if test $pkg_failed = yes; then
-
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED"`
-+ else
-+ MODEMLIGHTS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liboobs-1 >= $LIBOOBS_REQUIRED"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$MODEMLIGHTS_PKG_ERRORS" >&5
-
--cat >>confdefs.h <<_ACEOF
--#define SU_PATH "${SU_TOOL}"
--_ACEOF
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ HAVE_LIBOOBS=no
-+elif test $pkg_failed = untried; then
-+ HAVE_LIBOOBS=no
-+else
-+ MODEMLIGHTS_CFLAGS=$pkg_cv_MODEMLIGHTS_CFLAGS
-+ MODEMLIGHTS_LIBS=$pkg_cv_MODEMLIGHTS_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ HAVE_LIBOOBS=yes
-+fi
-
-+if test "x$HAVE_LIBOOBS" = "xyes" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
- BUILD_MODEM_LIGHTS=yes
- else
- { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
-@@ -29444,6 +28618,8 @@
- BUILD_MODEM_LIGHTS=no
- fi
-
-+
-+
- if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
- APPLET_MODEMLIGHTS_TRUE=
- APPLET_MODEMLIGHTS_FALSE='#'
-@@ -29512,27 +28688,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29568,17 +28727,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29788,27 +28940,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- have_ipv6=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29894,27 +29029,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_getaddrinfo=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -29923,7 +29042,7 @@
- ac_cv_func_getaddrinfo=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-@@ -29978,27 +29097,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -30007,7 +29110,7 @@
- eval "$as_ac_Lib=no"
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -30064,27 +29167,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_tm_tm_gmtoff=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30121,27 +29207,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_member_struct_tm_tm_gmtoff=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30191,8 +29260,7 @@
- main ()
- {
- #ifndef timezone
-- char *p = (char *) timezone;
-- return !p;
-+ (void) timezone;
- #endif
-
- ;
-@@ -30212,27 +29280,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_timezone=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30289,27 +29340,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- gtk_ok=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -30318,7 +29353,7 @@
- gtk_ok=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $gtk_ok" >&5
- echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -30848,7 +29883,8 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-@@ -30857,10 +29893,13 @@
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
- else
-- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-
-
- # PATH needs CR
-@@ -31084,19 +30123,28 @@
- as_mkdir_p=false
- fi
-
--# Find out whether ``test -x'' works. Don't use a zero-byte file, as
--# systems may use methods other than mode bits to determine executability.
--cat >conf$$.file <<_ASEOF
--#! /bin/sh
--exit 0
--_ASEOF
--chmod +x conf$$.file
--if test -x conf$$.file >/dev/null 2>&1; then
-- as_executable_p="test -x"
-+if test -x / >/dev/null 2>&1; then
-+ as_test_x='test -x'
- else
-- as_executable_p=:
-+ if ls -dL / >/dev/null 2>&1; then
-+ as_ls_L_option=L
-+ else
-+ as_ls_L_option=
-+ fi
-+ as_test_x='
-+ eval sh -c '\''
-+ if test -d "$1"; then
-+ test -d "$1/.";
-+ else
-+ case $1 in
-+ -*)set "./$1";;
-+ esac;
-+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+ ???[sx]*):;;*)false;;esac;fi
-+ '\'' sh
-+ '
- fi
--rm -f conf$$.file
-+as_executable_p=$as_test_x
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -31112,7 +30160,7 @@
- # values after options handling.
- ac_log="
- This file was extended by gnome-applets $as_me 2.22.0, which was
--generated by GNU Autoconf 2.60. Invocation command line was
-+generated by GNU Autoconf 2.61. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -31141,7 +30189,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -31165,7 +30213,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- gnome-applets config.status 2.22.0
--configured by $0, generated by GNU Autoconf 2.60,
-+configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
- Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -31481,6 +30529,9 @@
- INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
- INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
- INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+MSGMERGE!$MSGMERGE$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
- INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
- INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
- INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-@@ -31494,9 +30545,6 @@
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
- DEPDIR!$DEPDIR$ac_delim
--am__include!$am__include$ac_delim
--am__quote!$am__quote$ac_delim
--AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31538,6 +30586,9 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- AMDEP_FALSE!$AMDEP_FALSE$ac_delim
- AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
- CCDEPMODE!$CCDEPMODE$ac_delim
-@@ -31556,10 +30607,13 @@
+@@ -30078,10 +30591,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -26139,90 +20468,52 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -31629,12 +30683,6 @@
+@@ -30151,9 +30667,6 @@
HAL_CFLAGS!$HAL_CFLAGS$ac_delim
HAL_LIBS!$HAL_LIBS$ac_delim
GUCHARMAP_CFLAGS!$GUCHARMAP_CFLAGS$ac_delim
-GUCHARMAP_LIBS!$GUCHARMAP_LIBS$ac_delim
-PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim
-PYGTK_LIBS!$PYGTK_LIBS$ac_delim
--XML2_CFLAGS!$XML2_CFLAGS$ac_delim
--XML2_LIBS!$XML2_LIBS$ac_delim
--LIBGWEATHER_CFLAGS!$LIBGWEATHER_CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31676,6 +30724,12 @@
+@@ -30195,6 +30708,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+GUCHARMAP_LIBS!$GUCHARMAP_LIBS$ac_delim
+PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim
+PYGTK_LIBS!$PYGTK_LIBS$ac_delim
-+XML2_CFLAGS!$XML2_CFLAGS$ac_delim
-+XML2_LIBS!$XML2_LIBS$ac_delim
-+LIBGWEATHER_CFLAGS!$LIBGWEATHER_CFLAGS$ac_delim
+ LIBGWEATHER_CFLAGS!$LIBGWEATHER_CFLAGS$ac_delim
LIBGWEATHER_LIBS!$LIBGWEATHER_LIBS$ac_delim
- LIBGWEATHER_LOCATIONS!$LIBGWEATHER_LOCATIONS$ac_delim
GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim
-@@ -31695,10 +30749,8 @@
- GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
- GNOMELOCALEDIR!$GNOMELOCALEDIR$ac_delim
- USE_NLS!$USE_NLS$ac_delim
--MSGFMT!$MSGFMT$ac_delim
- MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
- GMSGFMT!$GMSGFMT$ac_delim
--XGETTEXT!$XGETTEXT$ac_delim
- CATALOGS!$CATALOGS$ac_delim
- CATOBJEXT!$CATOBJEXT$ac_delim
- GMOFILES!$GMOFILES$ac_delim
-@@ -31715,6 +30767,7 @@
- DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
- ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
- ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
-+DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
- HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
- HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
- ENABLE_FLAGS_TRUE!$ENABLE_FLAGS_TRUE$ac_delim
-@@ -31743,8 +30796,7 @@
- HAVE_XKB!$HAVE_XKB$ac_delim
- APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim
- APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim
--SU_TOOL!$SU_TOOL$ac_delim
--STB_SCRIPTS_DIR!$STB_SCRIPTS_DIR$ac_delim
-+MODEMLIGHTS_CFLAGS!$MODEMLIGHTS_CFLAGS$ac_delim
- MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim
- APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim
- APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim
-@@ -31769,10 +30821,6 @@
- GNOME_GLADEDIR!$GNOME_GLADEDIR$ac_delim
- DATADIR!$DATADIR$ac_delim
+@@ -30289,9 +30805,6 @@
SYSCONFDIR!$SYSCONFDIR$ac_delim
--LIBDIR!$LIBDIR$ac_delim
--PREFIX!$PREFIX$ac_delim
+ LIBDIR!$LIBDIR$ac_delim
+ PREFIX!$PREFIX$ac_delim
-PYTHONDIR!$PYTHONDIR$ac_delim
-GLADEDIR!$GLADEDIR$ac_delim
+-LIBOBJS!$LIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -31814,11 +30862,15 @@
+@@ -30333,10 +30846,13 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+LIBDIR!$LIBDIR$ac_delim
-+PREFIX!$PREFIX$ac_delim
+PYTHONDIR!$PYTHONDIR$ac_delim
+GLADEDIR!$GLADEDIR$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -32219,21 +31271,22 @@
+@@ -30737,21 +31253,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -26252,7 +20543,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -32270,7 +31323,7 @@
+@@ -30788,7 +31305,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -26261,9 +20552,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/help/Makefile.in gnome-applets-2.22.0/cpufreq/help/Makefile.in
---- gnome-applets-2.22.0.old/cpufreq/help/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/help/Makefile.in 2008-03-17 21:34:25.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/cpufreq/help/Makefile.in gnome-applets-2.22.1/cpufreq/help/Makefile.in
+--- gnome-applets-2.22.1.old/cpufreq/help/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/cpufreq/help/Makefile.in 2008-04-19 20:59:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26275,99 +20566,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -819,6 +822,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -868,8 +876,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -887,6 +895,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -954,7 +968,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/Makefile.in gnome-applets-2.22.0/cpufreq/Makefile.in
---- gnome-applets-2.22.0.old/cpufreq/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/Makefile.in 2008-03-17 21:34:25.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/cpufreq/Makefile.in gnome-applets-2.22.1/cpufreq/Makefile.in
+--- gnome-applets-2.22.1.old/cpufreq/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/cpufreq/Makefile.in 2008-04-19 20:59:45.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26379,52 +20604,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -105,7 +104,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -107,6 +107,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -213,10 +214,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -218,6 +219,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -244,11 +248,10 @@
+@@ -245,6 +247,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -527,8 +530,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -526,8 +529,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26435,7 +20639,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -553,8 +556,8 @@
+@@ -552,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26446,7 +20650,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -564,13 +567,12 @@
+@@ -563,13 +566,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -26462,9 +20666,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.0/cpufreq/pixmaps/Makefile.in
---- gnome-applets-2.22.0.old/cpufreq/pixmaps/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/pixmaps/Makefile.in 2008-03-17 21:34:25.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.1/cpufreq/pixmaps/Makefile.in
+--- gnome-applets-2.22.1.old/cpufreq/pixmaps/Makefile.in 2008-04-08 00:16:24.000000000 +0200
++++ gnome-applets-2.22.1/cpufreq/pixmaps/Makefile.in 2008-04-19 20:59:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26476,54 +20680,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -88,7 +87,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -90,6 +90,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -196,10 +197,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -201,6 +202,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -227,11 +231,10 @@
+@@ -228,6 +230,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.0/cpufreq/src/cpufreq-selector/Makefile.in
---- gnome-applets-2.22.0.old/cpufreq/src/cpufreq-selector/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/src/cpufreq-selector/Makefile.in 2008-03-17 21:34:26.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.1/cpufreq/src/cpufreq-selector/Makefile.in
+--- gnome-applets-2.22.1.old/cpufreq/src/cpufreq-selector/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/cpufreq/src/cpufreq-selector/Makefile.in 2008-04-19 20:59:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26535,15 +20718,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -67,7 +66,7 @@
+@@ -67,7 +67,7 @@
cpufreq_selector_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(cpufreq_selector_LDFLAGS) $(LDFLAGS) -o $@
@@ -26552,44 +20727,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -115,7 +114,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -117,6 +117,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -223,10 +224,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -228,6 +229,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -254,11 +258,10 @@
+@@ -255,6 +257,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -389,8 +392,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -388,8 +391,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -26600,7 +20762,7 @@
else :; fi; \
done
-@@ -456,8 +459,8 @@
+@@ -455,8 +458,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26611,7 +20773,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -469,8 +472,8 @@
+@@ -468,8 +471,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26622,7 +20784,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -480,13 +483,12 @@
+@@ -479,13 +482,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -26638,9 +20800,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/src/Makefile.in gnome-applets-2.22.0/cpufreq/src/Makefile.in
---- gnome-applets-2.22.0.old/cpufreq/src/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/src/Makefile.in 2008-03-17 21:34:25.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/cpufreq/src/Makefile.in gnome-applets-2.22.1/cpufreq/src/Makefile.in
+--- gnome-applets-2.22.1.old/cpufreq/src/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/cpufreq/src/Makefile.in 2008-04-19 20:59:46.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26652,15 +20814,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -71,7 +70,7 @@
+@@ -71,7 +71,7 @@
am__DEPENDENCIES_1 =
cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -26669,44 +20823,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -129,7 +128,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -131,6 +131,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -237,10 +238,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -242,6 +243,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -268,11 +272,10 @@
+@@ -269,6 +271,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -411,8 +414,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -410,8 +413,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -26717,7 +20858,7 @@
else :; fi; \
done
-@@ -553,8 +556,8 @@
+@@ -552,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26728,7 +20869,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -579,8 +582,8 @@
+@@ -578,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26739,7 +20880,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -590,13 +593,12 @@
+@@ -589,13 +592,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -26755,9 +20896,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/depcomp gnome-applets-2.22.0/depcomp
---- gnome-applets-2.22.0.old/depcomp 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/depcomp 2008-03-17 21:34:34.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/depcomp gnome-applets-2.22.1/depcomp
+--- gnome-applets-2.22.1.old/depcomp 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/depcomp 2008-04-19 21:00:06.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -26822,9 +20963,9 @@
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/drivemount/help/Makefile.in gnome-applets-2.22.0/drivemount/help/Makefile.in
---- gnome-applets-2.22.0.old/drivemount/help/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/drivemount/help/Makefile.in 2008-03-17 21:34:26.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/drivemount/help/Makefile.in gnome-applets-2.22.1/drivemount/help/Makefile.in
+--- gnome-applets-2.22.1.old/drivemount/help/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/drivemount/help/Makefile.in 2008-04-19 20:59:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26836,99 +20977,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -815,6 +818,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -864,8 +872,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -883,6 +891,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -950,7 +964,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/drivemount/Makefile.in gnome-applets-2.22.0/drivemount/Makefile.in
---- gnome-applets-2.22.0.old/drivemount/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/drivemount/Makefile.in 2008-03-17 21:34:26.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/drivemount/Makefile.in gnome-applets-2.22.1/drivemount/Makefile.in
+--- gnome-applets-2.22.1.old/drivemount/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/drivemount/Makefile.in 2008-04-19 20:59:47.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26940,15 +21015,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -57,7 +56,7 @@
+@@ -57,7 +57,7 @@
drivemount_applet2_OBJECTS = $(am_drivemount_applet2_OBJECTS)
am__DEPENDENCIES_1 =
drivemount_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -26957,44 +21024,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -125,7 +124,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -127,6 +127,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -233,10 +234,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -238,6 +239,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -264,11 +268,10 @@
+@@ -265,6 +267,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -413,8 +416,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -412,8 +415,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -27005,7 +21059,7 @@
else :; fi; \
done
-@@ -599,8 +602,8 @@
+@@ -598,8 +601,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27016,7 +21070,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -625,8 +628,8 @@
+@@ -624,8 +627,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27027,7 +21081,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -636,13 +639,12 @@
+@@ -635,13 +638,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -27043,9 +21097,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/docs/Makefile.in gnome-applets-2.22.0/geyes/docs/Makefile.in
---- gnome-applets-2.22.0.old/geyes/docs/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/docs/Makefile.in 2008-03-17 21:34:27.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/geyes/docs/Makefile.in gnome-applets-2.22.1/geyes/docs/Makefile.in
+--- gnome-applets-2.22.1.old/geyes/docs/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/geyes/docs/Makefile.in 2008-04-19 20:59:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27057,99 +21111,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -810,6 +813,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -859,8 +867,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -878,6 +886,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -945,7 +959,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/Makefile.in gnome-applets-2.22.0/geyes/Makefile.in
---- gnome-applets-2.22.0.old/geyes/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/Makefile.in 2008-03-17 21:34:27.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/geyes/Makefile.in gnome-applets-2.22.1/geyes/Makefile.in
+--- gnome-applets-2.22.1.old/geyes/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/geyes/Makefile.in 2008-04-19 20:59:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27161,15 +21149,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -56,7 +55,7 @@
+@@ -56,7 +56,7 @@
geyes_applet2_OBJECTS = $(am_geyes_applet2_OBJECTS)
am__DEPENDENCIES_1 =
geyes_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -27178,44 +21158,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -124,7 +123,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -126,6 +126,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -232,10 +233,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -237,6 +238,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -263,11 +267,10 @@
+@@ -264,6 +266,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -423,8 +426,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -422,8 +425,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -27226,7 +21193,7 @@
else :; fi; \
done
-@@ -608,8 +611,8 @@
+@@ -607,8 +610,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27237,7 +21204,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -634,8 +637,8 @@
+@@ -633,8 +636,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27248,7 +21215,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -645,13 +648,12 @@
+@@ -644,13 +647,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -27264,9 +21231,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/themes/Makefile.in gnome-applets-2.22.0/geyes/themes/Makefile.in
---- gnome-applets-2.22.0.old/geyes/themes/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/themes/Makefile.in 2008-03-17 21:34:27.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/geyes/themes/Makefile.in gnome-applets-2.22.1/geyes/themes/Makefile.in
+--- gnome-applets-2.22.1.old/geyes/themes/Makefile.in 2008-04-08 00:16:25.000000000 +0200
++++ gnome-applets-2.22.1/geyes/themes/Makefile.in 2008-04-19 20:59:49.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27278,54 +21245,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -99,7 +98,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -101,6 +101,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,10 +208,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -212,6 +213,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -238,11 +242,10 @@
+@@ -239,6 +241,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/Makefile.in gnome-applets-2.22.0/gkb-new/Makefile.in
---- gnome-applets-2.22.0.old/gkb-new/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/Makefile.in 2008-03-17 21:34:27.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gkb-new/Makefile.in gnome-applets-2.22.1/gkb-new/Makefile.in
+--- gnome-applets-2.22.1.old/gkb-new/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gkb-new/Makefile.in 2008-04-19 20:59:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27337,52 +21283,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -91,7 +90,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -93,6 +93,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -199,10 +200,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -204,6 +205,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -230,11 +234,10 @@
+@@ -231,6 +233,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -424,8 +427,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -423,8 +426,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27393,7 +21318,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -450,8 +453,8 @@
+@@ -449,8 +452,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27404,7 +21329,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -461,13 +464,12 @@
+@@ -460,13 +463,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -27420,9 +21345,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.0/gkb-new/xmodmap/Makefile.in
---- gnome-applets-2.22.0.old/gkb-new/xmodmap/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/xmodmap/Makefile.in 2008-03-17 21:34:28.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.1/gkb-new/xmodmap/Makefile.in
+--- gnome-applets-2.22.1.old/gkb-new/xmodmap/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gkb-new/xmodmap/Makefile.in 2008-04-19 20:59:51.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27434,54 +21359,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -88,7 +87,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -90,6 +90,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -196,10 +197,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -201,6 +202,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -227,11 +231,10 @@
+@@ -228,6 +230,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.0/gkb-new/xmodmap.sun/Makefile.in
---- gnome-applets-2.22.0.old/gkb-new/xmodmap.sun/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/xmodmap.sun/Makefile.in 2008-03-17 21:34:28.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.1/gkb-new/xmodmap.sun/Makefile.in
+--- gnome-applets-2.22.1.old/gkb-new/xmodmap.sun/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gkb-new/xmodmap.sun/Makefile.in 2008-04-19 20:59:50.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27493,102 +21397,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -88,7 +87,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -90,6 +90,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -196,10 +197,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -201,6 +202,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -227,11 +231,10 @@
+@@ -228,6 +230,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gnome-doc-utils.make gnome-applets-2.22.0/gnome-doc-utils.make
---- gnome-applets-2.22.0.old/gnome-doc-utils.make 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/gnome-doc-utils.make 2008-03-17 21:34:02.000000000 +0100
-@@ -416,6 +416,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -466,8 +471,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
-
-@@ -486,6 +491,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -554,7 +565,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gswitchit/help/Makefile.in gnome-applets-2.22.0/gswitchit/help/Makefile.in
---- gnome-applets-2.22.0.old/gswitchit/help/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gswitchit/help/Makefile.in 2008-03-17 21:34:28.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gswitchit/help/Makefile.in gnome-applets-2.22.1/gswitchit/help/Makefile.in
+--- gnome-applets-2.22.1.old/gswitchit/help/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gswitchit/help/Makefile.in 2008-04-19 20:59:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27600,99 +21435,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -809,6 +812,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -858,8 +866,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -877,6 +885,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -944,7 +958,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gswitchit/Makefile.in gnome-applets-2.22.0/gswitchit/Makefile.in
---- gnome-applets-2.22.0.old/gswitchit/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gswitchit/Makefile.in 2008-03-17 21:34:28.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gswitchit/Makefile.in gnome-applets-2.22.1/gswitchit/Makefile.in
+--- gnome-applets-2.22.1.old/gswitchit/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gswitchit/Makefile.in 2008-04-19 20:59:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27704,15 +21473,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -72,7 +71,7 @@
+@@ -72,7 +72,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(gnome_keyboard_applet_CFLAGS) $(CFLAGS) \
$(gnome_keyboard_applet_LDFLAGS) $(LDFLAGS) -o $@
@@ -27721,44 +21482,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -143,7 +142,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -145,6 +145,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -251,10 +252,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -256,6 +257,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -282,11 +286,10 @@
+@@ -283,6 +285,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -451,8 +454,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -450,8 +453,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -27769,7 +21517,7 @@
else :; fi; \
done
-@@ -681,8 +684,8 @@
+@@ -680,8 +683,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27780,7 +21528,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -707,8 +710,8 @@
+@@ -706,8 +709,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27791,7 +21539,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -718,13 +721,12 @@
+@@ -717,13 +720,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -27807,9 +21555,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gweather/docs/Makefile.in gnome-applets-2.22.0/gweather/docs/Makefile.in
---- gnome-applets-2.22.0.old/gweather/docs/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gweather/docs/Makefile.in 2008-03-17 21:34:29.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gweather/docs/Makefile.in gnome-applets-2.22.1/gweather/docs/Makefile.in
+--- gnome-applets-2.22.1.old/gweather/docs/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gweather/docs/Makefile.in 2008-04-19 20:59:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27821,99 +21569,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -824,6 +827,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -873,8 +881,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -892,6 +900,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -959,7 +973,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gweather/Makefile.in gnome-applets-2.22.0/gweather/Makefile.in
---- gnome-applets-2.22.0.old/gweather/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gweather/Makefile.in 2008-03-17 21:34:29.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/gweather/Makefile.in gnome-applets-2.22.1/gweather/Makefile.in
+--- gnome-applets-2.22.1.old/gweather/Makefile.in 2008-04-08 00:16:26.000000000 +0200
++++ gnome-applets-2.22.1/gweather/Makefile.in 2008-04-19 20:59:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27925,61 +21607,40 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -60,7 +59,7 @@
+@@ -60,7 +60,7 @@
gweather_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -127,7 +126,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -129,6 +129,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -235,10 +236,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -240,6 +241,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -266,11 +270,10 @@
+@@ -267,6 +269,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -423,8 +426,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -418,8 +421,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -27990,7 +21651,7 @@
else :; fi; \
done
-@@ -595,8 +598,8 @@
+@@ -589,8 +592,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28001,7 +21662,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -621,8 +624,8 @@
+@@ -615,8 +618,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28012,7 +21673,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -632,13 +635,12 @@
+@@ -626,13 +629,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -28028,9 +21689,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/install-sh gnome-applets-2.22.0/install-sh
---- gnome-applets-2.22.0.old/install-sh 2008-03-10 06:54:34.000000000 +0100
-+++ gnome-applets-2.22.0/install-sh 2008-03-17 21:34:21.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/install-sh gnome-applets-2.22.1/install-sh
+--- gnome-applets-2.22.1.old/install-sh 2008-04-08 00:16:23.000000000 +0200
++++ gnome-applets-2.22.1/install-sh 2008-04-19 20:59:42.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -28393,345 +22054,66 @@
trap '' 0
fi
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-extract.in gnome-applets-2.22.0/intltool-extract.in
---- gnome-applets-2.22.0.old/intltool-extract.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-extract.in 2008-03-17 21:34:02.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/intltool-extract.in gnome-applets-2.22.1/intltool-extract.in
+--- gnome-applets-2.22.1.old/intltool-extract.in 2008-04-08 00:16:12.000000000 +0200
++++ gnome-applets-2.22.1/intltool-extract.in 2008-04-19 20:59:26.000000000 +0200
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
--my $VERSION = "0.36.2";
+-my $VERSION = "0.37.0";
+my $VERSION = "0.37.1";
## Loaded modules
use strict;
-@@ -161,7 +161,8 @@
- --type=TYPE Specify the file type of FILENAME. Currently supports:
- "gettext/glade", "gettext/ini", "gettext/keys"
- "gettext/rfc822deb", "gettext/schemas",
-- "gettext/scheme", "gettext/xml", "gettext/quoted"
-+ "gettext/scheme", "gettext/xml", "gettext/quoted",
-+ "gettext/quotedxml"
- -l, --local Writes output into current working directory
- (conflicts with --update)
- --update Writes output into the same directory the source file
-@@ -218,6 +219,7 @@
- &type_schemas if $gettext_type eq "schemas";
- &type_rfc822deb if $gettext_type eq "rfc822deb";
- &type_quoted if $gettext_type eq "quoted";
-+ &type_quotedxml if $gettext_type eq "quotedxml";
- }
-
- sub entity_decode_minimal
-@@ -731,6 +733,18 @@
+@@ -764,7 +764,7 @@
}
- }
-
-+sub type_quotedxml {
-+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
-+ my $message = $1;
-+ my $before = $`;
-+ $message =~ s/\\\"/\"/g;
-+ $message = entity_decode($message);
-+ $before =~ s/[^\n]//g;
-+ $messages{$message} = [];
-+ $loc{$message} = length ($before) + 2;
-+ }
-+}
-+
- sub type_glade {
- ### For translatable Glade XML files ###
-
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-merge.in gnome-applets-2.22.0/intltool-merge.in
---- gnome-applets-2.22.0.old/intltool-merge.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-merge.in 2008-03-17 21:34:02.000000000 +0100
+
+ ## handle new glade files
+- while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
++ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
+ $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
+ if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
+ $comments{entity_decode($3)} = entity_decode($2) ;
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/intltool-merge.in gnome-applets-2.22.1/intltool-merge.in
+--- gnome-applets-2.22.1.old/intltool-merge.in 2008-04-08 00:16:12.000000000 +0200
++++ gnome-applets-2.22.1/intltool-merge.in 2008-04-19 20:59:26.000000000 +0200
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
--my $VERSION = "0.36.2";
+-my $VERSION = "0.37.0";
+my $VERSION = "0.37.1";
## Loaded modules
use strict;
-@@ -61,6 +61,7 @@
- my $SCHEMAS_STYLE_ARG = 0;
- my $RFC822DEB_STYLE_ARG = 0;
- my $QUOTED_STYLE_ARG = 0;
-+my $QUOTEDXML_STYLE_ARG = 0;
- my $QUIET_ARG = 0;
- my $PASS_THROUGH_ARG = 0;
- my $UTF8_ARG = 0;
-@@ -81,6 +82,7 @@
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "quoted-style" => \$QUOTED_STYLE_ARG,
-+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "multiple-output|m" => \$MULTIPLE_OUTPUT,
-@@ -148,7 +150,7 @@
- &utf8_sanity_check;
- &preparation;
- &print_message;
-- &keys_merge_translations;
-+ &keys_merge_translations;
- &finalize;
- }
- elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-@@ -174,12 +176,12 @@
- &rfc822deb_merge_translations;
- &finalize;
- }
--elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
-+elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
- {
- &utf8_sanity_check;
- &preparation;
- &print_message;
-- "ed_merge_translations;
-+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
- &finalize;
- }
- else
-@@ -219,6 +221,7 @@
- -s, --schemas-style includes translations in the schemas style
- -r, --rfc822deb-style includes translations in the RFC822 style
- --quoted-style includes translations in the quoted string style
-+ --quotedxml-style includes translations in the quoted xml string style
- -x, --xml-style includes translations in the standard xml style
-
- Other options:
-@@ -292,10 +295,9 @@
- {
- next if /^#/;
-
-- if (/([-a-zA-Z_ at .]+)\n/)
-+ for my $lang (split)
- {
-- my $lang = $1;
--
-+ chomp ($lang);
- my $po_file = $PO_DIR . "/" . $lang . ".po";
- if (-e $po_file) {
- $po_files_by_lang{$lang} = $po_file;
-@@ -576,6 +578,7 @@
- return "&" if $_ == 38;
- return "'" if $_ == 39;
- return "<" if $_ == 60;
-+ return ">" if $_ == 62;
- return chr $_;
- }
-
-@@ -1076,43 +1079,74 @@
- close OUTPUT;
- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
- }
-- }
-- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-- binmode (OUTPUT) if $^O eq 'MSWin32';
-- my $tree = readXml($FILE);
-- print_header($FILE, \*OUTPUT);
-- parseTree(\*OUTPUT, $tree);
-- close OUTPUT;
-- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-+ if ( ! -d "C" ) {
-+ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
-+ }
-+ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
-+ binmode (OUTPUT) if $^O eq 'MSWin32';
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree);
-+ close OUTPUT;
-+ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
-+ } else {
-+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-+ binmode (OUTPUT) if $^O eq 'MSWin32';
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree);
-+ close OUTPUT;
-+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-+ }
- }
-
--sub keys_merge_translations
-+sub keys_merge_translation
- {
-- open INPUT, "<${FILE}" or die;
-- open OUTPUT, ">${OUTFILE}" or die;
-+ my ($lang) = @_;
-+
-+ if ( ! -d $lang && $MULTIPLE_OUTPUT)
-+ {
-+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-+ }
-+
-+ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
-+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
-
-- while (<INPUT>)
-+ while (<INPUT>)
- {
-- if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
- {
-- my $string = $3;
-+ my $string = $3;
-
-- print OUTPUT;
-+ if (!$MULTIPLE_OUTPUT)
-+ {
-+ print OUTPUT;
-
-- my $non_translated_line = $_;
-+ my $non_translated_line = $_;
-
-- for my $lang (sort keys %po_files_by_lang)
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/[$lang]$1=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
- {
-- my $translation = $translations{$lang, $string};
-- next if !$translation;
-+ my $non_translated_line = $_;
-+ my $translation = $translations{$lang, $string};
-+ $translation = $string if !$translation;
-
- $_ = $non_translated_line;
-- s/(\w+)=.*/[$lang]$1=$translation/;
-+ s/(\w+)=.*/$1=$translation/;
- print OUTPUT;
- }
-- }
-- else
-+ }
-+ else
- {
- print OUTPUT;
- }
-@@ -1120,6 +1154,24 @@
-
- close OUTPUT;
- close INPUT;
-+
-+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub keys_merge_translations
-+{
-+ if ($MULTIPLE_OUTPUT)
-+ {
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ keys_merge_translation ($lang);
-+ }
-+ keys_merge_translation ("C");
-+ }
-+ else
-+ {
-+ keys_merge_translation (".");
-+ }
- }
-
- sub desktop_merge_translations
-@@ -1415,19 +1467,22 @@
-
- sub quoted_translation
- {
-- my ($lang, $string) = @_;
-+ my ($xml_mode, $lang, $string) = @_;
-
-+ $string = entity_decode($string) if $xml_mode;
- $string =~ s/\\\"/\"/g;
-
- my $translation = $translations{$lang, $string};
- $translation = $string if !$translation;
--
-+ $translation = entity_encode($translation) if $xml_mode;
- $translation =~ s/\"/\\\"/g;
- return $translation
- }
-
- sub quoted_merge_translations
- {
-+ my ($xml_mode) = @_;
-+
- if (!$MULTIPLE_OUTPUT) {
- print "Quoted only supports Multiple Output.\n";
- exit(1);
-@@ -1442,7 +1497,7 @@
- binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
- {
-- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
-+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
- print OUTPUT;
- }
- close OUTPUT;
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-update.in gnome-applets-2.22.0/intltool-update.in
---- gnome-applets-2.22.0.old/intltool-update.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-update.in 2008-03-17 21:34:02.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/intltool-update.in gnome-applets-2.22.1/intltool-update.in
+--- gnome-applets-2.22.1.old/intltool-update.in 2008-04-08 00:16:12.000000000 +0200
++++ gnome-applets-2.22.1/intltool-update.in 2008-04-19 20:59:26.000000000 +0200
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
--my $VERSION = "0.36.2";
+-my $VERSION = "0.37.0";
+my $VERSION = "0.37.1";
my $PACKAGE = "intltool";
## Loaded modules
-@@ -334,7 +334,7 @@
- push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
- push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
- push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-- }, "$SRCDIR/..";
-+ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
-
- open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
- @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -434,8 +434,8 @@
- last;
- }
-
-- ## N_ Q_ and _ are the three macros defined in gi8n.h
-- if (/[NQ]?_ *\(QUOTEDTEXT/)
-+ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
-+ if (/[CNQ]?_ *\(QUOTEDTEXT/)
- {
- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
- ## Remove the first 3 chars and add newline
-@@ -777,7 +777,7 @@
- my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
- push @xgettext_argument, $XGETTEXT_KEYWORDS;
- my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
-+ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
- push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
- push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
- my $xgettext_command = join ' ', @xgettext_argument;
-@@ -1118,6 +1118,8 @@
- close IN;
- }
-
-+ # unwrap lines split with a trailing \
-+ $make_source =~ s/\\ $ \n/ /mxg;
- $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
-
- return $keywords;
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.0/invest-applet/data/art/Makefile.in
---- gnome-applets-2.22.0.old/invest-applet/data/art/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/data/art/Makefile.in 2008-03-17 21:34:29.000000000 +0100
+@@ -124,7 +124,10 @@
+
+ &Console_Write_IntltoolHelp if $arg_count > 1;
+
+-my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown";
++my $PKGNAME = FindPackageName ();
++
++# --version and --help don't require a module name
++my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+
+ if ($POT_ARG)
+ {
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.1/invest-applet/data/art/Makefile.in
+--- gnome-applets-2.22.1.old/invest-applet/data/art/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/invest-applet/data/art/Makefile.in 2008-04-19 20:59:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28743,54 +22125,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -89,7 +88,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -91,6 +91,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -197,10 +198,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -202,6 +203,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -228,11 +232,10 @@
+@@ -229,6 +231,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/data/Makefile.in gnome-applets-2.22.0/invest-applet/data/Makefile.in
---- gnome-applets-2.22.0.old/invest-applet/data/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/data/Makefile.in 2008-03-17 21:34:29.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/invest-applet/data/Makefile.in gnome-applets-2.22.1/invest-applet/data/Makefile.in
+--- gnome-applets-2.22.1.old/invest-applet/data/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/invest-applet/data/Makefile.in 2008-04-19 20:59:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28802,52 +22163,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -533,8 +536,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -532,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28858,7 +22198,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -559,8 +562,8 @@
+@@ -558,8 +561,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28869,7 +22209,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -570,13 +573,12 @@
+@@ -569,13 +572,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -28885,9 +22225,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/invest/Makefile.in gnome-applets-2.22.0/invest-applet/invest/Makefile.in
---- gnome-applets-2.22.0.old/invest-applet/invest/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/invest/Makefile.in 2008-03-17 21:34:30.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/invest-applet/invest/Makefile.in gnome-applets-2.22.1/invest-applet/invest/Makefile.in
+--- gnome-applets-2.22.1.old/invest-applet/invest/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/invest-applet/invest/Makefile.in 2008-04-19 20:59:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28899,54 +22239,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -93,7 +92,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -95,6 +95,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -201,10 +202,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -206,6 +207,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -232,11 +236,10 @@
+@@ -233,6 +235,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/Makefile.in gnome-applets-2.22.0/invest-applet/Makefile.in
---- gnome-applets-2.22.0.old/invest-applet/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/Makefile.in 2008-03-17 21:34:29.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/invest-applet/Makefile.in gnome-applets-2.22.1/invest-applet/Makefile.in
+--- gnome-applets-2.22.1.old/invest-applet/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/invest-applet/Makefile.in 2008-04-19 20:59:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28958,52 +22277,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,7 +37,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -90,7 +89,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -92,6 +92,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -198,10 +199,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -203,6 +204,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -229,11 +233,10 @@
+@@ -230,6 +232,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -421,8 +424,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -420,8 +423,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29014,7 +22312,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -447,8 +450,8 @@
+@@ -446,8 +449,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29025,7 +22323,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -458,13 +461,12 @@
+@@ -457,13 +460,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -29041,9 +22339,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/ltmain.sh gnome-applets-2.22.0/ltmain.sh
---- gnome-applets-2.22.0.old/ltmain.sh 2007-06-02 07:47:43.000000000 +0200
-+++ gnome-applets-2.22.0/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/ltmain.sh gnome-applets-2.22.1/ltmain.sh
+--- gnome-applets-2.22.1.old/ltmain.sh 2008-03-05 16:01:59.000000000 +0100
++++ gnome-applets-2.22.1/ltmain.sh 2008-04-05 19:05:47.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -29061,7 +22359,7 @@
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-1"
++VERSION="1.5.26 Debian 1.5.26-3"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-# See if we are running on zsh, and set the options which allow our
@@ -29701,47 +22999,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/m4/gnome-doc-utils.m4 gnome-applets-2.22.0/m4/gnome-doc-utils.m4
---- gnome-applets-2.22.0.old/m4/gnome-doc-utils.m4 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/m4/gnome-doc-utils.m4 2008-03-17 21:34:02.000000000 +0100
-@@ -26,6 +26,10 @@
- enable_scrollkeeper=yes)
- AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-
-+dnl disable scrollkeeper automatically for distcheck
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-+
- AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
- ])
-
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/m4/intltool.m4 gnome-applets-2.22.0/m4/intltool.m4
---- gnome-applets-2.22.0.old/m4/intltool.m4 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/m4/intltool.m4 2008-03-17 21:34:02.000000000 +0100
-@@ -87,6 +87,20 @@
- AC_SUBST(INTLTOOL_SERVICE_RULE)
- AC_SUBST(INTLTOOL_POLICY_RULE)
-
-+# Check the gettext tools to make sure they are GNU
-+AC_PATH_PROG(XGETTEXT, xgettext)
-+AC_PATH_PROG(MSGMERGE, msgmerge)
-+AC_PATH_PROG(MSGFMT, msgfmt)
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+
- # Use the tools built into the package, not the ones that are installed.
- AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
- AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/Makefile.in gnome-applets-2.22.0/Makefile.in
---- gnome-applets-2.22.0.old/Makefile.in 2008-03-10 06:54:42.000000000 +0100
-+++ gnome-applets-2.22.0/Makefile.in 2008-03-17 21:34:34.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/Makefile.in gnome-applets-2.22.1/Makefile.in
+--- gnome-applets-2.22.1.old/Makefile.in 2008-04-08 00:16:30.000000000 +0200
++++ gnome-applets-2.22.1/Makefile.in 2008-04-19 21:00:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29753,64 +23013,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -104,7 +103,11 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = \
-+ --disable-scrollkeeper
-+
+@@ -108,6 +108,7 @@
+ --disable-scrollkeeper
+
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -212,10 +215,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -219,6 +220,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -243,11 +249,10 @@
+@@ -246,6 +248,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -397,9 +402,6 @@
- omf.make \
- gnome-doc-utils.make
-
--DISTCHECK_CONFIGURE_FLAGS = \
-- --disable-scrollkeeper
--
-
- # hack from sound-juicer to get around scrollkeeper's leaving a big
- # mess behind.
-@@ -552,8 +554,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -550,8 +553,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29821,7 +23048,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -578,8 +580,8 @@
+@@ -576,8 +579,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29832,7 +23059,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -589,13 +591,12 @@
+@@ -587,13 +590,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -29848,7 +23075,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -666,6 +667,10 @@
+@@ -664,6 +666,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -29859,7 +23086,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -692,6 +697,8 @@
+@@ -690,6 +696,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -29868,7 +23095,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -844,8 +851,8 @@
+@@ -842,8 +850,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
@@ -29879,9 +23106,9 @@
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/man/Makefile.in gnome-applets-2.22.0/man/Makefile.in
---- gnome-applets-2.22.0.old/man/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/man/Makefile.in 2008-03-17 21:34:30.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/man/Makefile.in gnome-applets-2.22.1/man/Makefile.in
+--- gnome-applets-2.22.1.old/man/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/man/Makefile.in 2008-04-19 21:00:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29893,54 +23120,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,7 +37,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -82,7 +81,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -84,6 +84,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -190,10 +191,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -195,6 +196,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -221,11 +225,10 @@
+@@ -222,6 +224,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/help/Makefile.in gnome-applets-2.22.0/mini-commander/help/Makefile.in
---- gnome-applets-2.22.0.old/mini-commander/help/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/help/Makefile.in 2008-03-17 21:34:30.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/mini-commander/help/Makefile.in gnome-applets-2.22.1/mini-commander/help/Makefile.in
+--- gnome-applets-2.22.1.old/mini-commander/help/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/mini-commander/help/Makefile.in 2008-04-19 21:00:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29952,99 +23158,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -813,6 +816,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -862,8 +870,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -881,6 +889,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -948,7 +962,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/Makefile.in gnome-applets-2.22.0/mini-commander/Makefile.in
---- gnome-applets-2.22.0.old/mini-commander/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/Makefile.in 2008-03-17 21:34:30.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/mini-commander/Makefile.in gnome-applets-2.22.1/mini-commander/Makefile.in
+--- gnome-applets-2.22.1.old/mini-commander/Makefile.in 2008-04-08 00:16:27.000000000 +0200
++++ gnome-applets-2.22.1/mini-commander/Makefile.in 2008-04-19 21:00:00.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30056,52 +23196,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -100,7 +99,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -102,6 +102,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -208,10 +209,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -213,6 +214,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -239,11 +243,10 @@
+@@ -240,6 +242,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -457,8 +460,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -456,8 +459,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30112,7 +23231,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -483,8 +486,8 @@
+@@ -482,8 +485,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30123,7 +23242,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -494,13 +497,12 @@
+@@ -493,13 +496,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30139,9 +23258,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/src/Makefile.in gnome-applets-2.22.0/mini-commander/src/Makefile.in
---- gnome-applets-2.22.0.old/mini-commander/src/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/src/Makefile.in 2008-03-17 21:34:31.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/mini-commander/src/Makefile.in gnome-applets-2.22.1/mini-commander/src/Makefile.in
+--- gnome-applets-2.22.1.old/mini-commander/src/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/mini-commander/src/Makefile.in 2008-04-19 21:00:01.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30153,15 +23272,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -68,7 +67,7 @@
+@@ -68,7 +68,7 @@
mini_commander_applet_OBJECTS = $(am_mini_commander_applet_OBJECTS)
mini_commander_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -30170,44 +23281,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -131,7 +130,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -133,6 +133,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -239,10 +240,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -244,6 +245,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -270,11 +274,10 @@
+@@ -271,6 +273,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -454,8 +457,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -453,8 +456,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30218,7 +23316,7 @@
else :; fi; \
done
-@@ -482,8 +485,8 @@
+@@ -481,8 +484,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30229,7 +23327,7 @@
else :; fi; \
done
-@@ -642,8 +645,8 @@
+@@ -641,8 +644,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30240,7 +23338,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -655,8 +658,8 @@
+@@ -654,8 +657,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30251,7 +23349,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -666,13 +669,12 @@
+@@ -665,13 +668,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30267,9 +23365,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mixer/docs/Makefile.in gnome-applets-2.22.0/mixer/docs/Makefile.in
---- gnome-applets-2.22.0.old/mixer/docs/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/mixer/docs/Makefile.in 2008-03-17 21:34:31.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/mixer/docs/Makefile.in gnome-applets-2.22.1/mixer/docs/Makefile.in
+--- gnome-applets-2.22.1.old/mixer/docs/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/mixer/docs/Makefile.in 2008-04-19 21:00:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30281,99 +23379,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -810,6 +813,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -859,8 +867,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -878,6 +886,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -945,7 +959,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mixer/Makefile.in gnome-applets-2.22.0/mixer/Makefile.in
---- gnome-applets-2.22.0.old/mixer/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/mixer/Makefile.in 2008-03-17 21:34:31.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/mixer/Makefile.in gnome-applets-2.22.1/mixer/Makefile.in
+--- gnome-applets-2.22.1.old/mixer/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/mixer/Makefile.in 2008-04-19 21:00:02.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30385,15 +23417,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -42,7 +42,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -59,7 +58,7 @@
+@@ -59,7 +59,7 @@
am__DEPENDENCIES_1 =
mixer_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -30402,44 +23426,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -128,7 +127,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -130,6 +130,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -236,10 +237,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -241,6 +242,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -267,11 +271,10 @@
+@@ -268,6 +270,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -423,8 +426,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -422,8 +425,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30450,7 +23461,7 @@
else :; fi; \
done
-@@ -610,8 +613,8 @@
+@@ -609,8 +612,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30461,7 +23472,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -636,8 +639,8 @@
+@@ -635,8 +638,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30472,7 +23483,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -647,13 +650,12 @@
+@@ -646,13 +649,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30488,9 +23499,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/modemlights/Makefile.in gnome-applets-2.22.0/modemlights/Makefile.in
---- gnome-applets-2.22.0.old/modemlights/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/modemlights/Makefile.in 2008-03-17 21:34:31.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/modemlights/Makefile.in gnome-applets-2.22.1/modemlights/Makefile.in
+--- gnome-applets-2.22.1.old/modemlights/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/modemlights/Makefile.in 2008-04-19 21:00:03.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30502,15 +23513,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -43,7 +43,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -59,7 +58,7 @@
+@@ -59,7 +59,7 @@
am__DEPENDENCIES_1 =
modem_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -30519,52 +23522,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -117,7 +116,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -119,6 +119,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -225,10 +226,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -230,6 +231,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -256,11 +260,10 @@
+@@ -257,6 +259,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -335,6 +338,7 @@
- top_srcdir = @top_srcdir@
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(MODEMLIGHTS_CFLAGS) \
- $(LIBGLADE_CFLAGS)
-
- modem_applet_SOURCES = \
-@@ -409,8 +413,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -408,8 +411,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30575,7 +23557,7 @@
else :; fi; \
done
-@@ -523,8 +527,8 @@
+@@ -522,8 +525,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30586,7 +23568,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -536,8 +540,8 @@
+@@ -535,8 +538,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30597,7 +23579,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -547,13 +551,12 @@
+@@ -546,13 +549,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30613,9 +23595,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/multiload/docs/Makefile.in gnome-applets-2.22.0/multiload/docs/Makefile.in
---- gnome-applets-2.22.0.old/multiload/docs/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/multiload/docs/Makefile.in 2008-03-17 21:34:32.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/multiload/docs/Makefile.in gnome-applets-2.22.1/multiload/docs/Makefile.in
+--- gnome-applets-2.22.1.old/multiload/docs/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/multiload/docs/Makefile.in 2008-04-19 21:00:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30627,99 +23609,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -813,6 +816,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -862,8 +870,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -881,6 +889,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -948,7 +962,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/multiload/Makefile.in gnome-applets-2.22.0/multiload/Makefile.in
---- gnome-applets-2.22.0.old/multiload/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/multiload/Makefile.in 2008-03-17 21:34:32.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/multiload/Makefile.in gnome-applets-2.22.1/multiload/Makefile.in
+--- gnome-applets-2.22.1.old/multiload/Makefile.in 2008-04-08 00:16:28.000000000 +0200
++++ gnome-applets-2.22.1/multiload/Makefile.in 2008-04-19 21:00:04.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30731,15 +23647,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -60,7 +59,7 @@
+@@ -60,7 +60,7 @@
multiload_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -30748,44 +23656,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -128,7 +127,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -130,6 +130,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -236,10 +237,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -241,6 +242,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -267,11 +271,10 @@
+@@ -268,6 +270,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -425,8 +428,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -424,8 +427,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30796,7 +23691,7 @@
else :; fi; \
done
-@@ -613,8 +616,8 @@
+@@ -612,8 +615,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30807,7 +23702,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -639,8 +642,8 @@
+@@ -638,8 +641,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30818,7 +23713,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -650,13 +653,12 @@
+@@ -649,13 +652,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30834,9 +23729,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/null_applet/Makefile.in gnome-applets-2.22.0/null_applet/Makefile.in
---- gnome-applets-2.22.0.old/null_applet/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/null_applet/Makefile.in 2008-03-17 21:34:32.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/null_applet/Makefile.in gnome-applets-2.22.1/null_applet/Makefile.in
+--- gnome-applets-2.22.1.old/null_applet/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/null_applet/Makefile.in 2008-04-19 21:00:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30848,15 +23743,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -55,7 +54,7 @@
+@@ -55,7 +55,7 @@
null_applet_OBJECTS = $(am_null_applet_OBJECTS)
am__DEPENDENCIES_1 =
null_applet_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -30865,44 +23752,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,7 +110,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -113,6 +113,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -219,10 +220,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -224,6 +225,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -250,11 +254,10 @@
+@@ -251,6 +253,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -391,8 +394,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -390,8 +393,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -30913,7 +23787,7 @@
else :; fi; \
done
-@@ -471,8 +474,8 @@
+@@ -470,8 +473,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30924,7 +23798,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -484,8 +487,8 @@
+@@ -483,8 +486,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30935,7 +23809,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -495,13 +498,12 @@
+@@ -494,13 +497,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -30951,35 +23825,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/po/Makefile.in.in gnome-applets-2.22.0/po/Makefile.in.in
---- gnome-applets-2.22.0.old/po/Makefile.in.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/po/Makefile.in.in 2008-03-17 21:34:02.000000000 +0100
-@@ -1,10 +1,10 @@
- # Makefile for program source directory in GNU NLS utilities package.
- # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
- #
--# This file file be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
- # but which still want to provide support for the GNU gettext functionality.
--# Please note that the actual code is *not* freely available.
- #
- # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
- # instead of PACKAGE and to look for po2tbl in ./ not in intl/
-@@ -12,7 +12,7 @@
- # - Modified by jacob berkman <jacob at ximian.com> to install
- # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
- #
--# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
-+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
- #
- # We have the following line for use by intltoolize:
- # INTLTOOL_MAKEFILE
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/data/Makefile.in gnome-applets-2.22.0/stickynotes/data/Makefile.in
---- gnome-applets-2.22.0.old/stickynotes/data/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/data/Makefile.in 2008-03-17 21:34:33.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/stickynotes/data/Makefile.in gnome-applets-2.22.1/stickynotes/data/Makefile.in
+--- gnome-applets-2.22.1.old/stickynotes/data/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/stickynotes/data/Makefile.in 2008-04-19 21:00:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30991,54 +23839,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -91,7 +90,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -93,6 +93,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -199,10 +200,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -204,6 +205,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -230,11 +234,10 @@
+@@ -231,6 +233,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/docs/Makefile.in gnome-applets-2.22.0/stickynotes/docs/Makefile.in
---- gnome-applets-2.22.0.old/stickynotes/docs/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/docs/Makefile.in 2008-03-17 21:34:33.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/stickynotes/docs/Makefile.in gnome-applets-2.22.1/stickynotes/docs/Makefile.in
+--- gnome-applets-2.22.1.old/stickynotes/docs/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/stickynotes/docs/Makefile.in 2008-04-19 21:00:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31050,99 +23877,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -815,6 +818,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -864,8 +872,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -883,6 +891,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -950,7 +964,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/Makefile.in gnome-applets-2.22.0/stickynotes/Makefile.in
---- gnome-applets-2.22.0.old/stickynotes/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/Makefile.in 2008-03-17 21:34:32.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/stickynotes/Makefile.in gnome-applets-2.22.1/stickynotes/Makefile.in
+--- gnome-applets-2.22.1.old/stickynotes/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/stickynotes/Makefile.in 2008-04-19 21:00:05.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31154,15 +23915,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -42,7 +42,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -71,7 +70,7 @@
+@@ -71,7 +71,7 @@
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1)
@@ -31171,44 +23924,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -140,7 +139,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -142,6 +142,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -248,10 +249,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -253,6 +254,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -279,11 +283,10 @@
+@@ -280,6 +282,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -442,8 +445,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -441,8 +444,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -31219,7 +23959,7 @@
else :; fi; \
done
-@@ -647,8 +650,8 @@
+@@ -646,8 +649,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31230,7 +23970,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -673,8 +676,8 @@
+@@ -672,8 +675,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31241,7 +23981,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -684,13 +687,12 @@
+@@ -683,13 +686,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -31257,9 +23997,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.0/stickynotes/pixmaps/Makefile.in
---- gnome-applets-2.22.0.old/stickynotes/pixmaps/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/pixmaps/Makefile.in 2008-03-17 21:34:33.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.1/stickynotes/pixmaps/Makefile.in
+--- gnome-applets-2.22.1.old/stickynotes/pixmaps/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/stickynotes/pixmaps/Makefile.in 2008-04-19 21:00:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31271,54 +24011,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -88,7 +87,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -90,6 +90,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -196,10 +197,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -201,6 +202,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -227,11 +231,10 @@
+@@ -228,6 +230,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/docs/Makefile.in gnome-applets-2.22.0/trashapplet/docs/Makefile.in
---- gnome-applets-2.22.0.old/trashapplet/docs/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/docs/Makefile.in 2008-03-17 21:34:33.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/trashapplet/docs/Makefile.in gnome-applets-2.22.1/trashapplet/docs/Makefile.in
+--- gnome-applets-2.22.1.old/trashapplet/docs/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/trashapplet/docs/Makefile.in 2008-04-19 21:00:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31330,99 +24049,33 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -103,7 +102,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -105,6 +105,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,10 +212,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -216,6 +217,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -242,11 +246,10 @@
+@@ -243,6 +245,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -810,6 +813,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -859,8 +867,8 @@
-
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-@@ -878,6 +886,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -945,7 +959,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
- fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/Makefile.in gnome-applets-2.22.0/trashapplet/Makefile.in
---- gnome-applets-2.22.0.old/trashapplet/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/Makefile.in 2008-03-17 21:34:33.000000000 +0100
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/trashapplet/Makefile.in gnome-applets-2.22.1/trashapplet/Makefile.in
+--- gnome-applets-2.22.1.old/trashapplet/Makefile.in 2008-04-08 00:16:29.000000000 +0200
++++ gnome-applets-2.22.1/trashapplet/Makefile.in 2008-04-19 21:00:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31434,52 +24087,31 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -104,7 +103,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -106,6 +106,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -212,10 +213,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -217,6 +218,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -243,11 +247,10 @@
+@@ -244,6 +246,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -500,8 +503,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -499,8 +502,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31490,7 +24122,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -526,8 +529,8 @@
+@@ -525,8 +528,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31501,7 +24133,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -537,13 +540,12 @@
+@@ -536,13 +539,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -31517,9 +24149,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/src/Makefile.in gnome-applets-2.22.0/trashapplet/src/Makefile.in
---- gnome-applets-2.22.0.old/trashapplet/src/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/src/Makefile.in 2008-03-17 21:34:34.000000000 +0100
+diff -x'*config.guess' -x'*config.sub' -Naur gnome-applets-2.22.1.old/trashapplet/src/Makefile.in gnome-applets-2.22.1/trashapplet/src/Makefile.in
+--- gnome-applets-2.22.1.old/trashapplet/src/Makefile.in 2008-04-08 00:16:30.000000000 +0200
++++ gnome-applets-2.22.1/trashapplet/src/Makefile.in 2008-04-19 21:00:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31531,15 +24163,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -54,7 +53,7 @@
+@@ -54,7 +54,7 @@
trashapplet_OBJECTS = $(am_trashapplet_OBJECTS)
am__DEPENDENCIES_1 =
trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -31548,44 +24172,31 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -102,7 +101,9 @@
- DBUS_LIBS = @DBUS_LIBS@
- DEFS = @DEFS@
+@@ -104,6 +104,7 @@
DEPDIR = @DEPDIR@
-+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -210,10 +211,13 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
+@@ -215,6 +216,7 @@
MSGFMT_OPTS = @MSGFMT_OPTS@
-+MSGMERGE = @MSGMERGE@
+ MSGMERGE = @MSGMERGE@
NEED_LIBAPM = @NEED_LIBAPM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
PACKAGE = @PACKAGE@
-@@ -241,11 +245,10 @@
+@@ -242,6 +244,7 @@
RANLIB = @RANLIB@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -375,8 +378,8 @@
+ STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+@@ -374,8 +377,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -31596,7 +24207,7 @@
else :; fi; \
done
-@@ -440,8 +443,8 @@
+@@ -439,8 +442,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31607,7 +24218,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -453,8 +456,8 @@
+@@ -452,8 +455,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31618,7 +24229,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -464,13 +467,12 @@
+@@ -463,13 +466,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
More information about the pkg-gnome-commits
mailing list