r22459 - in /desktop/unstable/gnome-panel/debian: changelog control patches/10_clock_applet_link_gnome_desktop.patch patches/70_relibtoolize.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Nov 27 12:42:44 UTC 2009
Author: pochu
Date: Fri Nov 27 12:42:44 2009
New Revision: 22459
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22459
Log:
* debian/patches/10_clock_applet_link_gnome_desktop.patch:
- Patch from upstream git, make the clock applet link against
libgnome-desktop. Fixes a FTBFS in the Hurd.
* debian/patches/70_relibtoolize.patch:
- Regenerate on top of the above patch.
Added:
desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch
Modified:
desktop/unstable/gnome-panel/debian/changelog
desktop/unstable/gnome-panel/debian/control
desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
desktop/unstable/gnome-panel/debian/patches/series
Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=22459&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Fri Nov 27 12:42:44 2009
@@ -1,9 +1,17 @@
-gnome-panel (2.28.0-3) UNRELEASED; urgency=low
-
+gnome-panel (2.28.0-3) unstable; urgency=low
+
+ [ Josselin Mouette ]
* Fix typos in descriptions. Closes: #557401, #557402.
* Drop build-dependencies on PolicyKit 0.x. Closes: #557886.
- -- Josselin Mouette <joss at debian.org> Sun, 22 Nov 2009 01:22:43 +0100
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/10_clock_applet_link_gnome_desktop.patch:
+ - Patch from upstream git, make the clock applet link against
+ libgnome-desktop. Fixes a FTBFS in the Hurd.
+ * debian/patches/70_relibtoolize.patch:
+ - Regenerate on top of the above patch.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Fri, 27 Nov 2009 13:40:00 +0100
gnome-panel (2.28.0-2) unstable; urgency=low
Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=22459&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Fri Nov 27 12:42:44 2009
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>
Standards-Version: 3.8.1
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
Added: desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch?rev=22459&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/10_clock_applet_link_gnome_desktop.patch [utf-8] Fri Nov 27 12:42:44 2009
@@ -1,0 +1,26 @@
+From b70067b06edb18d33d3405a93bc464120ef75bef Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Tue, 6 Oct 2009 19:32:10 +0200
+Subject: [PATCH] [build] Add pkg-config requires on gnome-desktop for the clock applet
+
+https://bugzilla.gnome.org/show_bug.cgi?id=597479
+---
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d4dba52..bac276e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -121,7 +121,7 @@ fi
+ AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
+ AC_SUBST(CLOCK_EDS_ICONDIR)
+
+-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED)
++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+ AC_SUBST(CLOCK_CFLAGS)
+ AC_SUBST(CLOCK_LIBS)
+
+--
+1.6.5.3
+
Modified: desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch?rev=22459&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/70_relibtoolize.patch [utf-8] Fri Nov 27 12:42:44 2009
@@ -5,18 +5,16 @@
autoconf
rm -rf autom4te.cache config.h.in~
-Index: gnome-panel-2.28.0/aclocal.m4
-===================================================================
---- gnome-panel-2.28.0.orig/aclocal.m4 2009-09-29 21:41:02.043860851 +0200
-+++ gnome-panel-2.28.0/aclocal.m4 2009-09-29 21:59:14.816359638 +0200
-@@ -13,2102 +13,2102 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -13,2102 +13,2105 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -902,7 +900,6 @@
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
@@ -919,12 +916,7 @@
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
-
--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
--dnl mangled by Autoconf and run in a shell conditional statement.
--m4_define([_AC_COMPILER_EXEEXT],
--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
++
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
@@ -947,8 +939,13 @@
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+ [Define the location where the catalogs will be installed])
-+])
-
+ ])
+
+-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+-dnl mangled by Autoconf and run in a shell conditional statement.
+-m4_define([_AC_COMPILER_EXEEXT],
+-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+dnl
+dnl Now the definitions that aclocal will find
+dnl
@@ -957,9 +954,6 @@
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
@@ -975,6 +969,10 @@
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
@@ -992,14 +990,15 @@
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++# gnome-common.m4
++#
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+# gnome-common.m4
-+#
++dnl GNOME_COMMON_INIT
-# AM_PROG_INSTALL_SH
-# ------------------
@@ -1015,25 +1014,26 @@
- esac
-fi
-AC_SUBST(install_sh)])
-+dnl GNOME_COMMON_INIT
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++ dnl this macro should come after AC_CONFIG_MACRO_DIR
++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+AC_DEFUN([GNOME_COMMON_INIT],
-+[
-+ dnl this macro should come after AC_CONFIG_MACRO_DIR
-+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
--# serial 2
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+ if test -n "$ac_macro_dir"; then
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+ fi
+
+-# serial 2
++ AC_SUBST([ACLOCAL_AMFLAGS])
++])
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
@@ -1047,11 +1047,6 @@
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-+ AC_SUBST([ACLOCAL_AMFLAGS])
-+])
-
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
+AC_DEFUN([GNOME_DEBUG_CHECK],
+[
+ AC_ARG_ENABLE([debug],
@@ -1059,25 +1054,35 @@
+ [turn on debugging]),,
+ [enable_debug=no])
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
++])
+
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
-
--# serial 5
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+-# serial 5
++ DISABLE_DEPRECATED=""
++ if test $USE_MAINTAINER_MODE = yes; then
++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
++ for DOMAIN in $DOMAINS; do
++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
++ done
++ fi
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
@@ -1104,11 +1109,6 @@
- AC_SUBST([MAINT])dnl
-]
-)
-+ if test $USE_MAINTAINER_MODE = yes; then
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-+ else
-+ DISABLE_DEPRECATED=""
-+ fi
+ AC_SUBST(DISABLE_DEPRECATED)
+])
@@ -2659,7 +2659,12 @@
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
--
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
- #
- # If we don't have everything we want, check in libintl
- #
@@ -2671,11 +2676,6 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
@@ -2687,6 +2687,9 @@
- :,-liconv)],
- :,-liconv)
- fi
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
@@ -2699,20 +2702,6 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-
-- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-- gt_cv_func_dgettext_libc=no
-- else
-- if test "$gt_cv_func_dgettext_libc" = "yes" \
-- && test "$gt_cv_func_ngettext_libc" = "yes"; then
-- gt_cv_func_dgettext_libintl=no
-- fi
-- fi
-- fi
-- fi
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
@@ -2729,6 +2718,22 @@
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+- gt_cv_func_dgettext_libc=no
+- else
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- && test "$gt_cv_func_ngettext_libc" = "yes"; then
+- gt_cv_func_dgettext_libintl=no
+- fi
+- fi
+- fi
+- fi
++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -2794,16 +2799,6 @@
- fi
- fi
- ])
-+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- if test "$gt_cv_have_gettext" = "yes" ; then
-- AC_DEFINE(ENABLE_NLS, 1,
-- [always defined to indicate that i18n is enabled])
-- fi
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
@@ -2819,6 +2814,16 @@
+fi
+AC_SUBST(install_sh)])
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+- fi
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
@@ -2831,20 +2836,10 @@
- XGETTEXT=":"
- fi
- fi
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# serial 2
- # We need to process the po/ directory.
- POSUB=po
-+# serial 2
-
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
@@ -2858,6 +2853,13 @@
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
@@ -2865,8 +2867,12 @@
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
@@ -2880,12 +2886,7 @@
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# serial 5
-# AM_GLIB_GNU_GETTEXT
-# -------------------
@@ -2903,7 +2904,31 @@
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-+# serial 5
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
++# ----------------------------------
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless `enable' is passed literally.
++# For symmetry, `disable' may be passed as well. Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++ [enable], [m4_define([am_maintainer_other], [disable])],
++ [disable], [m4_define([am_maintainer_other], [enable])],
++ [m4_define([am_maintainer_other], [enable])
++ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++ AC_ARG_ENABLE([maintainer-mode],
++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ [USE_MAINTAINER_MODE=$enableval],
++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST([MAINT])dnl
++]
++)
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
@@ -2935,38 +2960,14 @@
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-+# AM_MAINTAINER_MODE([DEFAULT-MODE])
-+# ----------------------------------
-+# Control maintainer-specific portions of Makefiles.
-+# Default is to disable them, unless `enable' is passed literally.
-+# For symmetry, `disable' may be passed as well. Anyway, the user
-+# can override the default with the --enable/--disable switch.
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[m4_case(m4_default([$1], [disable]),
-+ [enable], [m4_define([am_maintainer_other], [disable])],
-+ [disable], [m4_define([am_maintainer_other], [enable])],
-+ [m4_define([am_maintainer_other], [enable])
-+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-+ AC_ARG_ENABLE([maintainer-mode],
-+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ [USE_MAINTAINER_MODE=$enableval],
-+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST([MAINT])dnl
-+]
-+)
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++# Check to see how 'make' treats includes. -*- Autoconf -*-
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
@@ -2979,7 +2980,11 @@
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
@@ -2997,11 +3002,7 @@
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# serial 4
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
@@ -3019,8 +3020,6 @@
- localedir=`eval echo "${libdir}/locale"`
-else
- localedir=`eval echo "${datadir}/locale"`
-+# serial 4
-+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
@@ -3098,7 +3097,7 @@
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
+# serial 6
-+
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
@@ -3125,10 +3124,11 @@
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# gnome-common.m4
-#
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-dnl GNOME_COMMON_INIT
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
@@ -3136,13 +3136,18 @@
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
--dnl GNOME_COMMON_INIT
-+# serial 6
-
-AC_DEFUN([GNOME_COMMON_INIT],
-[
- dnl this macro should come after AC_CONFIG_MACRO_DIR
- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++# serial 6
+
+- dnl ensure that when the Automake generated makefile calls aclocal,
+- dnl it honours the $ACLOCAL_FLAGS environment variable
+- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+- if test -n "$ac_macro_dir"; then
+- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+- fi
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
@@ -3150,14 +3155,8 @@
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
-- dnl ensure that when the Automake generated makefile calls aclocal,
-- dnl it honours the $ACLOCAL_FLAGS environment variable
-- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-- if test -n "$ac_macro_dir"; then
-- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-- fi
-
- AC_SUBST([ACLOCAL_AMFLAGS])
++
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
@@ -3977,11 +3976,9 @@
m4_include([m4/d-type.m4])
m4_include([m4/gnome-doc-utils.m4])
-Index: gnome-panel-2.28.0/applets/clock/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/clock/Makefile.in 2009-09-29 21:41:01.979865283 +0200
-+++ gnome-panel-2.28.0/applets/clock/Makefile.in 2009-09-29 21:59:14.820360705 +0200
-@@ -347,6 +347,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/clock/Makefile.in
++++ b/applets/clock/Makefile.in
+@@ -347,6 +347,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -3990,7 +3987,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -372,6 +374,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -372,6 +374,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3998,11 +3995,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/applets/clock/pixmaps/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/clock/pixmaps/Makefile.in 2009-09-29 21:41:01.947865054 +0200
-+++ gnome-panel-2.28.0/applets/clock/pixmaps/Makefile.in 2009-09-29 21:59:14.820360705 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/clock/pixmaps/Makefile.in
++++ b/applets/clock/pixmaps/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4011,7 +4006,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4019,11 +4014,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/applets/fish/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/fish/Makefile.in 2009-09-29 21:41:01.911865225 +0200
-+++ gnome-panel-2.28.0/applets/fish/Makefile.in 2009-09-29 21:59:14.820360705 +0200
-@@ -238,6 +238,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/fish/Makefile.in
++++ b/applets/fish/Makefile.in
+@@ -238,6 +238,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4032,7 +4025,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -263,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -263,6 +265,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4040,11 +4033,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/applets/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/Makefile.in 2009-09-29 21:41:01.883863621 +0200
-+++ gnome-panel-2.28.0/applets/Makefile.in 2009-09-29 21:59:14.820360705 +0200
-@@ -194,6 +194,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/Makefile.in
++++ b/applets/Makefile.in
+@@ -194,6 +194,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4053,7 +4044,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -219,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4061,11 +4052,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/applets/notification_area/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/notification_area/Makefile.in 2009-09-29 21:41:01.819867077 +0200
-+++ gnome-panel-2.28.0/applets/notification_area/Makefile.in 2009-09-29 21:59:14.824359817 +0200
-@@ -265,6 +265,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/notification_area/Makefile.in
++++ b/applets/notification_area/Makefile.in
+@@ -265,6 +265,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4074,7 +4063,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -290,6 +292,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -290,6 +292,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4082,11 +4071,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/applets/wncklet/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/applets/wncklet/Makefile.in 2009-09-29 21:41:01.787865383 +0200
-+++ gnome-panel-2.28.0/applets/wncklet/Makefile.in 2009-09-29 21:59:14.824359817 +0200
-@@ -249,6 +249,8 @@ LIBTOOL = @LIBTOOL@
+--- a/applets/wncklet/Makefile.in
++++ b/applets/wncklet/Makefile.in
+@@ -249,6 +249,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -4095,7 +4082,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -274,6 +276,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -274,6 +276,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -4103,22 +4090,22 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/configure
-===================================================================
---- gnome-panel-2.28.0.orig/configure 2009-09-29 21:41:01.759864759 +0200
-+++ gnome-panel-2.28.0/configure 2009-09-29 21:59:14.871859292 +0200
-@@ -1,20 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for gnome-panel 2.28.0.
-+# Generated by GNU Autoconf 2.64 for gnome-panel 2.28.0.
++# Generated by GNU Autoconf 2.65 for gnome-panel 2.28.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel>.
#
++#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -4136,7 +4123,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -4165,7 +4152,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +40,13 @@ export as_nl
+@@ -46,7 +42,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -4180,7 +4167,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +57,7 @@ else
+@@ -57,7 +59,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -4189,7 +4176,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -80,13 +82,6 @@
}
fi
@@ -4203,7 +4190,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +89,15 @@ fi
+@@ -96,15 +91,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -4222,7 +4209,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -4243,7 +4230,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +130,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@
LANGUAGE=C
export LANGUAGE
@@ -4821,7 +4808,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -4831,7 +4818,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@
exit
}
@@ -4866,7 +4853,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -4875,7 +4862,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +511,10 @@ else
+@@ -555,10 +513,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -4888,7 +4875,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,7 +531,6 @@
@@ -4896,7 +4883,17 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -740,7 +695,6 @@ cross_compiling=no
+@@ -722,7 +679,8 @@
+
+
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -740,7 +698,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -4904,7 +4901,7 @@
# Identity of this package.
PACKAGE_NAME='gnome-panel'
-@@ -748,6 +702,7 @@ PACKAGE_TARNAME='gnome-panel'
+@@ -748,6 +705,7 @@
PACKAGE_VERSION='2.28.0'
PACKAGE_STRING='gnome-panel 2.28.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel'
@@ -4912,7 +4909,7 @@
# Factoring default headers for most tests.
ac_includes_default="\
-@@ -866,6 +821,8 @@ FISH_LIBS
+@@ -866,6 +824,8 @@
FISH_CFLAGS
LIBPANEL_APPLET_LIBS
LIBPANEL_APPLET_CFLAGS
@@ -4921,7 +4918,7 @@
PANEL_LIBS
PANEL_CFLAGS
PKG_CONFIG
-@@ -1019,6 +976,7 @@ bindir
+@@ -1019,6 +979,7 @@
program_transform_name
prefix
exec_prefix
@@ -4929,7 +4926,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1072,6 +1030,8 @@ CPP
+@@ -1072,6 +1033,8 @@
PKG_CONFIG
PANEL_CFLAGS
PANEL_LIBS
@@ -4938,7 +4935,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
FISH_CFLAGS
-@@ -1199,8 +1159,7 @@ do
+@@ -1199,8 +1162,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4948,7 +4945,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1226,8 +1185,7 @@ do
+@@ -1226,8 +1188,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4958,7 +4955,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1431,8 +1389,7 @@ do
+@@ -1431,8 +1392,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4968,7 +4965,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1448,8 +1405,7 @@ do
+@@ -1448,8 +1408,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4978,7 +4975,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1479,17 +1435,17 @@ do
+@@ -1479,17 +1438,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -5002,7 +4999,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1506,15 +1462,13 @@ done
+@@ -1506,15 +1465,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -5020,7 +5017,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1537,8 +1491,7 @@ do
+@@ -1537,8 +1494,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -5030,7 +5027,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1568,11 +1521,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1568,11 +1524,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -5044,7 +5041,7 @@
# Find the source files, if location was not specified.
-@@ -1611,13 +1562,11 @@ else
+@@ -1611,13 +1565,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -5060,9 +5057,16 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1750,7 +1699,8 @@ Optional Features:
- --enable-gtk-doc-html build documentation in html format [default=yes]
- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
+@@ -1746,11 +1698,12 @@
+ --enable-polkit Enable PolicyKit support (auto)
+ --enable-network-manager
+ Enable NetworkManager support (auto)
+- --enable-gtk-doc use gtk-doc to build documentation [default=no]
+- --enable-gtk-doc-html build documentation in html format [default=yes]
+- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
++ --enable-gtk-doc-html build documentation in html format [[default=yes]]
++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
--disable-scrollkeeper do not make updates to the scrollkeeper database
- --disable-schemas-install Disable the schemas installation
+ --disable-schemas-install
@@ -5070,7 +5074,15 @@
--disable-rebuilds disable all source autogeneration rules
Optional Packages:
-@@ -1787,6 +1737,9 @@ Some influential environment variables:
+@@ -1780,13 +1733,16 @@
+ 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
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
PANEL_CFLAGS
C compiler flags for PANEL, overriding pkg-config
PANEL_LIBS linker flags for PANEL, overriding pkg-config
@@ -5080,12 +5092,12 @@
LIBPANEL_APPLET_CFLAGS
C compiler flags for LIBPANEL_APPLET, overriding pkg-config
LIBPANEL_APPLET_LIBS
-@@ -1886,21 +1839,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1886,21 +1842,378 @@
if $ac_init_version; then
cat <<\_ACEOF
gnome-panel configure 2.28.0
-generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -5134,7 +5146,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
@@ -5180,7 +5192,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
@@ -5284,7 +5296,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
@@ -5326,7 +5338,7 @@
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
@@ -5459,11 +5471,11 @@
It was created by gnome-panel $as_me 2.28.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1936,8 +2246,8 @@ for as_dir in $PATH
+@@ -1936,8 +2249,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5474,7 +5486,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1974,9 +2284,9 @@ do
+@@ -1974,9 +2287,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5486,7 +5498,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1992,13 +2302,13 @@ do
+@@ -1992,13 +2305,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5503,7 +5515,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2023,13 +2333,13 @@ _ASBOX
+@@ -2023,13 +2336,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5519,7 +5531,7 @@
esac ;;
esac
done
-@@ -2101,39 +2411,41 @@ _ASBOX
+@@ -2101,39 +2414,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5566,25 +5578,33 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2152,7 +2464,7 @@ for ac_site_file in "$ac_site_file1" "$a
+@@ -2151,8 +2466,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2163,7 +2475,7 @@ if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+@@ -2160,10 +2475,10 @@
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2171,7 +2483,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2171,7 +2486,7 @@
esac
fi
else
@@ -5593,7 +5613,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2186,11 +2498,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2186,11 +2501,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5607,7 +5627,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2200,17 +2512,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2200,17 +2515,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -5629,7 +5649,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2222,43 +2534,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2222,43 +2537,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5680,7 +5700,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2273,24 +2562,16 @@ am__api_version='1.11'
+@@ -2273,24 +2565,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5713,7 +5733,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2316,10 +2597,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2316,10 +2600,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5726,7 +5746,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2327,11 +2608,11 @@ for as_dir in $PATH
+@@ -2327,11 +2611,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5742,7 +5762,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2368,7 +2649,7 @@ case $as_dir/ in
+@@ -2368,7 +2652,7 @@
;;
esac
@@ -5751,7 +5771,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2384,7 +2665,7 @@ fi
+@@ -2384,7 +2668,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -5760,7 +5780,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2395,7 +2676,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2395,7 +2679,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5769,7 +5789,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2406,15 +2687,11 @@ am_lf='
+@@ -2406,15 +2690,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5787,7 +5807,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2436,11 +2713,8 @@ if (
+@@ -2436,11 +2716,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -5801,7 +5821,7 @@
fi
test "$2" = conftest.file
-@@ -2449,13 +2723,10 @@ then
+@@ -2449,13 +2726,10 @@
# Ok.
:
else
@@ -5818,7 +5838,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2483,7 +2754,7 @@ if eval "$MISSING --run true"; then
+@@ -2483,7 +2757,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5827,7 +5847,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2504,9 +2775,9 @@ if test "$cross_compiling" != no; then
+@@ -2504,9 +2778,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5839,7 +5859,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2517,24 +2788,24 @@ for as_dir in $PATH
+@@ -2517,24 +2791,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5869,7 +5889,7 @@
$as_echo "no" >&6; }
fi
-@@ -2544,9 +2815,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2544,9 +2818,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5881,7 +5901,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2557,24 +2828,24 @@ for as_dir in $PATH
+@@ -2557,24 +2831,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5911,7 +5931,7 @@
$as_echo "no" >&6; }
fi
-@@ -2583,7 +2854,7 @@ fi
+@@ -2583,7 +2857,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5920,7 +5940,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2596,10 +2867,10 @@ fi
+@@ -2596,10 +2870,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5933,7 +5953,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2607,7 +2878,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2607,7 +2881,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5942,7 +5962,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2619,7 +2890,7 @@ do
+@@ -2619,11 +2893,12 @@
esac
done
done
@@ -5951,7 +5971,16 @@
IFS=$as_save_IFS
fi
-@@ -2635,7 +2906,7 @@ fi
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -2631,11 +2906,10 @@
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -5960,7 +5989,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2648,9 +2919,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2648,9 +2922,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5972,7 +6001,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2661,24 +2932,24 @@ for as_dir in $PATH
+@@ -2661,24 +2935,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6002,7 +6031,7 @@
$as_echo "no" >&6; }
fi
-@@ -2686,11 +2957,11 @@ fi
+@@ -2686,11 +2960,11 @@
test -n "$AWK" && break
done
@@ -6016,7 +6045,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2708,11 +2979,11 @@ esac
+@@ -2708,11 +2982,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -6030,7 +6059,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2732,9 +3003,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2732,9 +3006,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -6041,7 +6070,7 @@
fi
fi
-@@ -2791,7 +3060,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2791,7 +3063,7 @@
# Check whether --enable-silent-rules was given.
@@ -6050,7 +6079,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2827,16 +3096,16 @@ LIB_PANEL_APPLET_LT_VERSION=2:60:2
+@@ -2827,16 +3099,16 @@
@@ -6070,25 +6099,10 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2852,28 +3121,25 @@ fi
-
-
-
-- DISABLE_DEPRECATED=""
- if test $USE_MAINTAINER_MODE = yes; then
-- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-- for DOMAIN in $DOMAINS; do
-- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-- done
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-+ else
-+ DISABLE_DEPRECATED=""
- fi
-
-
-
-
--
+@@ -2864,16 +3136,16 @@
+
+
+
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
@@ -6105,7 +6119,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2889,7 +3155,7 @@ am__doit:
+@@ -2889,7 +3161,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6114,7 +6128,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2917,12 +3183,12 @@ if test "$am__include" = "#"; then
+@@ -2917,12 +3189,12 @@
fi
@@ -6129,7 +6143,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2947,9 +3213,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2947,9 +3219,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6141,7 +6155,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2960,24 +3226,24 @@ for as_dir in $PATH
+@@ -2960,24 +3232,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6171,7 +6185,7 @@
$as_echo "no" >&6; }
fi
-@@ -2987,9 +3253,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2987,9 +3259,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -6183,7 +6197,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3266,24 @@ for as_dir in $PATH
+@@ -3000,24 +3272,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6213,7 +6227,7 @@
$as_echo "no" >&6; }
fi
-@@ -3026,7 +3292,7 @@ fi
+@@ -3026,7 +3298,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6222,7 +6236,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3040,9 +3306,9 @@ if test -z "$CC"; then
+@@ -3040,9 +3312,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -6234,7 +6248,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3053,24 +3319,24 @@ for as_dir in $PATH
+@@ -3053,24 +3325,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6264,7 +6278,7 @@
$as_echo "no" >&6; }
fi
-@@ -3080,9 +3346,9 @@ fi
+@@ -3080,9 +3352,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -6276,7 +6290,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3094,18 +3360,18 @@ for as_dir in $PATH
+@@ -3094,18 +3366,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6298,7 +6312,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3390,10 @@ fi
+@@ -3124,10 +3396,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6311,7 +6325,7 @@
$as_echo "no" >&6; }
fi
-@@ -3139,9 +3405,9 @@ if test -z "$CC"; then
+@@ -3139,9 +3411,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6323,7 +6337,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3152,24 +3418,24 @@ for as_dir in $PATH
+@@ -3152,24 +3424,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6353,7 +6367,7 @@
$as_echo "no" >&6; }
fi
-@@ -3183,9 +3449,9 @@ if test -z "$CC"; then
+@@ -3183,9 +3455,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6365,7 +6379,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3462,24 @@ for as_dir in $PATH
+@@ -3196,24 +3468,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6395,7 +6409,7 @@
$as_echo "no" >&6; }
fi
-@@ -3226,7 +3492,7 @@ done
+@@ -3226,7 +3498,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6404,1572 +6418,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3237,73 +3503,55 @@ fi
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-+ if test -s conftest.err; then
-+ sed '10a\
-+... rest of stderr output deleted ...
-+ 10q' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
-+ fi
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+done
-
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--
-+#include <stdio.h>
- int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-@@ -3320,17 +3568,17 @@ do
- done
- rm -f $ac_rmfiles
-
--if { (ac_try="$ac_link_default"
-+if { { ac_try="$ac_link_default"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
- # in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3595,7 @@ do
- # certainly right.
- break;;
- *.* )
-- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
-@@ -3366,84 +3614,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
- else
- ac_file=''
- fi
--
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
--if test -z "$ac_file"; then
-+if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
- ac_exeext=$ac_cv_exeext
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (case "(($ac_try" in
-+ { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
--if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
- # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3697,24 @@ for ac_file in conftest.exe conftest con
- esac
- done
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+if test "${ac_cv_objext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3495,17 +3726,17 @@ main ()
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
-+if { { ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
-@@ -3518,31 +3749,23 @@ else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3556,37 +3779,16 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
- GCC=yes
-@@ -3595,20 +3797,16 @@ else
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3619,35 +3817,11 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3658,36 +3832,12 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
-- ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3698,42 +3848,17 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3875,14 @@ else
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -3818,32 +3939,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
-- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -3854,17 +3952,19 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-+fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3974,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4084,7 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-@@ -4004,35 +4104,31 @@ fi
-
- case "$am__api_version" in
- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
- esac
-
- if test -n "0.40.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
- $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
-@@ -4045,14 +4141,14 @@ 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
-+ 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_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4060,19 +4156,19 @@ esac
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
-@@ -4085,14 +4181,14 @@ 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
-+ 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_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4100,19 +4196,19 @@ esac
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
-@@ -4125,14 +4221,14 @@ 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
-+ 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_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4140,18 +4236,16 @@ esac
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4197,9 +4291,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- # 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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
-@@ -4212,14 +4306,14 @@ 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
-+ 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"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4227,19 +4321,19 @@ esac
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
-@@ -4252,14 +4346,14 @@ 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
-+ 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"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4267,19 +4361,19 @@ esac
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
-@@ -4292,14 +4386,14 @@ 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
-+ 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"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4307,19 +4401,19 @@ esac
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -4332,14 +4426,14 @@ 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
-+ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4348,33 +4442,29 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- 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
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
-@@ -4387,14 +4477,14 @@ 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
-+ 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_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4402,34 +4492,28 @@ esac
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found; required for intltool" "$LINENO" 5
- fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.x required for intltool" "$LINENO" 5
- fi
- if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -4439,11 +4523,7 @@ fi
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -4455,120 +4535,13 @@ extern int _nl_msg_cat_cntr;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* 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 bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- DATADIRNAME=share
- else
- DATADIRNAME=lib
-@@ -4580,10 +4553,8 @@ fi
- ;;
- esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
-
-
-@@ -4591,17 +4562,13 @@ fi
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
- $as_echo_n "checking for library containing strerror... " >&6; }
--if test "${ac_cv_search_strerror+set}" = set; then
-+if test "${ac_cv_search_strerror+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -4626,54 +4593,27 @@ for ac_lib in '' cposix; do
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_strerror+set}" = set; then
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_strerror+set}" = set; then :
- break
- fi
- done
--if test "${ac_cv_search_strerror+set}" = set; then
-- :
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+
- else
- ac_cv_search_strerror=no
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
- $as_echo "$ac_cv_search_strerror" >&6; }
- ac_res=$ac_cv_search_strerror
--if test "$ac_res" != no; then
-+if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-@@ -4686,9 +4626,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4699,24 +4639,24 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4726,9 +4666,9 @@ if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -4739,24 +4679,24 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4765,7 +4705,7 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4779,9 +4719,9 @@ if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4792,24 +4732,24 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4819,9 +4759,9 @@ fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4833,18 +4773,18 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
-@@ -4863,10 +4803,10 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4878,9 +4818,9 @@ if test -z "$CC"; then
- 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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4891,24 +4831,24 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4922,9 +4862,9 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -4935,24 +4875,24 @@ 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
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4965,7 +4905,7 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4976,62 +4916,42 @@ fi
+@@ -3237,57 +3509,37 @@
fi
@@ -8032,17 +6481,259 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3303,8 +3555,8 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -3320,17 +3572,17 @@
+ done
+ rm -f $ac_rmfiles
+
+-if { (ac_try="$ac_link_default"
++if { { ac_try="$ac_link_default"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # in a Makefile. We should not override ac_cv_exeext if it was cached,
+@@ -3347,7 +3599,7 @@
+ # certainly right.
+ break;;
+ *.* )
+- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+@@ -3366,84 +3618,42 @@
+ else
+ ac_file=''
+ fi
+-
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
++if test -z "$ac_file"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+-if { (ac_try="$ac_link"
++if { { ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+@@ -3458,32 +3668,83 @@
+ esac
+ done
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then
++if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -8054,7 +6745,69 @@
/* end confdefs.h. */
int
-@@ -5045,37 +4965,16 @@ main ()
+@@ -3495,17 +3756,17 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (ac_try="$ac_compile"
++if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+@@ -3518,31 +3779,23 @@
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3556,37 +3809,16 @@
return 0;
}
_ACEOF
@@ -8095,7 +6848,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5084,20 +4983,16 @@ else
+@@ -3595,20 +3827,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8119,7 +6872,7 @@
/* end confdefs.h. */
int
-@@ -5108,35 +5003,11 @@ main ()
+@@ -3619,35 +3847,11 @@
return 0;
}
_ACEOF
@@ -8158,7 +6911,7 @@
/* end confdefs.h. */
int
-@@ -5147,36 +5018,12 @@ main ()
+@@ -3658,36 +3862,12 @@
return 0;
}
_ACEOF
@@ -8199,7 +6952,7 @@
/* end confdefs.h. */
int
-@@ -5187,42 +5034,17 @@ main ()
+@@ -3698,42 +3878,17 @@
return 0;
}
_ACEOF
@@ -8244,7 +6997,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5239,18 +5061,14 @@ else
+@@ -3750,18 +3905,14 @@
CFLAGS=
fi
fi
@@ -8266,7 +7019,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5307,32 +5125,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3818,32 +3969,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8300,7 +7053,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5343,17 +5138,19 @@ fi
+@@ -3854,17 +3982,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8323,7 +7076,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5363,9 +5160,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3874,9 +4004,9 @@
depcc="$CC" am_compiler_list=
@@ -8335,7 +7088,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5473,7 +5270,7 @@ else
+@@ -3984,7 +4114,7 @@
fi
fi
@@ -8344,7 +7097,1352 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5493,14 +5290,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -4004,35 +4134,31 @@
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+ esac
+
+ if test -n "0.40.0"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
+ $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -4045,14 +4171,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4060,19 +4186,19 @@
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -4085,14 +4211,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4100,19 +4226,19 @@
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -4125,14 +4251,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4140,18 +4266,16 @@
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -4197,9 +4321,9 @@
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -4212,14 +4336,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4227,19 +4351,19 @@
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -4252,14 +4376,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4267,19 +4391,19 @@
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -4292,14 +4416,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4307,19 +4431,19 @@
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -4332,14 +4456,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -4348,33 +4472,29 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ 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
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -4387,14 +4507,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4402,34 +4522,28 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl not found; required for intltool" "$LINENO" 5
+ fi
+ if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl 5.x required for intltool" "$LINENO" 5
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -4439,11 +4553,7 @@
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -4455,61 +4565,41 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++ DATADIRNAME=share
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
++ DATADIRNAME=lib
++fi
++
++ ;;
++ *)
++ DATADIRNAME=lib
++ ;;
++ esac
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef bind_textdomain_codeset
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
++if test "${ac_cv_search_strerror+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -4517,104 +4607,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
++char strerror ();
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+- DATADIRNAME=share
+-else
+- DATADIRNAME=lib
+-fi
+-
+- ;;
+- *)
+- DATADIRNAME=lib
+- ;;
+- esac
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
+-if test "${ac_cv_search_strerror+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char strerror ();
+-int
+-main ()
+-{
+-return strerror ();
++return strerror ();
+ ;
+ return 0;
+ }
+@@ -4626,54 +4623,27 @@
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_strerror=$ac_res
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_strerror+set}" = set; then
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_strerror+set}" = set; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_strerror+set}" = set; then
+- :
++if test "${ac_cv_search_strerror+set}" = set; then :
++
+ else
+ ac_cv_search_strerror=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+ $as_echo "$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
+-if test "$ac_res" != no; then
++if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+@@ -4686,9 +4656,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4699,24 +4669,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4726,9 +4696,9 @@
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4739,24 +4709,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4765,7 +4735,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4779,9 +4749,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4792,24 +4762,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4819,9 +4789,9 @@
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4833,18 +4803,18 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+@@ -4863,10 +4833,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4878,9 +4848,9 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4891,24 +4861,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4922,9 +4892,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4935,24 +4905,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4965,7 +4935,7 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4976,62 +4946,42 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler --version >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -v >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5045,37 +4995,16 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+@@ -5084,20 +5013,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5108,35 +5033,11 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- CFLAGS=""
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5147,36 +5048,12 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+
+- ac_c_werror_flag=$ac_save_c_werror_flag
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5187,42 +5064,17 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+@@ -5239,18 +5091,14 @@
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -5307,32 +5155,9 @@
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -5343,17 +5168,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
++fi
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5363,9 +5190,9 @@
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5473,7 +5300,7 @@
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+@@ -5493,14 +5320,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8361,7 +8459,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5515,11 +5312,7 @@ do
+@@ -5515,11 +5342,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8374,7 +8472,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5528,78 +5321,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5528,78 +5351,34 @@
#endif
Syntax error
_ACEOF
@@ -8458,7 +8556,7 @@
break
fi
-@@ -5611,7 +5360,7 @@ fi
+@@ -5611,7 +5390,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8467,7 +8565,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5622,11 +5371,7 @@ do
+@@ -5622,11 +5401,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8480,7 +8578,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5635,87 +5380,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5635,87 +5410,40 @@
#endif
Syntax error
_ACEOF
@@ -8577,7 +8675,7 @@
fi
ac_ext=c
-@@ -5725,9 +5423,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5725,9 +5453,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8589,7 +8687,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5738,7 +5436,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5738,7 +5466,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8598,7 +8696,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5758,7 +5456,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5758,7 +5486,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8607,7 +8705,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5773,26 +5471,24 @@ esac
+@@ -5773,26 +5501,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -8639,7 +8737,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5806,7 +5502,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5806,7 +5532,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8648,7 +8746,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5826,7 +5522,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5826,7 +5552,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8657,7 +8755,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5841,12 +5537,10 @@ esac
+@@ -5841,12 +5567,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -8672,7 +8770,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5854,21 +5548,17 @@ fi
+@@ -5854,21 +5578,17 @@
fi
fi
@@ -8698,7 +8796,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5883,48 +5573,23 @@ main ()
+@@ -5883,48 +5603,23 @@
return 0;
}
_ACEOF
@@ -8752,7 +8850,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5934,18 +5599,14 @@ fi
+@@ -5934,18 +5629,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8774,7 +8872,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5955,14 +5616,10 @@ fi
+@@ -5955,14 +5646,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8791,7 +8889,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5989,85 +5646,48 @@ main ()
+@@ -5989,85 +5676,48 @@
return 0;
}
_ACEOF
@@ -8891,7 +8989,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6083,28 +5703,24 @@ IFS=$ac_save_IFS
+@@ -6083,28 +5733,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8925,7 +9023,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6127,9 +5743,9 @@ case $host in
+@@ -6127,9 +5773,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8937,7 +9035,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -6140,24 +5756,24 @@ for as_dir in $PATH
+@@ -6140,24 +5786,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8967,7 +9065,7 @@
$as_echo "no" >&6; }
fi
-@@ -6167,9 +5783,9 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6167,9 +5813,9 @@
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -8979,7 +9077,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -6180,24 +5796,24 @@ for as_dir in $PATH
+@@ -6180,24 +5826,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9009,7 +9107,7 @@
$as_echo "no" >&6; }
fi
-@@ -6206,7 +5822,7 @@ fi
+@@ -6206,7 +5852,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9018,7 +9116,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6219,9 +5835,9 @@ fi
+@@ -6219,9 +5865,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -9030,7 +9128,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -6232,24 +5848,24 @@ for as_dir in $PATH
+@@ -6232,24 +5878,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9060,7 +9158,7 @@
$as_echo "no" >&6; }
fi
-@@ -6259,9 +5875,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6259,9 +5905,9 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -9072,7 +9170,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -6272,24 +5888,24 @@ for as_dir in $PATH
+@@ -6272,24 +5918,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9102,7 +9200,7 @@
$as_echo "no" >&6; }
fi
-@@ -6298,7 +5914,7 @@ fi
+@@ -6298,7 +5944,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9111,7 +9209,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6311,9 +5927,9 @@ fi
+@@ -6311,9 +5957,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9123,7 +9221,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6324,24 +5940,24 @@ for as_dir in $PATH
+@@ -6324,24 +5970,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9153,7 +9251,7 @@
$as_echo "no" >&6; }
fi
-@@ -6351,9 +5967,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6351,9 +5997,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9165,7 +9263,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6364,24 +5980,24 @@ for as_dir in $PATH
+@@ -6364,24 +6010,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9195,7 +9293,7 @@
$as_echo "no" >&6; }
fi
-@@ -6390,7 +6006,7 @@ fi
+@@ -6390,7 +6036,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9204,7 +9302,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6425,7 +6041,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6425,7 +6071,7 @@
case `pwd` in
*\ * | *\ *)
@@ -9213,7 +9311,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6448,9 +6064,9 @@ macro_revision='1.3012'
+@@ -6448,9 +6094,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9225,7 +9323,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6458,7 +6074,7 @@ else
+@@ -6458,7 +6104,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -9234,7 +9332,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6467,7 +6083,7 @@ for as_dir in $PATH
+@@ -6467,7 +6113,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9243,7 +9341,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6487,7 +6103,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6487,7 +6133,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9252,7 +9350,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6502,19 +6118,17 @@ esac
+@@ -6502,19 +6148,17 @@
$ac_path_SED_found && break 3
done
done
@@ -9275,7 +9373,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6532,9 +6146,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6532,9 +6176,9 @@
@@ -9287,7 +9385,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6548,7 +6162,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6548,7 +6192,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9296,7 +9394,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6568,7 +6182,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6568,7 +6212,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -9305,7 +9403,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6583,12 +6197,10 @@ esac
+@@ -6583,12 +6227,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -9320,7 +9418,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6596,7 +6208,7 @@ fi
+@@ -6596,7 +6238,7 @@
fi
fi
@@ -9329,7 +9427,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6622,7 +6234,7 @@ test -z "$GREP" && GREP=grep
+@@ -6622,7 +6264,7 @@
# Check whether --with-gnu-ld was given.
@@ -9338,7 +9436,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6631,7 +6243,7 @@ fi
+@@ -6631,7 +6273,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9347,7 +9445,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6661,13 +6273,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6661,13 +6303,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9364,7 +9462,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6698,18 +6310,16 @@ fi
+@@ -6698,18 +6340,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9388,7 +9486,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6722,7 +6332,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6722,7 +6362,7 @@
;;
esac
fi
@@ -9397,7 +9495,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6734,9 +6344,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -6734,9 +6374,9 @@
@@ -9409,7 +9507,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6783,7 +6393,7 @@ else
+@@ -6783,7 +6423,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -9418,7 +9516,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6794,9 +6404,9 @@ else
+@@ -6794,9 +6434,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9430,7 +9528,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6807,24 +6417,24 @@ for as_dir in $PATH
+@@ -6807,24 +6447,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9460,7 +9558,7 @@
$as_echo "no" >&6; }
fi
-@@ -6838,9 +6448,9 @@ if test -z "$DUMPBIN"; then
+@@ -6838,9 +6478,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9472,7 +9570,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6851,24 +6461,24 @@ for as_dir in $PATH
+@@ -6851,24 +6491,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9502,7 +9600,7 @@
$as_echo "no" >&6; }
fi
-@@ -6881,7 +6491,7 @@ done
+@@ -6881,7 +6521,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9511,7 +9609,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6901,44 +6511,44 @@ test -z "$NM" && NM=nm
+@@ -6901,44 +6541,44 @@
@@ -9525,15 +9623,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6911: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6521: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6551: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6524: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6554: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6917: output\"" >&5)
-+ (eval echo "\"\$as_me:6527: output\"" >&5)
++ (eval echo "\"\$as_me:6557: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9567,7 +9665,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -7056,10 +6666,10 @@ else
+@@ -7056,10 +6696,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9580,7 +9678,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7073,7 +6683,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -7073,7 +6713,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9589,7 +9687,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -7083,17 +6693,17 @@ xsi_shell=no
+@@ -7083,17 +6723,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9610,7 +9708,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -7128,14 +6738,14 @@ esac
+@@ -7128,14 +6768,14 @@
@@ -9628,7 +9726,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -7164,9 +6774,9 @@ esac
+@@ -7164,9 +6804,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9640,7 +9738,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -7177,24 +6787,24 @@ for as_dir in $PATH
+@@ -7177,24 +6817,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9670,7 +9768,7 @@
$as_echo "no" >&6; }
fi
-@@ -7204,9 +6814,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7204,9 +6844,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9682,7 +9780,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -7217,24 +6827,24 @@ for as_dir in $PATH
+@@ -7217,24 +6857,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9712,7 +9810,7 @@
$as_echo "no" >&6; }
fi
-@@ -7243,7 +6853,7 @@ fi
+@@ -7243,7 +6883,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9721,7 +9819,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7260,9 +6870,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -7260,9 +6900,9 @@
@@ -9733,7 +9831,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7381,7 +6991,7 @@ linux* | k*bsd*-gnu)
+@@ -7381,7 +7021,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9742,7 +9840,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7456,7 +7066,7 @@ tpf*)
+@@ -7456,7 +7096,7 @@
esac
fi
@@ -9751,7 +9849,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7476,9 +7086,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7476,9 +7116,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9763,7 +9861,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7489,24 +7099,24 @@ for as_dir in $PATH
+@@ -7489,24 +7129,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9793,7 +9891,7 @@
$as_echo "no" >&6; }
fi
-@@ -7516,9 +7126,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7516,9 +7156,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9805,7 +9903,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7529,24 +7139,24 @@ for as_dir in $PATH
+@@ -7529,24 +7169,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9835,7 +9933,7 @@
$as_echo "no" >&6; }
fi
-@@ -7555,7 +7165,7 @@ fi
+@@ -7555,7 +7195,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9844,7 +9942,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7581,9 +7191,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7581,9 +7221,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9856,7 +9954,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7594,24 +7204,24 @@ for as_dir in $PATH
+@@ -7594,24 +7234,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9886,7 +9984,7 @@
$as_echo "no" >&6; }
fi
-@@ -7621,9 +7231,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7621,9 +7261,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9898,7 +9996,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7634,24 +7244,24 @@ for as_dir in $PATH
+@@ -7634,24 +7274,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9928,7 +10026,7 @@
$as_echo "no" >&6; }
fi
-@@ -7660,7 +7270,7 @@ fi
+@@ -7660,7 +7300,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9937,7 +10035,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7680,9 +7290,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7680,9 +7320,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9949,7 +10047,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7693,24 +7303,24 @@ for as_dir in $PATH
+@@ -7693,24 +7333,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9979,7 +10077,7 @@
$as_echo "no" >&6; }
fi
-@@ -7720,9 +7330,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -7720,9 +7360,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -9991,7 +10089,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7733,24 +7343,24 @@ for as_dir in $PATH
+@@ -7733,24 +7373,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10021,7 +10119,7 @@
$as_echo "no" >&6; }
fi
-@@ -7759,7 +7369,7 @@ fi
+@@ -7759,7 +7399,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10030,7 +10128,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7837,9 +7447,9 @@ compiler=$CC
+@@ -7837,9 +7477,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -10042,7 +10140,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7955,18 +7565,18 @@ void nm_test_func(void){}
+@@ -7955,18 +7595,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -10067,7 +10165,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -8019,11 +7629,11 @@ _LT_EOF
+@@ -8019,11 +7659,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -10082,7 +10180,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -8057,10 +7667,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8057,10 +7697,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -10095,7 +10193,7 @@
$as_echo "ok" >&6; }
fi
-@@ -8086,7 +7696,7 @@ fi
+@@ -8086,7 +7726,7 @@
# Check whether --enable-libtool-lock was given.
@@ -10104,7 +10202,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -8098,11 +7708,11 @@ case $host in
+@@ -8098,11 +7738,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10119,13 +10217,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -8116,12 +7726,12 @@ ia64-*-hpux*)
+@@ -8116,12 +7756,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8119 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7729 "configure"' > conftest.$ac_ext
++ echo '#line 7759 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10136,7 +10234,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -8155,11 +7765,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -8155,11 +7795,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10151,7 +10249,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -8208,9 +7818,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -8208,9 +7848,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -10163,7 +10261,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -8219,11 +7829,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -8219,11 +7859,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -10176,7 +10274,7 @@
/* end confdefs.h. */
int
-@@ -8234,38 +7840,13 @@ main ()
+@@ -8234,38 +7870,13 @@
return 0;
}
_ACEOF
@@ -10219,7 +10317,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8273,7 +7854,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -8273,7 +7884,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -10228,7 +10326,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -8283,11 +7864,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -8283,11 +7894,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -10243,7 +10341,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8313,9 +7894,9 @@ need_locks="$enable_libtool_lock"
+@@ -8313,9 +7924,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -10255,7 +10353,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8326,24 +7907,24 @@ for as_dir in $PATH
+@@ -8326,24 +7937,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10285,7 +10383,7 @@
$as_echo "no" >&6; }
fi
-@@ -8353,9 +7934,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8353,9 +7964,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -10297,7 +10395,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8366,24 +7947,24 @@ for as_dir in $PATH
+@@ -8366,24 +7977,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10327,7 +10425,7 @@
$as_echo "no" >&6; }
fi
-@@ -8392,7 +7973,7 @@ fi
+@@ -8392,7 +8003,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10336,7 +10434,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8405,9 +7986,9 @@ fi
+@@ -8405,9 +8016,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -10348,7 +10446,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8418,24 +7999,24 @@ for as_dir in $PATH
+@@ -8418,24 +8029,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10378,7 +10476,7 @@
$as_echo "no" >&6; }
fi
-@@ -8445,9 +8026,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8445,9 +8056,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -10390,7 +10488,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8458,24 +8039,24 @@ for as_dir in $PATH
+@@ -8458,24 +8069,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10420,7 +10518,7 @@
$as_echo "no" >&6; }
fi
-@@ -8484,7 +8065,7 @@ fi
+@@ -8484,7 +8095,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10429,7 +10527,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8497,9 +8078,9 @@ fi
+@@ -8497,9 +8108,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10441,7 +10539,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8510,24 +8091,24 @@ for as_dir in $PATH
+@@ -8510,24 +8121,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10471,7 +10569,7 @@
$as_echo "no" >&6; }
fi
-@@ -8537,9 +8118,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8537,9 +8148,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -10483,7 +10581,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8550,24 +8131,24 @@ for as_dir in $PATH
+@@ -8550,24 +8161,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10513,7 +10611,7 @@
$as_echo "no" >&6; }
fi
-@@ -8576,7 +8157,7 @@ fi
+@@ -8576,7 +8187,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10522,7 +10620,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8589,9 +8170,9 @@ fi
+@@ -8589,9 +8200,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10534,7 +10632,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8602,24 +8183,24 @@ for as_dir in $PATH
+@@ -8602,24 +8213,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10564,7 +10662,7 @@
$as_echo "no" >&6; }
fi
-@@ -8629,9 +8210,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8629,9 +8240,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -10576,7 +10674,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8642,24 +8223,24 @@ for as_dir in $PATH
+@@ -8642,24 +8253,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10606,7 +10704,7 @@
$as_echo "no" >&6; }
fi
-@@ -8668,7 +8249,7 @@ fi
+@@ -8668,7 +8279,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10615,7 +10713,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8681,9 +8262,9 @@ fi
+@@ -8681,9 +8292,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10627,7 +10725,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8694,24 +8275,24 @@ for as_dir in $PATH
+@@ -8694,24 +8305,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10657,7 +10755,7 @@
$as_echo "no" >&6; }
fi
-@@ -8721,9 +8302,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -8721,9 +8332,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10669,7 +10767,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8734,24 +8315,24 @@ for as_dir in $PATH
+@@ -8734,24 +8345,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10699,7 +10797,7 @@
$as_echo "no" >&6; }
fi
-@@ -8760,7 +8341,7 @@ fi
+@@ -8760,7 +8371,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10708,7 +10806,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8796,9 +8377,9 @@ fi
+@@ -8796,9 +8407,9 @@
@@ -10720,7 +10818,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8823,22 +8404,18 @@ else
+@@ -8823,22 +8434,18 @@
rm -f conftest.*
fi
fi
@@ -10747,7 +10845,7 @@
/* end confdefs.h. */
int
-@@ -8849,42 +8426,17 @@ main ()
+@@ -8849,42 +8456,17 @@
return 0;
}
_ACEOF
@@ -10795,7 +10893,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8922,69 +8474,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8922,69 +8504,14 @@
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -10871,7 +10969,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8994,62 +8491,13 @@ fi
+@@ -8994,62 +8521,13 @@
done
@@ -10939,7 +11037,7 @@
_ACEOF
fi
-@@ -9067,7 +8515,7 @@ done
+@@ -9067,7 +8545,7 @@
# Check whether --enable-shared was given.
@@ -10948,7 +11046,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9098,7 +8546,7 @@ fi
+@@ -9098,7 +8576,7 @@
# Check whether --enable-static was given.
@@ -10957,7 +11055,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -9130,7 +8578,7 @@ fi
+@@ -9130,7 +8608,7 @@
# Check whether --with-pic was given.
@@ -10966,7 +11064,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9146,7 +8594,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9146,7 +8624,7 @@
# Check whether --enable-fast-install was given.
@@ -10975,7 +11073,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9227,9 +8675,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9227,9 +8705,9 @@
setopt NO_GLOB_SUBST
fi
@@ -10987,7 +11085,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9242,7 +8690,7 @@ else
+@@ -9242,7 +8720,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -10996,7 +11094,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9335,9 +8783,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9335,9 +8813,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -11008,7 +11106,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9388,10 +8836,10 @@ fi
+@@ -9388,10 +8866,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11021,7 +11119,7 @@
$as_echo "no" >&6; }
fi
-@@ -9401,9 +8849,9 @@ fi
+@@ -9401,9 +8879,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -11033,7 +11131,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9454,10 +8902,10 @@ fi
+@@ -9454,10 +8932,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -11046,7 +11144,7 @@
$as_echo "no" >&6; }
fi
-@@ -9538,9 +8986,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9538,9 +9016,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -11058,21 +11156,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9556,11 +9004,11 @@ else
+@@ -9556,11 +9034,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9007: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9037: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9563: \$? = $ac_status" >&5
-+ echo "$as_me:9011: \$? = $ac_status" >&5
++ echo "$as_me:9041: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9573,7 +9021,7 @@ else
+@@ -9573,7 +9051,7 @@
$RM conftest*
fi
@@ -11081,7 +11179,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9593,7 +9041,7 @@ fi
+@@ -9593,7 +9071,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -11090,7 +11188,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9865,7 +9313,7 @@ case $host_os in
+@@ -9865,7 +9343,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -11099,7 +11197,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9877,9 +9325,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -9877,9 +9355,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -11111,21 +11209,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9895,11 +9343,11 @@ else
+@@ -9895,11 +9373,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9898: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9346: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9376: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9902: \$? = $ac_status" >&5
-+ echo "$as_me:9350: \$? = $ac_status" >&5
++ echo "$as_me:9380: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9912,7 +9360,7 @@ else
+@@ -9912,7 +9390,7 @@
$RM conftest*
fi
@@ -11134,7 +11232,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9936,9 +9384,9 @@ fi
+@@ -9936,9 +9414,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -11146,7 +11244,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9964,7 +9412,7 @@ else
+@@ -9964,7 +9442,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -11155,7 +11253,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9979,9 +9427,9 @@ fi
+@@ -9979,9 +9457,9 @@
@@ -11167,21 +11265,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10000,11 +9448,11 @@ else
+@@ -10000,11 +9478,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10003: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9451: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9481: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10007: \$? = $ac_status" >&5
-+ echo "$as_me:9455: \$? = $ac_status" >&5
++ echo "$as_me:9485: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10026,7 +9474,7 @@ else
+@@ -10026,7 +9504,7 @@
$RM conftest*
fi
@@ -11190,7 +11288,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10034,9 +9482,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10034,9 +9512,9 @@
@@ -11202,21 +11300,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10055,11 +9503,11 @@ else
+@@ -10055,11 +9533,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9506: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10062: \$? = $ac_status" >&5
-+ echo "$as_me:9510: \$? = $ac_status" >&5
++ echo "$as_me:9540: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -10081,7 +9529,7 @@ else
+@@ -10081,7 +9559,7 @@
$RM conftest*
fi
@@ -11225,7 +11323,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10090,7 +9538,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10090,7 +9568,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -11234,7 +11332,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10098,10 +9546,10 @@ $as_echo_n "checking if we can lock with
+@@ -10098,10 +9576,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -11247,7 +11345,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10114,7 +9562,7 @@ fi
+@@ -10114,7 +9592,7 @@
@@ -11256,7 +11354,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10174,6 +9622,9 @@ $as_echo_n "checking whether the $compil
+@@ -10174,6 +9652,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -11266,7 +11364,7 @@
esac
ld_shlibs=yes
-@@ -10356,7 +9807,7 @@ _LT_EOF
+@@ -10356,7 +9837,7 @@
fi
;;
@@ -11275,7 +11373,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10531,6 +9982,7 @@ _LT_EOF
+@@ -10531,6 +10012,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -11283,7 +11381,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10556,11 +10008,7 @@ _LT_EOF
+@@ -10556,11 +10038,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11296,7 +11394,7 @@
/* end confdefs.h. */
int
-@@ -10571,27 +10019,7 @@ main ()
+@@ -10571,27 +10049,7 @@
return 0;
}
_ACEOF
@@ -11325,7 +11423,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10605,16 +10033,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10605,16 +10063,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11344,7 +11442,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10627,11 +10048,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10627,11 +10078,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -11357,7 +11455,7 @@
/* end confdefs.h. */
int
-@@ -10642,27 +10059,7 @@ main ()
+@@ -10642,27 +10089,7 @@
return 0;
}
_ACEOF
@@ -11386,7 +11484,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10676,16 +10073,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10676,16 +10103,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11405,7 +11503,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10897,42 +10287,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10897,42 +10317,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11453,7 +11551,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10945,7 +10309,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10945,7 +10339,7 @@
link_all_deplibs=yes
;;
@@ -11462,7 +11560,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11188,7 +10552,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11188,7 +10582,7 @@
fi
fi
@@ -11471,7 +11569,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11225,16 +10589,16 @@ x|xyes)
+@@ -11225,16 +10619,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11492,7 +11590,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11248,11 +10612,11 @@ $as_echo_n "checking whether -lc should
+@@ -11248,11 +10642,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11507,7 +11605,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11263,7 +10627,7 @@ $as_echo_n "checking whether -lc should
+@@ -11263,7 +10657,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11516,7 +11614,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11427,7 +10791,7 @@ esac
+@@ -11427,7 +10821,7 @@
@@ -11525,7 +11623,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11849,11 +11213,7 @@ linux* | k*bsd*-gnu)
+@@ -11849,11 +11243,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11538,7 +11636,7 @@
/* end confdefs.h. */
int
-@@ -11864,41 +11224,13 @@ main ()
+@@ -11864,41 +11254,13 @@
return 0;
}
_ACEOF
@@ -11584,7 +11682,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11922,6 +11254,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11922,6 +11284,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11603,7 +11701,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12110,7 +11454,7 @@ uts4*)
+@@ -12110,7 +11484,7 @@
dynamic_linker=no
;;
esac
@@ -11612,7 +11710,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12212,7 +11556,7 @@ fi
+@@ -12212,7 +11586,7 @@
@@ -11621,7 +11719,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12237,7 +11581,7 @@ else
+@@ -12237,7 +11611,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -11630,7 +11728,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12282,18 +11626,14 @@ else
+@@ -12282,18 +11656,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -11652,7 +11750,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12311,43 +11651,18 @@ return dlopen ();
+@@ -12311,43 +11681,18 @@
return 0;
}
_ACEOF
@@ -11702,31 +11800,21 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12360,33 +11675,19 @@ fi
+@@ -12360,106 +11705,18 @@
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
@@ -11743,13 +11831,14 @@
-#endif
-
-#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -12395,13 +11696,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char shl_load ();
+-
+-/* 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 shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -11757,10 +11846,73 @@
-choke me
-#endif
-
- int
- main ()
- {
-@@ -12410,56 +11704,32 @@ return shl_load ();
+-int
+-main ()
+-{
+-return shl_load ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_shl_load=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_shl_load=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12477,145 +11734,32 @@
return 0;
}
_ACEOF
@@ -11785,102 +11937,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
+ ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_shl_load=no
+- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -12468,222 +11738,37 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_dld_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
@@ -11891,10 +11955,12 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
--else
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
@@ -11981,37 +12047,32 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen"
--else
++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $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 dlopen ();
--int
--main ()
--{
--return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12633,57 +11777,28 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -12033,19 +12094,23 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
--fi
++ ac_cv_lib_dl_dlopen=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -12071,7 +12136,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12701,57 +11786,28 @@ return dlopen ();
+@@ -12701,57 +11816,28 @@
return 0;
}
_ACEOF
@@ -12138,7 +12203,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12769,43 +11825,18 @@ return dld_link ();
+@@ -12769,43 +11855,18 @@
return 0;
}
_ACEOF
@@ -12188,7 +12253,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12844,9 +11875,9 @@ fi
+@@ -12844,9 +11905,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -12200,16 +12265,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12855,7 +11886,7 @@ else
+@@ -12855,7 +11916,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12858 "configure"
-+#line 11889 "configure"
++#line 11919 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12914,11 +11945,11 @@ int main ()
+@@ -12914,11 +11975,11 @@
return status;
}
_LT_EOF
@@ -12224,7 +12289,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12935,14 +11966,14 @@ rm -fr conftest*
+@@ -12935,14 +11996,14 @@
fi
@@ -12242,16 +12307,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12951,7 +11982,7 @@ else
+@@ -12951,7 +12012,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12954 "configure"
-+#line 11985 "configure"
++#line 12015 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13010,11 +12041,11 @@ int main ()
+@@ -13010,11 +12071,11 @@
return status;
}
_LT_EOF
@@ -12266,7 +12331,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13031,7 +12062,7 @@ rm -fr conftest*
+@@ -13031,7 +12092,7 @@
fi
@@ -12275,7 +12340,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13070,12 +12101,12 @@ fi
+@@ -13070,12 +12131,12 @@
striplib=
old_striplib=
@@ -12290,7 +12355,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13084,15 +12115,15 @@ else
+@@ -13084,15 +12145,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -12309,7 +12374,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13110,12 +12141,12 @@ fi
+@@ -13110,12 +12171,12 @@
# Report which library types will actually be built
@@ -12325,7 +12390,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13136,14 +12167,14 @@ $as_echo_n "checking whether to build sh
+@@ -13136,14 +12197,14 @@
fi
;;
esac
@@ -12343,7 +12408,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13180,22 +12211,18 @@ CC="$lt_save_CC"
+@@ -13180,22 +12241,18 @@
#AC_PROG_SED available in 2.59b
if test "x$CC" != xcc; then
@@ -12370,7 +12435,7 @@
/* end confdefs.h. */
int
-@@ -13211,63 +12238,63 @@ _ACEOF
+@@ -13211,63 +12268,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -12459,7 +12524,7 @@
then
# cc works too.
:
-@@ -13284,15 +12311,13 @@ rm -f core conftest*
+@@ -13284,15 +12341,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -12478,7 +12543,7 @@
fi
-@@ -13322,9 +12347,9 @@ fi
+@@ -13322,9 +12377,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12490,7 +12555,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -13337,14 +12362,14 @@ for as_dir in $PATH
+@@ -13337,14 +12392,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12508,7 +12573,7 @@
IFS=$as_save_IFS
;;
-@@ -13352,10 +12377,10 @@ esac
+@@ -13352,10 +12407,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -12521,7 +12586,7 @@
$as_echo "no" >&6; }
fi
-@@ -13369,20 +12394,18 @@ test -n "$PYTHON" || PYTHON=":"
+@@ -13369,20 +12424,18 @@
if test "$PYTHON" = :; then
@@ -12546,7 +12611,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -13394,23 +12417,23 @@ $as_echo "$am_cv_python_version" >&6; }
+@@ -13394,23 +12447,23 @@
@@ -12575,7 +12640,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -13429,7 +12452,7 @@ else
+@@ -13429,7 +12482,7 @@
esac
fi
@@ -12584,7 +12649,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -13438,9 +12461,9 @@ $as_echo "$am_cv_python_pythondir" >&6;
+@@ -13438,9 +12491,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -12596,7 +12661,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -13459,7 +12482,7 @@ else
+@@ -13459,7 +12512,7 @@
esac
fi
@@ -12605,7 +12670,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -13474,9 +12497,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
+@@ -13474,9 +12527,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -12617,7 +12682,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -13489,14 +12512,14 @@ for as_dir in $PATH
+@@ -13489,14 +12542,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12635,7 +12700,7 @@
IFS=$as_save_IFS
;;
-@@ -13504,19 +12527,19 @@ esac
+@@ -13504,19 +12557,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -12659,7 +12724,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -13529,14 +12552,14 @@ for as_dir in $PATH
+@@ -13529,14 +12582,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12677,7 +12742,7 @@
IFS=$as_save_IFS
;;
-@@ -13544,10 +12567,10 @@ esac
+@@ -13544,10 +12597,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -12690,7 +12755,7 @@
$as_echo "no" >&6; }
fi
-@@ -13556,7 +12579,7 @@ fi
+@@ -13556,7 +12609,7 @@
# Check whether --enable-compile-warnings was given.
@@ -12699,7 +12764,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -13587,13 +12610,9 @@ fi
+@@ -13587,13 +12640,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -12715,7 +12780,7 @@
/* end confdefs.h. */
int
-@@ -13604,35 +12623,14 @@ main ()
+@@ -13604,35 +12653,14 @@
return 0;
}
_ACEOF
@@ -12754,7 +12819,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -13646,26 +12644,24 @@ $as_echo "$has_option" >&6; }
+@@ -13646,26 +12674,24 @@
fi
;;
*)
@@ -12786,7 +12851,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -13680,7 +12676,7 @@ $as_echo_n "checking what language compl
+@@ -13680,7 +12706,7 @@
esac
fi
fi
@@ -12795,7 +12860,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13688,7 +12684,7 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -13688,7 +12714,7 @@
# Check whether --enable-deprecations was given.
@@ -12804,7 +12869,7 @@
enableval=$enable_deprecations;
else
enable_deprecations=no
-@@ -13700,288 +12696,59 @@ if test "x$enable_deprecations" = "xyes"
+@@ -13700,253 +12726,24 @@
fi
@@ -12834,12 +12899,7 @@
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_crt_externs_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CRT_EXTERNS_H 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -12862,15 +12922,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_compiler=no
- fi
-
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-+done
-
+-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -12881,13 +12940,7 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-+for ac_func in _NSGetEnviron
-+do :
-+ ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron"
-+if test "x$ac_cv_func__NSGetEnviron" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE__NSGETENVIRON 1
- _ACEOF
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -12909,11 +12962,10 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_header_preproc=no
- fi
-+done
-
+-fi
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
@@ -12959,39 +13011,26 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+LIBGNOME_DESKTOP_REQUIRED=2.11.1
-+GDK_PIXBUF_REQUIRED=2.7.1
-+PANGO_REQUIRED=1.15.4
-+GLIB_REQUIRED=2.18.0
-+GTK_REQUIRED=2.15.1
-+LIBGNOME_REQUIRED=2.13.0
-+LIBGNOMEUI_REQUIRED=2.5.4
-+LIBBONOBOUI_REQUIRED=2.1.1
-+ORBIT_REQUIRED=2.4.0
-+LIBWNCK_REQUIRED=2.19.5
-+GCONF_REQUIRED=2.6.1
-+LIBGNOME_MENU_REQUIRED=2.27.92
-+LIBECAL_REQUIRED=1.6.0
-+LIBEDATASERVER_REQUIRED=1.2.0
-+LIBEDATASERVERUI_REQUIRED=1.2.0
-+CAIRO_REQUIRED=1.0.0
-+DBUS_GLIB_REQUIRED=0.60
-+GWEATHER_REQUIRED=2.27.90
-
--fi
-
--done
-
-
--for ac_func in _NSGetEnviron
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default"
++if test "x$ac_cv_header_crt_externs_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CRT_EXTERNS_H 1
+ _ACEOF
+
+ fi
+
+ done
+
+-
+ for ac_func in _NSGetEnviron
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13084,54 +13123,28 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron"
++if test "x$ac_cv_func__NSGetEnviron" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--LIBGNOME_DESKTOP_REQUIRED=2.11.1
--GDK_PIXBUF_REQUIRED=2.7.1
--PANGO_REQUIRED=1.15.4
--GLIB_REQUIRED=2.18.0
--GTK_REQUIRED=2.15.1
--LIBGNOME_REQUIRED=2.13.0
--LIBGNOMEUI_REQUIRED=2.5.4
--LIBBONOBOUI_REQUIRED=2.1.1
--ORBIT_REQUIRED=2.4.0
--LIBWNCK_REQUIRED=2.19.5
--GCONF_REQUIRED=2.6.1
--LIBGNOME_MENU_REQUIRED=2.27.92
--LIBECAL_REQUIRED=1.6.0
--LIBEDATASERVER_REQUIRED=1.2.0
--LIBEDATASERVERUI_REQUIRED=1.2.0
--CAIRO_REQUIRED=1.0.0
--DBUS_GLIB_REQUIRED=0.60
--GWEATHER_REQUIRED=2.27.90
--
--
--
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++#define HAVE__NSGETENVIRON 1
+ _ACEOF
+
+ fi
+@@ -13979,9 +12776,9 @@
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13994,14 +12761,14 @@ for as_dir in $PATH
+@@ -13994,14 +12791,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13149,7 +13162,7 @@
IFS=$as_save_IFS
;;
-@@ -14009,10 +12776,10 @@ esac
+@@ -14009,10 +12806,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -13162,7 +13175,7 @@
$as_echo "no" >&6; }
fi
-@@ -14022,9 +12789,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -14022,9 +12819,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -13174,7 +13187,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -14037,14 +12804,14 @@ for as_dir in $PATH
+@@ -14037,14 +12834,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13192,7 +13205,7 @@
IFS=$as_save_IFS
;;
-@@ -14052,10 +12819,10 @@ esac
+@@ -14052,10 +12849,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -13205,7 +13218,7 @@
$as_echo "no" >&6; }
fi
-@@ -14064,7 +12831,7 @@ fi
+@@ -14064,7 +12861,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13214,7 +13227,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -14077,13 +12844,13 @@ fi
+@@ -14077,13 +12874,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -13231,7 +13244,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -14091,40 +12858,44 @@ $as_echo "no" >&6; }
+@@ -14091,40 +12888,44 @@
fi
pkg_failed=no
@@ -13295,7 +13308,7 @@
fi
-@@ -14137,25 +12908,14 @@ else
+@@ -14137,25 +12938,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13324,7 +13337,7 @@
$PANEL_PKG_ERRORS
-@@ -14165,12 +12925,11 @@ installed software in a non-standard pre
+@@ -14165,12 +12955,11 @@
Alternatively, you may set the environment variables PANEL_CFLAGS
and PANEL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13340,7 +13353,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14179,22 +12938,104 @@ and PANEL_LIBS to avoid the need to call
+@@ -14179,22 +12968,104 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13454,7 +13467,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14203,40 +13044,44 @@ fi
+@@ -14203,40 +13074,44 @@
pkg_failed=no
@@ -13518,7 +13531,7 @@
fi
-@@ -14249,25 +13094,14 @@ else
+@@ -14249,25 +13124,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13547,7 +13560,7 @@
$LIBPANEL_APPLET_PKG_ERRORS
-@@ -14277,22 +13111,11 @@ installed software in a non-standard pre
+@@ -14277,22 +13141,11 @@
Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13573,7 +13586,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14301,12 +13124,11 @@ and LIBPANEL_APPLET_LIBS to avoid the ne
+@@ -14301,12 +13154,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13588,7 +13601,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14315,40 +13137,44 @@ fi
+@@ -14315,40 +13167,44 @@
pkg_failed=no
@@ -13652,7 +13665,7 @@
fi
-@@ -14361,25 +13187,14 @@ else
+@@ -14361,25 +13217,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13681,7 +13694,7 @@
$FISH_PKG_ERRORS
-@@ -14389,22 +13204,11 @@ installed software in a non-standard pre
+@@ -14389,22 +13234,11 @@
Alternatively, you may set the environment variables FISH_CFLAGS
and FISH_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13707,7 +13720,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14413,12 +13217,11 @@ and FISH_LIBS to avoid the need to call
+@@ -14413,12 +13247,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13722,7 +13735,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14427,40 +13230,44 @@ fi
+@@ -14427,40 +13260,44 @@
pkg_failed=no
@@ -13762,13 +13775,14 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$NOTIFICATION_AREA_LIBS"; then
+ pkg_cv_NOTIFICATION_AREA_LIBS="$NOTIFICATION_AREA_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
@@ -13786,7 +13800,7 @@
fi
-@@ -14473,25 +13280,14 @@ else
+@@ -14473,25 +13310,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13815,7 +13829,7 @@
$NOTIFICATION_AREA_PKG_ERRORS
-@@ -14501,22 +13297,11 @@ installed software in a non-standard pre
+@@ -14501,22 +13327,11 @@
Alternatively, you may set the environment variables NOTIFICATION_AREA_CFLAGS
and NOTIFICATION_AREA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13841,7 +13855,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14525,12 +13310,11 @@ and NOTIFICATION_AREA_LIBS to avoid the
+@@ -14525,12 +13340,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13856,7 +13870,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14539,40 +13323,44 @@ fi
+@@ -14539,40 +13353,44 @@
pkg_failed=no
@@ -13920,7 +13934,7 @@
fi
-@@ -14585,14 +13373,14 @@ else
+@@ -14585,14 +13403,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13938,7 +13952,7 @@
$WNCKLET_PKG_ERRORS
-@@ -14602,33 +13390,11 @@ installed software in a non-standard pre
+@@ -14602,33 +13420,11 @@
Alternatively, you may set the environment variables WNCKLET_CFLAGS
and WNCKLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13975,7 +13989,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14637,265 +13403,35 @@ and WNCKLET_LIBS to avoid the need to ca
+@@ -14637,265 +13433,35 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14251,7 +14265,7 @@
_ACEOF
fi
-@@ -14903,7 +13439,7 @@ done
+@@ -14903,7 +13469,7 @@
# Check whether --enable-eds was given.
@@ -14260,7 +14274,7 @@
enableval=$enable_eds;
else
enable_eds=auto
-@@ -14915,24 +13451,22 @@ if test "x$enable_eds" = "xyes"; then
+@@ -14915,24 +13481,22 @@
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
else
if test "x$enable_eds" != "xno"; then
@@ -14289,7 +14303,7 @@
fi
if test -n "$LIBECAL_REQUIREMENT"; then
-@@ -14947,40 +13481,44 @@ fi
+@@ -14947,40 +13511,44 @@
pkg_failed=no
@@ -14302,19 +14316,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CLOCK_CFLAGS"; then
+ pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
++ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -14329,19 +14346,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$CLOCK_LIBS"; then
+ pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
++ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -14353,15 +14373,15 @@
fi
-@@ -14993,25 +13531,14 @@ else
+@@ -14993,25 +13561,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED"`
++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
else
- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED"`
++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED"`
fi
# Put the nasty error message in config.log where it belongs
echo "$CLOCK_PKG_ERRORS" >&5
@@ -14378,11 +14398,11 @@
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
-+ as_fn_error "Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
++ as_fn_error "Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
$CLOCK_PKG_ERRORS
-@@ -15021,22 +13548,11 @@ installed software in a non-standard pre
+@@ -15021,22 +13578,11 @@
Alternatively, you may set the environment variables CLOCK_CFLAGS
and CLOCK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14408,7 +14428,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15045,12 +13561,11 @@ and CLOCK_LIBS to avoid the need to call
+@@ -15045,12 +13591,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14423,7 +14443,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15059,40 +13574,44 @@ fi
+@@ -15059,40 +13604,44 @@
pkg_failed=no
@@ -14487,7 +14507,7 @@
fi
-@@ -15105,25 +13624,14 @@ else
+@@ -15105,25 +13654,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14516,7 +14536,7 @@
$CLOCK_MECHANISM_PKG_ERRORS
-@@ -15133,22 +13641,11 @@ installed software in a non-standard pre
+@@ -15133,12 +13671,11 @@
Alternatively, you may set the environment variables CLOCK_MECHANISM_CFLAGS
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14528,6 +14548,16 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -15147,22 +13684,11 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -14536,16 +14566,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15157,12 +13654,11 @@ and CLOCK_MECHANISM_LIBS to avoid the ne
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -14557,7 +14577,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15179,7 +13675,7 @@ NETWORK_MANAGER_REQUIRED=0.6
+@@ -15179,7 +13705,7 @@
POLKIT_CFLAGS=
POLKIT_LIBS=
# Check whether --enable-polkit was given.
@@ -14566,7 +14586,7 @@
enableval=$enable_polkit; enable_polkit=$enableval
else
enable_polkit=auto
-@@ -15191,40 +13687,44 @@ else
+@@ -15191,40 +13717,44 @@
HAVE_POLKIT=no
pkg_failed=no
@@ -14630,7 +14650,7 @@
fi
-@@ -15237,14 +13737,14 @@ else
+@@ -15237,14 +13767,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14648,7 +14668,7 @@
$as_echo "no" >&6; }
HAVE_POLKIT=no
elif test $pkg_failed = untried; then
-@@ -15252,22 +13752,18 @@ elif test $pkg_failed = untried; then
+@@ -15252,22 +13782,18 @@
else
POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
@@ -14674,7 +14694,7 @@
fi
fi
-@@ -15283,7 +13779,7 @@ fi
+@@ -15283,7 +13809,7 @@
# Check whether --enable-network_manager was given.
@@ -14683,7 +14703,7 @@
enableval=$enable_network_manager; enable_network_manager=$enableval
else
enable_network_manager=auto
-@@ -15294,40 +13790,44 @@ if test "x$enable_network_manager" = "xn
+@@ -15294,40 +13820,44 @@
else
pkg_failed=no
@@ -14747,7 +14767,7 @@
fi
-@@ -15340,14 +13840,14 @@ else
+@@ -15340,14 +13870,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14765,7 +14785,7 @@
$as_echo "no" >&6; }
HAVE_NETWORK_MANAGER=no
elif test $pkg_failed = untried; then
-@@ -15355,16 +13855,14 @@ elif test $pkg_failed = untried; then
+@@ -15355,16 +13885,14 @@
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
@@ -14784,7 +14804,7 @@
fi
-@@ -15374,7 +13872,7 @@ PANEL_INPROCESS_ALL=
+@@ -15374,7 +13902,7 @@
PANEL_INPROCESS_APPLETS=
# Check whether --with-in-process-applets was given.
@@ -14793,7 +14813,7 @@
withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
if test $i = "none"; then
PANEL_INPROCESS_NONE=1
-@@ -15405,30 +13903,22 @@ for i in $PANEL_INPROCESS_APPLETS; do
+@@ -15405,30 +13933,22 @@
if test $i = "clock"; then
CLOCK_COMPILE_INPROCESS=1
@@ -14828,7 +14848,7 @@
fi; fi; fi; fi
done
-@@ -15467,24 +13957,15 @@ fi
+@@ -15467,24 +13987,15 @@
# For the run dialog
@@ -14856,7 +14876,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
-@@ -15498,41 +13979,18 @@ return 0;
+@@ -15498,41 +14009,18 @@
return 0;
}
_ACEOF
@@ -14904,7 +14924,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
-@@ -15543,17 +14001,13 @@ fi
+@@ -15543,17 +14031,13 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -14925,7 +14945,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15578,70 +14032,39 @@ for ac_lib in '' dir; do
+@@ -15578,70 +14062,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15007,7 +15027,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15666,70 +14089,39 @@ for ac_lib in '' x; do
+@@ -15666,70 +14119,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -15089,7 +15109,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -15756,60 +14148,33 @@ struct dirent dp; dp.d_type = 0;
+@@ -15756,60 +14178,33 @@
return 0;
}
_ACEOF
@@ -15158,7 +15178,7 @@
withval=$with_x;
fi
-@@ -15819,10 +14184,8 @@ if test "x$with_x" = xno; then
+@@ -15819,10 +14214,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -15171,7 +15191,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -15870,21 +14233,25 @@ fi
+@@ -15870,21 +14263,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -15197,7 +15217,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -15906,37 +14273,14 @@ ac_x_header_dirs='
+@@ -15906,37 +14303,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -15237,7 +15257,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -15944,7 +14288,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15944,7 +14318,6 @@
fi
done
fi
@@ -15245,7 +15265,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -15954,11 +14297,7 @@ if test "$ac_x_libraries" = no; then
+@@ -15954,11 +14327,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -15258,7 +15278,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -15969,35 +14308,12 @@ XrmInitialize ()
+@@ -15969,35 +14338,12 @@
return 0;
}
_ACEOF
@@ -15296,7 +15316,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -16009,10 +14325,8 @@ do
+@@ -16009,10 +14355,8 @@
done
done
fi
@@ -15309,7 +15329,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -16033,7 +14347,7 @@ fi
+@@ -16033,7 +14377,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -15318,7 +15338,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -16044,46 +14358,50 @@ else
+@@ -16044,46 +14388,50 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -15389,7 +15409,7 @@
fi
-@@ -16096,14 +14414,14 @@ else
+@@ -16096,14 +14444,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15407,7 +15427,7 @@
$as_echo "no" >&6; }
# pkg-config modules not found (only present since X11R7 aka Xorg); use
-@@ -16111,9 +14429,7 @@ $as_echo "no" >&6; }
+@@ -16111,9 +14459,7 @@
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
@@ -15418,7 +15438,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -16126,16 +14442,12 @@ else
+@@ -16126,16 +14472,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 . . . .
@@ -15437,7 +15457,7 @@
/* end confdefs.h. */
int
-@@ -16146,40 +14458,13 @@ main ()
+@@ -16146,40 +14488,13 @@
return 0;
}
_ACEOF
@@ -15482,7 +15502,7 @@
/* end confdefs.h. */
int
-@@ -16190,46 +14475,19 @@ main ()
+@@ -16190,46 +14505,19 @@
return 0;
}
_ACEOF
@@ -15536,7 +15556,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -16245,11 +14503,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16245,11 +14533,7 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -15549,7 +15569,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16267,44 +14521,17 @@ return XOpenDisplay ();
+@@ -16267,44 +14551,17 @@
return 0;
}
_ACEOF
@@ -15599,7 +15619,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16322,59 +14549,30 @@ return dnet_ntoa ();
+@@ -16322,59 +14579,30 @@
return 0;
}
_ACEOF
@@ -15668,7 +15688,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16392,52 +14590,25 @@ return dnet_ntoa ();
+@@ -16392,52 +14620,25 @@
return 0;
}
_ACEOF
@@ -15729,7 +15749,1383 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -16448,105 +14619,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16448,33 +14649,21 @@
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+-$as_echo_n "checking for gethostbyname... " >&6; }
+-if test "${ac_cv_func_gethostbyname+set}" = set; then
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define gethostbyname innocuous_gethostbyname
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char gethostbyname (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef gethostbyname
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -16483,13 +14672,6 @@
+ extern "C"
+ #endif
+ char gethostbyname ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+-choke me
+-#endif
+-
+ int
+ main ()
+ {
+@@ -16498,55 +14680,30 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_gethostbyname=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_nsl_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_gethostbyname=no
++ ac_cv_lib_nsl_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+
+- if test $ac_cv_func_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++ if test $ac_cv_lib_nsl_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
++$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lbsd $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16564,113 +14721,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_nsl_gethostbyname=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_nsl_gethostbyname=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+-fi
+-
+- if test $ac_cv_lib_nsl_gethostbyname = no; then
+- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lbsd $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname ();
+-int
+-main ()
+-{
+-return gethostbyname ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_bsd_gethostbyname=no
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -16684,105 +14746,20 @@
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+- { $as_echo "$as_me:$LINENO: checking for connect" >&5
+-$as_echo_n "checking for connect... " >&6; }
+-if test "${ac_cv_func_connect+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define connect innocuous_connect
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char connect (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef connect
+-
+-/* 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 connect ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_connect || defined __stub___connect
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return connect ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_connect=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_connect=no
+-fi
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16800,76 +14777,39 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_connect=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_socket_connect=no
++ ac_cv_lib_socket_connect=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+- { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+set}" = set; then
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_remove = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lposix $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char remove (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef remove
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -16878,13 +14818,6 @@
+ extern "C"
+ #endif
+ char remove ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_remove || defined __stub___remove
+-choke me
+-#endif
+-
+ int
+ main ()
+ {
+@@ -16893,55 +14826,38 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_remove=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_posix_remove=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_remove=no
++ ac_cv_lib_posix_remove=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
++$as_echo "$ac_cv_lib_posix_remove" >&6; }
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++ fi
++
++ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+
+- if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-$as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++ if test $ac_cv_func_shmat = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
++$as_echo_n "checking for shmat in -lipc... " >&6; }
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lposix $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lipc $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16950,85 +14866,51 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char remove ();
++char shmat ();
+ int
+ main ()
+ {
+-return remove ();
++return shmat ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_posix_remove=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_ipc_shmat=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_posix_remove=no
++ ac_cv_lib_ipc_shmat=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-$as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
++$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+
+ fi
++ fi
+
+- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+-$as_echo_n "checking for shmat... " >&6; }
+-if test "${ac_cv_func_shmat+set}" = set; then
++ # Check for libraries that X11R6 Xt/Xaw programs need.
++ ac_save_LDFLAGS=$LDFLAGS
++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
++ # check for ICE first), but we must link in the order -lSM -lICE or
++ # we get undefined symbols. So assume we have SM if we have ICE.
++ # These have to be linked with before -lX11, unlike the other
++ # libraries we check for below, so use a different variable.
++ # John Interrante, Karl Berry
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
++$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shmat innocuous_shmat
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shmat (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shmat
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -17036,206 +14918,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shmat ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_shmat || defined __stub___shmat
+-choke me
+-#endif
+-
++char IceConnectionNumber ();
+ int
+ main ()
+ {
+-return shmat ();
++return IceConnectionNumber ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_shmat=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_shmat=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-$as_echo "$ac_cv_func_shmat" >&6; }
+-
+- if test $ac_cv_func_shmat = no; then
+- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-$as_echo_n "checking for shmat in -lipc... " >&6; }
+-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lipc $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shmat ();
+-int
+-main ()
+-{
+-return shmat ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_ipc_shmat=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ipc_shmat=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+-fi
+-
+- fi
+- fi
+-
+- # Check for libraries that X11R6 Xt/Xaw programs need.
+- ac_save_LDFLAGS=$LDFLAGS
+- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+- # check for ICE first), but we must link in the order -lSM -lICE or
+- # we get undefined symbols. So assume we have SM if we have ICE.
+- # These have to be linked with before -lX11, unlike the other
+- # libraries we check for below, so use a different variable.
+- # John Interrante, Karl Berry
+- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char IceConnectionNumber ();
+-int
+-main ()
+-{
+-return IceConnectionNumber ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_ICE_IceConnectionNumber=no
++ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+
+@@ -17245,28 +14948,21 @@
+
+ # X not found
+ if test x$no_x = xyes ; then
+- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
+-$as_echo "$as_me: error: X development libraries not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "X development libraries not found" "$LINENO" 5
+ fi
+
+ gp_save_cflags="$CFLAGS"
+ gp_save_libs="$LIBS"
+ CFLAGS="$X_CFLAGS"
+ LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-
+-{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
+ $as_echo_n "checking for XFree in -lX11... " >&6; }
+-if test "${ac_cv_lib_X11_XFree+set}" = set; then
++if test "${ac_cv_lib_X11_XFree+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17284,43 +14980,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_X11_XFree=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_X11_XFree=no
++ ac_cv_lib_X11_XFree=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
+ $as_echo "$ac_cv_lib_X11_XFree" >&6; }
+-if test "x$ac_cv_lib_X11_XFree" = x""yes; then
++if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBX11 1
+ _ACEOF
+@@ -17328,24 +14999,17 @@
+ LIBS="-lX11 $LIBS"
+
+ else
+- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
+-$as_echo "$as_me: error: libX11 not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "libX11 not found" "$LINENO" 5
+ fi
+
+-
+-{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5
+ $as_echo_n "checking for XauFileName in -lXau... " >&6; }
+-if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
++if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXau $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17363,43 +15027,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_Xau_XauFileName=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_Xau_XauFileName=no
++ ac_cv_lib_Xau_XauFileName=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5
+ $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; }
+-if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then
++if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBXAU 1
+ _ACEOF
+@@ -17407,9 +15046,7 @@
+ LIBS="-lXau $LIBS"
+
+ else
+- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5
+-$as_echo "$as_me: error: libXau not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "libXau not found" "$LINENO" 5
+ fi
+
+ CFLAGS="$gp_save_cflags"
+@@ -17424,9 +15061,7 @@
+ if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+
+-cat >>confdefs.h <<\_ACEOF
+-#define X_DISPLAY_MISSING 1
+-_ACEOF
++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+ else
+@@ -17439,16 +15074,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 . . . .
+- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+ $as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ 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
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -17459,40 +15090,13 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- LIBS="$ac_xsave_LIBS -R $x_libraries"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ LIBS="$ac_xsave_LIBS -R $x_libraries"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -17503,46 +15107,19 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- { $as_echo "$as_me:$LINENO: result: neither works" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
+ fi
+@@ -17558,11 +15135,7 @@
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17580,44 +15153,17 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
+
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17635,59 +15181,30 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dnet_dnet_ntoa=no
++ ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17705,52 +15222,25 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dnet_stub_dnet_ntoa=no
++ ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+
+ fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+@@ -17761,341 +15251,20 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15826,24 +17222,32 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16564,59 +14650,30 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname ();
+-int
+-main ()
+-{
+-return gethostbyname ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -15865,54 +17269,55 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
- else
+- ac_cv_lib_nsl_gethostbyname=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
- $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+-fi
+-
+- if test $ac_cv_lib_nsl_gethostbyname = no; then
- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
- $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16634,43 +14691,18 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname ();
+-int
+-main ()
+-{
+-return gethostbyname ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -15934,35 +17339,35 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_gethostbyname=yes
- else
+- ac_cv_lib_bsd_gethostbyname=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
- $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-
-@@ -16684,105 +14716,20 @@ fi
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
+- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+-fi
+-
+- fi
+- fi
+-
+- # lieder at skyler.mavd.honeywell.com says without -lsocket,
+- # socket/setsockopt and other routines are undefined under SCO ODT
+- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+- # on later versions), says Simon Leinen: it contains gethostby*
+- # variants that don't use the name server (or something). -lsocket
+- # must be given before -lnsl if both are needed. We assume that
+- # if connect needs -lnsl, so does gethostbyname.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
@@ -16041,1353 +17446,45 @@
-
- ac_cv_func_connect=no
-fi
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
-- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
- $as_echo_n "checking for connect in -lsocket... " >&6; }
--if test "${ac_cv_lib_socket_connect+set}" = set; then
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16800,148 +14747,38 @@ return connect ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
- $as_echo "$ac_cv_lib_socket_connect" >&6; }
--if test "x$ac_cv_lib_socket_connect" = x""yes; then
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
-- { $as_echo "$as_me:$LINENO: checking for remove" >&5
--$as_echo_n "checking for remove... " >&6; }
--if test "${ac_cv_func_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define remove innocuous_remove
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef remove
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char remove ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_remove || defined __stub___remove
--choke me
--#endif
--
--int
--main ()
--{
--return remove ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_remove=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-
-- ac_cv_func_remove=no
- fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
--
- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
- $as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-+if test "${ac_cv_lib_posix_remove+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16959,148 +14796,38 @@ return remove ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_posix_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_posix_remove=no
-+ ac_cv_lib_posix_remove=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
- $as_echo "$ac_cv_lib_posix_remove" >&6; }
--if test "x$ac_cv_lib_posix_remove" = x""yes; then
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
--$as_echo_n "checking for shmat... " >&6; }
--if test "${ac_cv_func_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shmat innocuous_shmat
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shmat
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char shmat ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_shmat || defined __stub___shmat
--choke me
--#endif
--
--int
--main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_shmat=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shmat=no
--fi
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--$as_echo "$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
-- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
- $as_echo_n "checking for shmat in -lipc... " >&6; }
--if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17118,43 +14845,18 @@ return shmat ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ipc_shmat=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_ipc_shmat=no
-+ ac_cv_lib_ipc_shmat=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
- $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
--if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-
-@@ -17170,18 +14872,14 @@ fi
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
-- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
- $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
--if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17199,43 +14897,18 @@ return IceConnectionNumber ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_ICE_IceConnectionNumber=no
-+ ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
- $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
--if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
-+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-
-@@ -17245,28 +14918,21 @@ fi
-
- # X not found
- if test x$no_x = xyes ; then
-- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5
--$as_echo "$as_me: error: X development libraries not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "X development libraries not found" "$LINENO" 5
- fi
-
- gp_save_cflags="$CFLAGS"
- gp_save_libs="$LIBS"
- CFLAGS="$X_CFLAGS"
- LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
--
--{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
- $as_echo_n "checking for XFree in -lX11... " >&6; }
--if test "${ac_cv_lib_X11_XFree+set}" = set; then
-+if test "${ac_cv_lib_X11_XFree+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17284,43 +14950,18 @@ return XFree ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_X11_XFree=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_X11_XFree=no
-+ ac_cv_lib_X11_XFree=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
- $as_echo "$ac_cv_lib_X11_XFree" >&6; }
--if test "x$ac_cv_lib_X11_XFree" = x""yes; then
-+if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBX11 1
- _ACEOF
-@@ -17328,24 +14969,17 @@ _ACEOF
- LIBS="-lX11 $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
--$as_echo "$as_me: error: libX11 not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "libX11 not found" "$LINENO" 5
- fi
-
--
--{ $as_echo "$as_me:$LINENO: checking for XauFileName in -lXau" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauFileName in -lXau" >&5
- $as_echo_n "checking for XauFileName in -lXau... " >&6; }
--if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then
-+if test "${ac_cv_lib_Xau_XauFileName+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXau $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17363,43 +14997,18 @@ return XauFileName ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_Xau_XauFileName=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_Xau_XauFileName=no
-+ ac_cv_lib_Xau_XauFileName=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauFileName" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauFileName" >&5
- $as_echo "$ac_cv_lib_Xau_XauFileName" >&6; }
--if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then
-+if test "x$ac_cv_lib_Xau_XauFileName" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXAU 1
- _ACEOF
-@@ -17407,9 +15016,7 @@ _ACEOF
- LIBS="-lXau $LIBS"
-
- else
-- { { $as_echo "$as_me:$LINENO: error: libXau not found" >&5
--$as_echo "$as_me: error: libXau not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "libXau not found" "$LINENO" 5
- fi
-
- CFLAGS="$gp_save_cflags"
-@@ -17424,9 +15031,7 @@ elif test $pkg_failed = untried; then
- if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-
--cat >>confdefs.h <<\_ACEOF
--#define X_DISPLAY_MISSING 1
--_ACEOF
-+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
- else
-@@ -17439,16 +15044,12 @@ else
- 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 . . . .
-- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
- $as_echo_n "checking whether -R must be followed by a space... " >&6; }
- 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
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -17459,40 +15060,13 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- LIBS="$ac_xsave_LIBS -R $x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -17503,46 +15077,19 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- { $as_echo "$as_me:$LINENO: result: neither works" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
- $as_echo "neither works" >&6; }
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
- fi
-@@ -17558,11 +15105,7 @@ rm -f core conftest.err conftest.$ac_obj
- # libraries were built with DECnet support. And Karl Berry says
- # the Alpha needs dnet_stub (dnet does not exist).
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17580,44 +15123,17 @@ return XOpenDisplay ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
-
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
- $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
--if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17635,59 +15151,30 @@ return dnet_ntoa ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dnet_dnet_ntoa=no
-+ ac_cv_lib_dnet_dnet_ntoa=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
- $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
-+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
- $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
--if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17705,52 +15192,25 @@ return dnet_ntoa ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dnet_stub_dnet_ntoa=no
-+ ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
- $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
--if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
-+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
-
- fi
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17761,105 +15221,20 @@ rm -f core conftest.err conftest.$ac_obj
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
--$as_echo_n "checking for gethostbyname... " >&6; }
--if test "${ac_cv_func_gethostbyname+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define gethostbyname innocuous_gethostbyname
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char gethostbyname (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef gethostbyname
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char gethostbyname ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_gethostbyname || defined __stub___gethostbyname
--choke me
--#endif
--
--int
--main ()
--{
--return gethostbyname ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_gethostbyname=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_gethostbyname=no
--fi
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
- $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17877,59 +15252,30 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
- $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
--if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
-- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
- $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
--if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -17947,43 +15293,18 @@ return gethostbyname ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_gethostbyname=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_bsd_gethostbyname=no
-+ ac_cv_lib_bsd_gethostbyname=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
- $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
--if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
-+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-
-@@ -17997,33 +15318,21 @@ fi
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
-- { $as_echo "$as_me:$LINENO: checking for connect" >&5
--$as_echo_n "checking for connect... " >&6; }
--if test "${ac_cv_func_connect+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-+
-+fi
-+
-+ if test $ac_cv_func_connect = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-+$as_echo_n "checking for connect in -lsocket... " >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define connect innocuous_connect
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef connect
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -18032,13 +15341,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char connect ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_connect || defined __stub___connect
--choke me
--#endif
--
- int
- main ()
- {
-@@ -18047,55 +15349,38 @@ return connect ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_connect=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_socket_connect=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_connect=no
-+ ac_cv_lib_socket_connect=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-+$as_echo "$ac_cv_lib_socket_connect" >&6; }
-+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+ fi
-+
-+ # Guillermo Gomez says -lposix is necessary on A/UX.
-+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
-+
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
-
+-
- if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-+ if test $ac_cv_func_remove = no; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-+$as_echo_n "checking for remove in -lposix... " >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then :
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
+- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lposix $LIBS"
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18104,316 +15389,47 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -18104,85 +15273,40 @@
#ifdef __cplusplus
extern "C"
#endif
-char connect ();
-+char remove ();
++char gethostbyname ();
int
main ()
{
-return connect ();
-+return remove ();
++return gethostbyname ();
;
return 0;
}
@@ -17415,13 +17512,13 @@
- }; then
- ac_cv_lib_socket_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
++ ac_cv_lib_nsl_gethostbyname=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_posix_remove=no
++ ac_cv_lib_nsl_gethostbyname=no
fi
-
-rm -rf conftest.dSYM
@@ -17435,22 +17532,33 @@
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
--fi
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ if test $ac_cv_lib_nsl_gethostbyname = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
++$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lbsd $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define remove innocuous_remove
@@ -17467,13 +17575,13 @@
-#endif
-
-#undef remove
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -18190,71 +15314,54 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -17482,14 +17590,16 @@
-choke me
-#endif
-
--int
--main ()
--{
++char gethostbyname ();
+ int
+ main ()
+ {
-return remove ();
-- ;
-- return 0;
--}
--_ACEOF
++return gethostbyname ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17512,50 +17622,82 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_remove=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_bsd_gethostbyname=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_remove=no
--fi
--
++ ac_cv_lib_bsd_gethostbyname=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
++$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
++fi
++
++ fi
++ fi
++
++ # lieder at skyler.mavd.honeywell.com says without -lsocket,
++ # socket/setsockopt and other routines are undefined under SCO ODT
++ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
++ # on later versions), says Simon Leinen: it contains gethostby*
++ # variants that don't use the name server (or something). -lsocket
++ # must be given before -lnsl if both are needed. We assume that
++ # if connect needs -lnsl, so does gethostbyname.
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
--
+
- if test $ac_cv_func_remove = no; then
- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
++ if test $ac_cv_func_connect = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* 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
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18263,85 +15370,48 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char remove ();
--int
--main ()
--{
++char connect ();
+ int
+ main ()
+ {
-return remove ();
-- ;
-- return 0;
--}
--_ACEOF
++return connect ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17578,42 +17720,60 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_posix_remove=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_socket_connect=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
--fi
++ ac_cv_lib_socket_connect=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-+$as_echo "$ac_cv_lib_posix_remove" >&6; }
-+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
++$as_echo "$ac_cv_lib_socket_connect" >&6; }
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
++ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
fi
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++ # Guillermo Gomez says -lposix is necessary on A/UX.
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
++
++fi
++
++ if test $ac_cv_func_remove = no; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lposix $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shmat innocuous_shmat
@@ -17630,13 +17790,13 @@
-#endif
-
-#undef shmat
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -18349,71 +15419,47 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -17644,17 +17804,17 @@
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-+if test "x$ac_cv_func_shmat" = x""yes; then :
-
--int
--main ()
--{
+-
++char remove ();
+ int
+ main ()
+ {
-return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
++return remove ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -17677,20 +17837,38 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shmat=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_posix_remove=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shmat=no
++ ac_cv_lib_posix_remove=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
++$as_echo "$ac_cv_lib_posix_remove" >&6; }
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++ fi
++
++ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
++
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
--
+
if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
@@ -17710,7 +17888,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18431,43 +15447,18 @@ return shmat ();
+@@ -18431,43 +15477,18 @@
return 0;
}
_ACEOF
@@ -17760,7 +17938,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -18483,18 +15474,14 @@ fi
+@@ -18483,18 +15504,14 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -17782,7 +17960,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18512,43 +15499,18 @@ return IceConnectionNumber ();
+@@ -18512,43 +15529,18 @@
return 0;
}
_ACEOF
@@ -17832,7 +18010,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -18558,28 +15520,21 @@ fi
+@@ -18558,28 +15550,21 @@
# X not found
if test x$no_x = xyes ; then
@@ -17865,7 +18043,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18597,43 +15552,18 @@ return XFree ();
+@@ -18597,43 +15582,18 @@
return 0;
}
_ACEOF
@@ -17915,7 +18093,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
_ACEOF
-@@ -18641,24 +15571,17 @@ _ACEOF
+@@ -18641,24 +15601,17 @@
LIBS="-lX11 $LIBS"
else
@@ -17944,7 +18122,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18676,43 +15599,18 @@ return XauFileName ();
+@@ -18676,43 +15629,18 @@
return 0;
}
_ACEOF
@@ -17994,7 +18172,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
_ACEOF
-@@ -18720,9 +15618,7 @@ _ACEOF
+@@ -18720,9 +15648,7 @@
LIBS="-lXau $LIBS"
else
@@ -18005,7 +18183,7 @@
fi
CFLAGS="$gp_save_cflags"
-@@ -18733,7 +15629,7 @@ fi
+@@ -18733,7 +15659,7 @@
else
X_CFLAGS=$pkg_cv_X_CFLAGS
X_LIBS=$pkg_cv_X_LIBS
@@ -18014,7 +18192,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -18743,9 +15639,7 @@ fi
+@@ -18743,9 +15669,7 @@
if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
@@ -18025,11 +18203,25 @@
fi
-@@ -18769,151 +15663,12 @@ _ACEOF
-
-
-
--
+@@ -18756,164 +15680,25 @@
+ BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
+
+
+-BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+-
+-
+-
+-GETTEXT_PACKAGE=gnome-panel-2.0
+-
+-cat >>confdefs.h <<_ACEOF
+-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+-_ACEOF
+-
+-
+-
+-
++BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -18078,14 +18270,15 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
-fi
--
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++GETTEXT_PACKAGE=gnome-panel-2.0
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -18096,7 +18289,9 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -18118,14 +18313,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
-fi
--
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -18167,7 +18362,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -18182,7 +18377,7 @@
_ACEOF
fi
-@@ -18921,16 +15676,12 @@ fi
+@@ -18921,16 +15706,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -18202,7 +18397,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -18941,46 +15692,19 @@ return LC_MESSAGES
+@@ -18941,46 +15722,19 @@
return 0;
}
_ACEOF
@@ -18255,7 +18450,7 @@
fi
fi
-@@ -18993,155 +15717,20 @@ _ACEOF
+@@ -18993,155 +15747,20 @@
XGETTEXT=:
INTLLIBS=
@@ -18416,7 +18611,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19154,54 +15743,25 @@ return !ngettext ("","", 1)
+@@ -19154,54 +15773,25 @@
return 0;
}
_ACEOF
@@ -18479,7 +18674,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -19214,141 +15774,26 @@ return !dgettext ("","")
+@@ -19214,141 +15804,26 @@
return 0;
}
_ACEOF
@@ -18631,7 +18826,7 @@
_ACEOF
fi
-@@ -19363,18 +15808,14 @@ done
+@@ -19363,18 +15838,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -18653,7 +18848,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19384,63 +15825,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19384,63 +15855,34 @@
extern "C"
#endif
char bindtextdomain ();
@@ -18734,7 +18929,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19458,55 +15870,26 @@ return ngettext ();
+@@ -19458,55 +15900,26 @@
return 0;
}
_ACEOF
@@ -18799,7 +18994,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19524,43 +15907,18 @@ return dgettext ();
+@@ -19524,43 +15937,18 @@
return 0;
}
_ACEOF
@@ -18849,7 +19044,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -19570,22 +15928,18 @@ fi
+@@ -19570,22 +15958,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -18877,7 +19072,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19603,55 +15957,26 @@ return ngettext ();
+@@ -19603,55 +15987,26 @@
return 0;
}
_ACEOF
@@ -18942,7 +19137,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19669,43 +15994,18 @@ return dcgettext ();
+@@ -19669,43 +16024,18 @@
return 0;
}
_ACEOF
@@ -18992,7 +19187,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -19727,102 +16027,12 @@ fi
+@@ -19727,102 +16057,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -19100,7 +19295,7 @@
_ACEOF
fi
-@@ -19852,15 +16062,13 @@ done
+@@ -19852,15 +16092,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -19119,7 +19314,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -19885,118 +16093,28 @@ esac
+@@ -19885,118 +16123,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -19246,7 +19441,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -20011,14 +16129,14 @@ msgstr ""
+@@ -20011,14 +16159,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -19266,7 +19461,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -20026,9 +16144,9 @@ fi
+@@ -20026,9 +16174,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -19278,7 +19473,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -20041,14 +16159,14 @@ for as_dir in $PATH
+@@ -20041,14 +16189,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19296,7 +19491,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -20057,19 +16175,19 @@ esac
+@@ -20057,19 +16205,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -19320,7 +19515,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -20094,144 +16212,33 @@ esac
+@@ -20094,144 +16242,33 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -19481,7 +19676,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -20246,10 +16253,8 @@ fi
+@@ -20246,10 +16283,8 @@
;;
esac
fi
@@ -19494,7 +19689,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -20263,9 +16268,7 @@ fi
+@@ -20263,9 +16298,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -19505,7 +19700,7 @@
fi
-@@ -20273,7 +16276,7 @@ _ACEOF
+@@ -20273,7 +16306,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -19514,7 +19709,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -20306,7 +16309,7 @@ $as_echo "found xgettext program is not
+@@ -20306,7 +16339,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -19523,7 +19718,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -20331,7 +16334,7 @@ $as_echo_n "checking for catalogs to be
+@@ -20331,7 +16364,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -19532,7 +19727,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -20369,9 +16372,9 @@ $as_echo "$LINGUAS" >&6; }
+@@ -20369,9 +16402,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -19544,7 +19739,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -20384,14 +16387,14 @@ for as_dir in $PATH
+@@ -20384,14 +16417,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19562,7 +19757,7 @@
IFS=$as_save_IFS
;;
-@@ -20399,10 +16402,10 @@ esac
+@@ -20399,10 +16432,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -19575,7 +19770,7 @@
$as_echo "no" >&6; }
fi
-@@ -20411,9 +16414,9 @@ fi
+@@ -20411,9 +16444,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19587,7 +19782,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -20426,14 +16429,14 @@ for as_dir in $PATH
+@@ -20426,14 +16459,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19605,7 +19800,7 @@
IFS=$as_save_IFS
;;
-@@ -20441,10 +16444,10 @@ esac
+@@ -20441,10 +16474,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -19618,7 +19813,7 @@
$as_echo "no" >&6; }
fi
-@@ -20455,9 +16458,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+@@ -20455,9 +16488,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -19630,7 +19825,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -20470,14 +16473,14 @@ for as_dir in $PATH
+@@ -20470,14 +16503,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19648,7 +19843,7 @@
IFS=$as_save_IFS
;;
-@@ -20485,10 +16488,10 @@ esac
+@@ -20485,10 +16518,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -19661,7 +19856,7 @@
$as_echo "no" >&6; }
fi
-@@ -20496,7 +16499,7 @@ fi
+@@ -20496,7 +16529,7 @@
# Check whether --with-html-dir was given.
@@ -19670,7 +19865,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -20506,7 +16509,7 @@ fi
+@@ -20506,7 +16539,7 @@
# Check whether --enable-gtk-doc was given.
@@ -19679,7 +19874,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -20515,33 +16518,31 @@ fi
+@@ -20515,33 +16548,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -19721,7 +19916,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -20600,11 +16601,11 @@ fi
+@@ -20600,11 +16631,11 @@
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -19736,7 +19931,7 @@
gdu_cv_have_gdu=yes
else
gdu_cv_have_gdu=no
-@@ -20613,15 +16614,13 @@ fi
+@@ -20613,15 +16644,13 @@
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -19754,7 +19949,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -20632,7 +16631,7 @@ HELP_DIR="$with_help_dir"
+@@ -20632,7 +16661,7 @@
# Check whether --with-omf-dir was given.
@@ -19763,7 +19958,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -20643,7 +16642,7 @@ OMF_DIR="$with_omf_dir"
+@@ -20643,7 +16672,7 @@
# Check whether --with-help-formats was given.
@@ -19772,7 +19967,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -20653,7 +16652,7 @@ DOC_USER_FORMATS="$with_help_formats"
+@@ -20653,7 +16682,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -19781,7 +19976,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -20691,13 +16690,13 @@ fi
+@@ -20691,13 +16720,13 @@
# Check whether --with-gconf-source was given.
@@ -19797,7 +19992,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -20706,22 +16705,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -20706,22 +16735,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -19824,7 +20019,7 @@
esac
fi
-@@ -20739,9 +16736,7 @@ case $host in
+@@ -20739,9 +16766,7 @@
*-*-solaris*)
ostype=solaris
@@ -19835,7 +20030,7 @@
;;
esac
-@@ -20750,9 +16745,9 @@ for ac_prog in mawk gawk nawk awk
+@@ -20750,9 +16775,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19847,7 +20042,7 @@
$as_echo_n "(cached) " >&6
else
case $AWK in
-@@ -20765,14 +16760,14 @@ for as_dir in $PATH
+@@ -20765,14 +16790,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19865,7 +20060,7 @@
IFS=$as_save_IFS
;;
-@@ -20780,10 +16775,10 @@ esac
+@@ -20780,10 +16805,10 @@
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -19878,7 +20073,7 @@
$as_echo "no" >&6; }
fi
-@@ -20795,9 +16790,9 @@ for ac_prog in perl5 perl
+@@ -20795,9 +16820,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19890,7 +20085,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -20810,14 +16805,14 @@ for as_dir in $PATH
+@@ -20810,14 +16835,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19908,7 +20103,7 @@
IFS=$as_save_IFS
;;
-@@ -20825,10 +16820,10 @@ esac
+@@ -20825,10 +16850,10 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -19921,7 +20116,7 @@
$as_echo "no" >&6; }
fi
-@@ -20838,7 +16833,7 @@ done
+@@ -20838,7 +16863,7 @@
# Check whether --enable-rebuilds was given.
@@ -19930,7 +20125,7 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
-@@ -20882,13 +16877,13 @@ _ACEOF
+@@ -20882,13 +16907,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -19946,7 +20141,7 @@
esac ;;
esac
done
-@@ -20896,8 +16891,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20896,8 +16921,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -19957,7 +20152,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20920,11 +16915,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20920,11 +16945,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -19971,7 +20166,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20944,8 +16939,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -20944,8 +16969,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -19982,7 +20177,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20961,143 +16956,90 @@ else
+@@ -20961,143 +16986,90 @@
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -20165,7 +20360,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -21107,17 +17049,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -21107,17 +17079,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -20191,7 +20386,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -21125,23 +17068,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -21125,23 +17098,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -20220,7 +20415,7 @@
as_nl='
'
export as_nl
-@@ -21149,7 +17084,13 @@ export as_nl
+@@ -21149,7 +17114,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -20235,7 +20430,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -21160,7 +17101,7 @@ else
+@@ -21160,7 +17131,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -20244,7 +20439,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -21183,13 +17124,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -21183,13 +17154,6 @@
}
fi
@@ -20258,7 +20453,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -21199,15 +17133,15 @@ fi
+@@ -21199,15 +17163,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -20277,7 +20472,7 @@
IFS=$as_save_IFS
;;
-@@ -21219,12 +17153,16 @@ if test "x$as_myself" = x; then
+@@ -21219,12 +17183,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -20298,7 +20493,7 @@
done
PS1='$ '
PS2='> '
-@@ -21236,7 +17174,89 @@ export LC_ALL
+@@ -21236,7 +17204,89 @@
LANGUAGE=C
export LANGUAGE
@@ -20389,7 +20584,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -21250,8 +17270,12 @@ else
+@@ -21250,8 +17300,12 @@
as_basename=false
fi
@@ -20403,7 +20598,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -21271,76 +17295,25 @@ $as_echo X/"$0" |
+@@ -21271,76 +17325,25 @@
}
s/.*/./; q'`
@@ -20491,7 +20686,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -21369,8 +17342,56 @@ fi
+@@ -21369,8 +17372,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -20549,7 +20744,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -21389,10 +17410,10 @@ else
+@@ -21389,10 +17440,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -20562,7 +20757,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -21407,13 +17428,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -21407,13 +17458,19 @@
exec 6>&1
@@ -20580,11 +20775,11 @@
ac_log="
This file was extended by gnome-panel $as_me 2.28.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -21445,10 +17472,11 @@ _ACEOF
+@@ -21445,13 +17502,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -20599,7 +20794,11 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -21470,16 +17498,16 @@ $config_headers
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -21470,16 +17529,17 @@
Configuration commands:
$config_commands
@@ -20608,18 +20807,29 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
gnome-panel config.status 2.28.0
-configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21522,20 +17550,19 @@ do
+@@ -21515,6 +17575,8 @@
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -21522,20 +17584,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -20644,7 +20854,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21543,11 +17570,10 @@ Try \`$0 --help' for more information."
+@@ -21543,11 +17604,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -20659,7 +20869,7 @@
ac_need_defaults=false ;;
esac
-@@ -21890,9 +17916,7 @@ do
+@@ -21890,9 +17950,7 @@
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -20670,7 +20880,7 @@
esac
done
-@@ -21919,7 +17943,7 @@ $debug ||
+@@ -21919,7 +17977,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -20679,7 +20889,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21930,11 +17954,7 @@ $debug ||
+@@ -21930,11 +17988,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -20692,7 +20902,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21942,10 +17962,16 @@ $debug ||
+@@ -21942,10 +17996,16 @@
if test -n "$CONFIG_FILES"; then
@@ -20711,7 +20921,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21959,24 +17985,18 @@ _ACEOF
+@@ -21959,24 +18019,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -20739,7 +20949,25 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22065,9 +18085,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -21998,7 +18052,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -22012,7 +18066,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -22065,9 +18119,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -20750,7 +20978,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -22108,9 +18126,7 @@ for ac_last_try in false false :; do
+@@ -22108,9 +18160,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -20761,7 +20989,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22195,9 +18211,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22195,9 +18245,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -20772,7 +21000,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -22210,9 +18224,7 @@ do
+@@ -22210,9 +18258,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -20783,7 +21011,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -22240,12 +18252,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -22240,12 +18286,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -20798,7 +21026,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -22256,7 +18266,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -22256,7 +18300,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -20807,7 +21035,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -22269,9 +18279,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -22269,9 +18313,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -20818,7 +21046,7 @@
esac
;;
esac
-@@ -22299,47 +18307,7 @@ $as_echo X"$ac_file" |
+@@ -22299,47 +18341,7 @@
q
}
s/.*/./; q'`
@@ -20867,7 +21095,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -22396,7 +18364,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -22396,7 +18398,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -20875,7 +21103,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -22406,12 +18373,11 @@ ac_sed_dataroot='
+@@ -22406,12 +18407,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -20890,7 +21118,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -22421,7 +18387,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22421,7 +18421,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -20899,7 +21127,7 @@
esac
_ACEOF
-@@ -22450,14 +18416,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -22450,14 +18450,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -20916,7 +21144,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -22467,9 +18431,7 @@ which seems to be undefined. Please mak
+@@ -22467,9 +18465,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -20927,7 +21155,7 @@
;;
:H)
#
-@@ -22480,25 +18442,19 @@ $as_echo "$as_me: error: could not creat
+@@ -22480,25 +18476,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -20957,7 +21185,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22536,7 +18492,7 @@ $as_echo X"$_am_arg" |
+@@ -22536,7 +18526,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -20966,7 +21194,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22631,47 +18587,7 @@ $as_echo X"$file" |
+@@ -22631,47 +18621,7 @@
q
}
s/.*/./; q'`
@@ -21015,7 +21243,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -23324,9 +19240,7 @@ _LT_EOF
+@@ -23324,9 +19274,7 @@
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -21026,7 +21254,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -23349,15 +19263,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -23349,15 +19297,12 @@
done # for ac_tag
@@ -21044,7 +21272,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -23378,10 +19289,10 @@ if test "$no_create" != yes; then
+@@ -23378,10 +19323,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -21057,11 +21285,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: gnome-panel-2.28.0/doc/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/doc/Makefile.in 2009-09-29 21:41:01.731866090 +0200
-+++ gnome-panel-2.28.0/doc/Makefile.in 2009-09-29 21:59:14.871859292 +0200
-@@ -194,6 +194,8 @@ LIBTOOL = @LIBTOOL@
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -194,6 +194,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21070,7 +21296,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -219,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21078,11 +21304,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/doc/reference/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/doc/reference/Makefile.in 2009-09-29 21:41:01.679864445 +0200
-+++ gnome-panel-2.28.0/doc/reference/Makefile.in 2009-09-29 21:59:14.871859292 +0200
-@@ -194,6 +194,8 @@ LIBTOOL = @LIBTOOL@
+--- a/doc/reference/Makefile.in
++++ b/doc/reference/Makefile.in
+@@ -194,6 +194,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21091,7 +21315,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -219,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21099,11 +21323,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/doc/reference/panel-applet/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/doc/reference/panel-applet/Makefile.in 2009-09-29 21:41:01.635868354 +0200
-+++ gnome-panel-2.28.0/doc/reference/panel-applet/Makefile.in 2009-09-29 21:59:14.871859292 +0200
-@@ -161,6 +161,8 @@ LIBTOOL = @LIBTOOL@
+--- a/doc/reference/panel-applet/Makefile.in
++++ b/doc/reference/panel-applet/Makefile.in
+@@ -161,6 +161,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21112,7 +21334,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -186,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -186,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21120,11 +21342,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/gnome-panel/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/gnome-panel/Makefile.in 2009-09-29 21:41:01.607860396 +0200
-+++ gnome-panel-2.28.0/gnome-panel/Makefile.in 2009-09-29 21:59:14.875863293 +0200
-@@ -36,7 +36,8 @@ PRE_UNINSTALL = :
+--- a/gnome-panel/Makefile.in
++++ b/gnome-panel/Makefile.in
+@@ -36,7 +36,8 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@@ -21134,7 +21354,7 @@
subdir = gnome-panel
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/gnome-panel.desktop.in.in
-@@ -97,7 +98,8 @@ am__objects_3 = panel-typebuiltins.$(OBJ
+@@ -97,7 +98,8 @@
panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \
panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \
panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \
@@ -21144,7 +21364,7 @@
$(am__objects_1)
am__objects_4 = $(am__objects_1)
am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \
-@@ -109,6 +111,21 @@ gnome_panel_DEPENDENCIES = \
+@@ -109,6 +111,21 @@
gnome_panel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
@@ -21166,7 +21386,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -157,9 +174,10 @@ am__v_CCLD_0 = @echo " CCLD " $@;
+@@ -157,9 +174,10 @@
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
@@ -21179,7 +21399,7 @@
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
-@@ -300,6 +318,8 @@ LIBTOOL = @LIBTOOL@
+@@ -300,6 +318,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21188,7 +21408,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -325,6 +345,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -325,6 +345,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21196,7 +21416,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-@@ -503,6 +524,8 @@ panel_sources = \
+@@ -503,6 +524,8 @@
panel-force-quit.c \
panel-lockdown.c \
panel-addto.c \
@@ -21205,7 +21425,7 @@
panel-ditem-editor.c \
$(NULL)
-@@ -549,6 +572,8 @@ panel_headers = \
+@@ -549,6 +572,8 @@
panel-force-quit.h \
panel-lockdown.h \
panel-addto.h \
@@ -21214,7 +21434,7 @@
panel-ditem-editor.h \
panel-icon-names.h \
$(NULL)
-@@ -565,6 +590,21 @@ gnome_panel_LDADD = \
+@@ -565,6 +590,21 @@
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
@@ -21236,7 +21456,7 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-@@ -713,6 +753,9 @@ gnome-desktop-item-edit$(EXEEXT): $(gnom
+@@ -713,6 +753,9 @@
gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES)
@rm -f gnome-panel$(EXEEXT)
$(AM_V_CCLD)$(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
@@ -21246,7 +21466,7 @@
install-libexecSCRIPTS: $(libexec_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -761,6 +804,12 @@ distclean-compile:
+@@ -761,6 +804,12 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/button-widget.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-desktop-item-edit.Po at am__quote@
@@ -21259,7 +21479,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/launcher.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu.Po at am__quote@
-@@ -779,7 +828,9 @@ distclean-compile:
+@@ -779,7 +828,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-force-quit.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-frame.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gconf.Po at am__quote@
@@ -21269,7 +21489,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-marshal.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-bar.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-button.Po at am__quote@
-@@ -826,6 +877,102 @@ distclean-compile:
+@@ -826,6 +877,102 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -21372,11 +21592,9 @@
mostlyclean-libtool:
-rm -f *.lo
-Index: gnome-panel-2.28.0/help/clock/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/help/clock/Makefile.in 2009-09-29 21:41:01.523863407 +0200
-+++ gnome-panel-2.28.0/help/clock/Makefile.in 2009-09-29 21:59:14.875863293 +0200
-@@ -179,6 +179,8 @@ LIBTOOL = @LIBTOOL@
+--- a/help/clock/Makefile.in
++++ b/help/clock/Makefile.in
+@@ -179,6 +179,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21385,7 +21603,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -204,6 +206,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21393,11 +21611,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/help/fish/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/help/fish/Makefile.in 2009-09-29 21:41:01.491862200 +0200
-+++ gnome-panel-2.28.0/help/fish/Makefile.in 2009-09-29 21:59:14.875863293 +0200
-@@ -179,6 +179,8 @@ LIBTOOL = @LIBTOOL@
+--- a/help/fish/Makefile.in
++++ b/help/fish/Makefile.in
+@@ -179,6 +179,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21406,7 +21622,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -204,6 +206,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21414,11 +21630,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/help/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/help/Makefile.in 2009-09-29 21:41:01.460364060 +0200
-+++ gnome-panel-2.28.0/help/Makefile.in 2009-09-29 21:59:14.875863293 +0200
-@@ -194,6 +194,8 @@ LIBTOOL = @LIBTOOL@
+--- a/help/Makefile.in
++++ b/help/Makefile.in
+@@ -194,6 +194,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21427,7 +21641,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -219,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -219,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21435,11 +21649,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/16x16/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/16x16/Makefile.in 2009-09-29 21:41:01.432362942 +0200
-+++ gnome-panel-2.28.0/icons/16x16/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/16x16/Makefile.in
++++ b/icons/16x16/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21448,7 +21660,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21456,11 +21668,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/22x22/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/22x22/Makefile.in 2009-09-29 21:41:01.380366179 +0200
-+++ gnome-panel-2.28.0/icons/22x22/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/22x22/Makefile.in
++++ b/icons/22x22/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21469,7 +21679,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21477,11 +21687,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/24x24/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/24x24/Makefile.in 2009-09-29 21:41:01.340367240 +0200
-+++ gnome-panel-2.28.0/icons/24x24/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/24x24/Makefile.in
++++ b/icons/24x24/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21490,7 +21698,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21498,11 +21706,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/32x32/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/32x32/Makefile.in 2009-09-29 21:41:01.296367721 +0200
-+++ gnome-panel-2.28.0/icons/32x32/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/32x32/Makefile.in
++++ b/icons/32x32/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21511,7 +21717,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21519,11 +21725,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/48x48/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/48x48/Makefile.in 2009-09-29 21:41:01.268361718 +0200
-+++ gnome-panel-2.28.0/icons/48x48/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/48x48/Makefile.in
++++ b/icons/48x48/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21532,7 +21736,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21540,11 +21744,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/Makefile.in 2009-09-29 21:41:01.204366649 +0200
-+++ gnome-panel-2.28.0/icons/Makefile.in 2009-09-29 21:59:14.879863383 +0200
-@@ -218,6 +218,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/Makefile.in
++++ b/icons/Makefile.in
+@@ -218,6 +218,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21553,7 +21755,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -243,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -243,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21561,11 +21763,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/icons/scalable/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/icons/scalable/Makefile.in 2009-09-29 21:41:01.176363581 +0200
-+++ gnome-panel-2.28.0/icons/scalable/Makefile.in 2009-09-29 21:59:14.883863472 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/icons/scalable/Makefile.in
++++ b/icons/scalable/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21574,7 +21774,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21582,11 +21782,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/idl/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/idl/Makefile.in 2009-09-29 21:41:01.144368246 +0200
-+++ gnome-panel-2.28.0/idl/Makefile.in 2009-09-29 21:59:14.883863472 +0200
-@@ -178,6 +178,8 @@ LIBTOOL = @LIBTOOL@
+--- a/idl/Makefile.in
++++ b/idl/Makefile.in
+@@ -178,6 +178,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21595,7 +21793,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -203,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,6 +205,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21603,11 +21801,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/libpanel-applet/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/libpanel-applet/Makefile.in 2009-09-29 21:41:01.112366066 +0200
-+++ gnome-panel-2.28.0/libpanel-applet/Makefile.in 2009-09-29 21:59:14.883863472 +0200
-@@ -244,6 +244,8 @@ LIBTOOL = @LIBTOOL@
+--- a/libpanel-applet/Makefile.in
++++ b/libpanel-applet/Makefile.in
+@@ -244,6 +244,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21616,7 +21812,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -269,6 +271,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -269,6 +271,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21624,10 +21820,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/ltmain.sh
-===================================================================
---- gnome-panel-2.28.0.orig/ltmain.sh 2009-09-29 21:41:01.052364237 +0200
-+++ gnome-panel-2.28.0/ltmain.sh 2009-09-29 21:59:14.887864051 +0200
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -21646,7 +21840,7 @@
TIMESTAMP=""
package_revision=1.3012
-@@ -116,15 +116,15 @@ $lt_unset CDPATH
+@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
@@ -21666,7 +21860,7 @@
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
-@@ -5033,7 +5033,10 @@ func_mode_link ()
+@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -21678,7 +21872,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
+@@ -5344,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -21708,7 +21902,7 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@ func_mode_link ()
+@@ -5893,6 +5896,7 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
@@ -21716,7 +21910,7 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
+@@ -6206,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -21726,11 +21920,9 @@
esac
;;
no)
-Index: gnome-panel-2.28.0/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/Makefile.in 2009-09-29 21:41:01.024364099 +0200
-+++ gnome-panel-2.28.0/Makefile.in 2009-09-29 21:59:14.891866585 +0200
-@@ -210,6 +210,8 @@ LIBTOOL = @LIBTOOL@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -210,6 +210,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21739,7 +21931,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -235,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -235,6 +237,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21747,11 +21939,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/man/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/man/Makefile.in 2009-09-29 21:41:00.996364449 +0200
-+++ gnome-panel-2.28.0/man/Makefile.in 2009-09-29 21:59:14.891866585 +0200
-@@ -179,6 +179,8 @@ LIBTOOL = @LIBTOOL@
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -179,6 +179,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21760,7 +21950,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -204,6 +206,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -204,6 +206,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21768,11 +21958,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-Index: gnome-panel-2.28.0/gnome-panel/libpanel-util/Makefile.in
-===================================================================
---- gnome-panel-2.28.0.orig/gnome-panel/libpanel-util/Makefile.in 2009-09-29 21:41:01.551864522 +0200
-+++ gnome-panel-2.28.0/gnome-panel/libpanel-util/Makefile.in 2009-09-29 21:59:36.571858335 +0200
-@@ -54,8 +54,8 @@ libpanel_util_la_LIBADD =
+--- a/gnome-panel/libpanel-util/Makefile.in
++++ b/gnome-panel/libpanel-util/Makefile.in
+@@ -54,8 +54,8 @@
am__objects_1 =
am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
panel-error.lo panel-glib.lo panel-keyfile.lo panel-launch.lo \
@@ -21783,7 +21971,7 @@
libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -188,6 +188,8 @@ LIBTOOL = @LIBTOOL@
+@@ -188,6 +188,8 @@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
@@ -21792,7 +21980,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -213,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -213,6 +215,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21800,7 +21988,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_CFLAGS = @PANEL_CFLAGS@
PANEL_LIBS = @PANEL_LIBS@
-@@ -338,6 +341,8 @@ libpanel_util_la_SOURCES = \
+@@ -338,6 +341,8 @@
panel-launch.h \
panel-list.c \
panel-list.h \
@@ -21809,7 +21997,7 @@
panel-session-manager.c \
panel-session-manager.h \
panel-show.c \
-@@ -403,6 +408,7 @@ distclean-compile:
+@@ -403,6 +408,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-launch.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-list.Plo at am__quote@
@@ -21817,11 +22005,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-session-manager.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-show.Plo at am__quote@
-Index: gnome-panel-2.28.0/m4/libtool.m4
-===================================================================
---- gnome-panel-2.28.0.orig/m4/libtool.m4 2009-09-29 21:41:00.960371463 +0200
-+++ gnome-panel-2.28.0/m4/libtool.m4 2009-09-29 21:59:14.895860319 +0200
-@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2485,6 +2485,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21840,7 +22026,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3076,7 +3088,7 @@ linux* | k*bsd*-gnu)
+@@ -3076,7 +3088,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -21849,7 +22035,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
-@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [
+@@ -3757,7 +3769,7 @@
;;
esac
;;
@@ -21858,7 +22044,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [
+@@ -4182,6 +4194,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -21868,7 +22054,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4246,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -4246,6 +4261,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -21878,7 +22064,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4428,7 +4446,7 @@ _LT_EOF
+@@ -4428,7 +4446,7 @@
fi
;;
@@ -21887,7 +22073,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4603,6 +4621,7 @@ _LT_EOF
+@@ -4603,6 +4621,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -21895,7 +22081,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4841,7 +4860,7 @@ _LT_EOF
+@@ -4841,7 +4860,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -21904,11 +22090,9 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-Index: gnome-panel-2.28.0/INSTALL
-===================================================================
---- gnome-panel-2.28.0.orig/INSTALL 2009-09-29 21:41:00.868367937 +0200
-+++ gnome-panel-2.28.0/INSTALL 2009-09-29 21:59:14.899860408 +0200
-@@ -2,15 +2,15 @@ Installation Instructions
+--- a/INSTALL
++++ b/INSTALL
+@@ -2,15 +2,15 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -21927,7 +22111,7 @@
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
+@@ -73,9 +73,9 @@
Compilers and Options
=====================
@@ -21940,7 +22124,7 @@
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@ is an example:
+@@ -88,7 +88,7 @@
Compiling For Multiple Architectures
====================================
@@ -21949,7 +22133,7 @@
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
+@@ -100,10 +100,24 @@
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
@@ -21975,7 +22159,7 @@
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
+@@ -126,7 +140,7 @@
Optional Features
=================
@@ -21984,7 +22168,7 @@
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +152,46 @@ find the X include and library files aut
+@@ -138,14 +152,46 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
@@ -22036,7 +22220,7 @@
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
-@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
+@@ -153,7 +199,8 @@
where SYSTEM can have one of these forms:
@@ -22046,7 +22230,7 @@
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
+@@ -171,9 +218,9 @@
Sharing Defaults
================
@@ -22059,7 +22243,7 @@
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
+@@ -182,7 +229,7 @@
Defining Variables
==================
@@ -22068,7 +22252,7 @@
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed
+@@ -201,11 +248,19 @@
`configure' Invocation
======================
@@ -22090,7 +22274,7 @@
`--version'
`-V'
-@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed
+@@ -232,6 +287,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
@@ -22107,10 +22291,8 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-Index: gnome-panel-2.28.0/config.guess
-===================================================================
---- gnome-panel-2.28.0.orig/config.guess 2009-09-29 21:41:00.812360327 +0200
-+++ gnome-panel-2.28.0/config.guess 2009-09-29 21:59:14.899860408 +0200
+--- a/config.guess
++++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -22124,7 +22306,7 @@
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -170,7 +170,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -22133,7 +22315,7 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@ EOF
+@@ -656,7 +656,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -22142,7 +22324,7 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@ EOF
+@@ -822,6 +822,9 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -22152,7 +22334,7 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@ EOF
+@@ -882,40 +885,17 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -22198,7 +22380,7 @@
#else
CPU=
#endif
-@@ -947,7 +927,7 @@ EOF
+@@ -947,7 +927,7 @@
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
@@ -22207,7 +22389,7 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
-@@ -1001,14 +981,6 @@ EOF
+@@ -1001,14 +981,6 @@
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
@@ -22222,7 +22404,7 @@
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
+@@ -1074,7 +1046,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -22231,7 +22413,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
+@@ -1182,7 +1154,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -22240,10 +22422,8 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-Index: gnome-panel-2.28.0/config.h.in
-===================================================================
---- gnome-panel-2.28.0.orig/config.h.in 2009-09-29 21:41:00.928365368 +0200
-+++ gnome-panel-2.28.0/config.h.in 2009-09-29 21:59:14.899860408 +0200
+--- a/config.h.in
++++ b/config.h.in
@@ -135,6 +135,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -22254,10 +22434,8 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: gnome-panel-2.28.0/config.sub
-===================================================================
---- gnome-panel-2.28.0.orig/config.sub 2009-09-29 21:41:00.844366422 +0200
-+++ gnome-panel-2.28.0/config.sub 2009-09-29 21:59:14.899860408 +0200
+--- a/config.sub
++++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -22271,7 +22449,7 @@
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
+@@ -153,6 +153,9 @@
os=
basic_machine=$1
;;
@@ -22281,7 +22459,7 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
+@@ -467,6 +470,10 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -22292,7 +22470,7 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
+@@ -1260,7 +1267,7 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -22301,7 +22479,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
+@@ -1613,7 +1620,7 @@
-sunos*)
vendor=sun
;;
Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=22459&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Fri Nov 27 12:42:44 2009
@@ -5,6 +5,7 @@
06_clock_permissions.patch
08_clock_applet_event.patch
09_default_icons.patch
+10_clock_applet_link_gnome_desktop.patch
30_xrandr_crashes.patch
70_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list