diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-01-12 01:51:34 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-01-12 01:51:34 +0800 |
| commit | 2f836c64a2940e1460834c4085ba6d418001bf17 (patch) | |
| tree | 81909a3bce2caf57600151b32c8dcb1e7735c28c /devel | |
| parent | 262752d178a4a70c9cd941f23ee5052d0e8968d9 (diff) | |
| download | marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.gz marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.bz2 marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.lz marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.xz marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.zst marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.zip | |
Remove these ports now that they have been merged into the FreeBSD ports
tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11869 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
200 files changed, 0 insertions, 27680 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile deleted file mode 100644 index 30de6b9ce..000000000 --- a/devel/ORBit2/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# New ports collection makefile for: orbit2 -# Date Created: 16 Aug 1998 -# Whom: Chia-liang Kao <clkao@CirX.ORG> -# -# $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.52 2008/09/18 15:44:09 mezz Exp $ -# - -PORTNAME= ORBit2 -PORTVERSION= 2.14.16 -PORTREVISION?= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= High-performance CORBA ORB with support for the C language - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -USE_GMAKE= yes -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomehack libidl ltverhack referencehack -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/src/orb/orb-core/orbit-typelib.c - -post-install: - @${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbit2rc.default - @${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbit2rc.default - @if [ ! -f ${PREFIX}/etc/orbit2rc ]; then \ - ${CP} -p ${PREFIX}/etc/orbit2rc.default ${PREFIX}/etc/orbit2rc ; \ - fi - @${MKDIR} ${PREFIX}/lib/orbit-2.0/idl-backends - -.include <bsd.port.mk> - -.endif diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo deleted file mode 100644 index 6785eb325..000000000 --- a/devel/ORBit2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/ORBit2-2.14.16.tar.bz2) = f4898b999f39c79d55c13c0e0f597c71 -SHA256 (gnome2/ORBit2-2.14.16.tar.bz2) = e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1 -SIZE (gnome2/ORBit2-2.14.16.tar.bz2) = 739458 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab deleted file mode 100644 index 70131ebc1..000000000 --- a/devel/ORBit2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Dec 18 07:20:12 2006 -+++ Makefile.in Mon Dec 18 07:20:47 2006 -@@ -239,7 +239,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --SUBDIRS = linc2 src include test docs -+SUBDIRS = linc2 src include docs - bin_SCRIPTS = orbit2-config - EXTRA_DIST = \ - ORBit2.m4 \ diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in deleted file mode 100644 index e048ca634..000000000 --- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/orb/util/Makefile.in.orig Fri Mar 5 23:39:16 2004 -+++ src/orb/util/Makefile.in Fri Mar 5 23:39:43 2004 -@@ -126,7 +126,7 @@ - INCLUDES = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -- -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \ -+ -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\" \ - -DORBIT2_INTERNAL_API \ - $(WARN_CFLAGS) \ - $(ORBIT_DEBUG_CFLAGS) \ diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c deleted file mode 100644 index 6af92e3af..000000000 --- a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/orb/orb-core/orbit-typelib.c.orig 2007-07-27 10:58:37.000000000 -0500 -+++ src/orb/orb-core/orbit-typelib.c 2007-07-27 10:58:41.000000000 -0500 -@@ -218,6 +218,7 @@ - paths = g_ptr_array_sized_new (8); - - g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR)); -+ add_if_unique(paths, "%%LOCALBASE%%", TRUE); - - if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) { - char **strv; diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr deleted file mode 100644 index 711157675..000000000 --- a/devel/ORBit2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -ORBit is a high-performance CORBA ORB with support for the C language. -It allows programs to communicate with each other, regardless of their -physical and logical locations. diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist deleted file mode 100644 index 7730e1f92..000000000 --- a/devel/ORBit2/pkg-plist +++ /dev/null @@ -1,83 +0,0 @@ -bin/linc-cleanup-sockets -bin/orbit-idl-2 -bin/orbit2-config -@unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi -etc/orbit2rc.default -@exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi -include/orbit-2.0/ORBitservices/CosNaming.h -include/orbit-2.0/ORBitservices/CosNaming_impl.h -include/orbit-2.0/ORBitservices/orbit-imodule.h -include/orbit-2.0/orbit-idl/orbit-idl-backend.h -include/orbit-2.0/orbit/dynamic/dynamic-defs.h -include/orbit-2.0/orbit/dynamic/dynamic.h -include/orbit-2.0/orbit/orb-core/allocators.h -include/orbit-2.0/orbit/orb-core/corba-any-type.h -include/orbit-2.0/orbit/orb-core/corba-any.h -include/orbit-2.0/orbit/orb-core/corba-context-type.h -include/orbit-2.0/orbit/orb-core/corba-context.h -include/orbit-2.0/orbit/orb-core/corba-defs.h -include/orbit-2.0/orbit/orb-core/corba-environment-type.h -include/orbit-2.0/orbit/orb-core/corba-environment.h -include/orbit-2.0/orbit/orb-core/corba-nvlist.h -include/orbit-2.0/orbit/orb-core/corba-object-type.h -include/orbit-2.0/orbit/orb-core/corba-object.h -include/orbit-2.0/orbit/orb-core/corba-orb-type.h -include/orbit-2.0/orbit/orb-core/corba-orb.h -include/orbit-2.0/orbit/orb-core/corba-pobj.h -include/orbit-2.0/orbit/orb-core/corba-policy-type.h -include/orbit-2.0/orbit/orb-core/corba-string.h -include/orbit-2.0/orbit/orb-core/corba-typecode-type.h -include/orbit-2.0/orbit/orb-core/corba-typecode.h -include/orbit-2.0/orbit/orb-core/iop-defs.h -include/orbit-2.0/orbit/orb-core/orb-core-types.h -include/orbit-2.0/orbit/orb-core/orb-core.h -include/orbit-2.0/orbit/orb-core/orb-types.h -include/orbit-2.0/orbit/orb-core/orbit-interface.h -include/orbit-2.0/orbit/orb-core/orbit-object.h -include/orbit-2.0/orbit/orb-core/orbit-small.h -include/orbit-2.0/orbit/orbit-config.h -include/orbit-2.0/orbit/orbit-types.h -include/orbit-2.0/orbit/orbit.h -include/orbit-2.0/orbit/poa/orbit-adaptor.h -include/orbit-2.0/orbit/poa/poa-basics.h -include/orbit-2.0/orbit/poa/poa-defs.h -include/orbit-2.0/orbit/poa/poa-policy.h -include/orbit-2.0/orbit/poa/poa-types.h -include/orbit-2.0/orbit/poa/poa.h -include/orbit-2.0/orbit/poa/portableserver-current-type.h -include/orbit-2.0/orbit/poa/portableserver-poa-type.h -include/orbit-2.0/orbit/util/basic_types.h -include/orbit-2.0/orbit/util/orbit-genrand.h -include/orbit-2.0/orbit/util/orbit-util.h -lib/libORBit-2.a -lib/libORBit-2.la -lib/libORBit-2.so -lib/libORBit-2.so.0 -lib/libORBit-imodule-2.a -lib/libORBit-imodule-2.la -lib/libORBit-imodule-2.so -lib/libORBit-imodule-2.so.0 -lib/libORBitCosNaming-2.a -lib/libORBitCosNaming-2.la -lib/libORBitCosNaming-2.so -lib/libORBitCosNaming-2.so.0 -lib/libname-server-2.a -libdata/pkgconfig/ORBit-2.0.pc -libdata/pkgconfig/ORBit-CosNaming-2.0.pc -libdata/pkgconfig/ORBit-idl-2.0.pc -libdata/pkgconfig/ORBit-imodule-2.0.pc -share/aclocal/ORBit2.m4 -share/idl/orbit-2.0/CosNaming.idl -@dirrm share/idl/orbit-2.0 -@exec /bin/mkdir -p %D/lib/orbit-2.0/idl-backends -@dirrmtry share/idl -@dirrmtry lib/orbit-2.0/idl-backends -@dirrmtry lib/orbit-2.0 -@dirrm include/orbit-2.0/orbit/util -@dirrm include/orbit-2.0/orbit/poa -@dirrm include/orbit-2.0/orbit/orb-core -@dirrm include/orbit-2.0/orbit/dynamic -@dirrm include/orbit-2.0/orbit-idl -@dirrm include/orbit-2.0/orbit -@dirrm include/orbit-2.0/ORBitservices -@dirrm include/orbit-2.0 diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile deleted file mode 100644 index a63dfbfa7..000000000 --- a/devel/anjuta/Makefile +++ /dev/null @@ -1,115 +0,0 @@ -# New ports collection makefile for: anjuta -# Date created: 31 March 2001 -# Whom: Dmitry Sivachenko <demon@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.31 2008/10/20 22:01:50 kwm Exp $ -# - -PORTNAME= anjuta -PORTVERSION= 2.24.2 -PORTREVISION= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Integrated Development Environment for C and C++ - -BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ - bash:${PORTSDIR}/shells/bash \ - neato:${PORTSDIR}/graphics/graphviz -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - gbf-1.2:${PORTSDIR}/devel/gnome-build \ - gladeui-1.7:${PORTSDIR}/devel/glade3 \ - neon.28:${PORTSDIR}/www/neon28 \ - devhelp-1.0:${PORTSDIR}/devel/devhelp -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ - autogen:${PORTSDIR}/devel/autogen \ - neato:${PORTSDIR}/graphics/graphviz \ - libtool:${PORTSDIR}/devel/libtool15 \ - ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme - -USE_BZIP2= yes -USE_AUTOTOOLS= autotools:run -USE_GMAKE= yes -USE_GETTEXT= yes -INSTALLS_OMF= yes -INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2 -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -USE_LDCONFIG= yes -GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ - anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \ - anjuta-language-cpp-java.schemas \ - anjuta-message-manager-plugin.schemas \ - anjuta-editor-sourceview.schemas \ - anjuta-symbol-browser-plugin.schemas \ - anjuta-terminal-plugin.schemas anjuta.schemas - -MAN1= anjuta.1 anjuta_launcher.1 - -OPTIONS= SVN "Build subversion plugin" off \ - SYMBOL "Build experimental symbol-db plugin" off \ - SCINTILLA "Build scintilla plugin" off - -.include <bsd.port.pre.mk> - -.if defined(WITH_SVN) -BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion -RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion -USE_APACHE= 2.0+ - -CONFIGURE_ARGS+=--with-subversion-dir=${LOCALBASE}/bin \ - --with-svn-include=${LOCALBASE}/include \ - --with-svn-lib=${LOCALBASE}/lib \ - --with-apr-config=${LOCALBASE}/bin/apr-1-config \ - --with-apu-config=${LOCALBASE}/bin/apu-1-config -PLIST_SUB+= SVN="" -.else -CONFIGURE_ARGS+=--disable-plugin-subversion -PLIST_SUB+= SVN="@comment " -.endif - -.if defined(WITH_SCINTILLA) -USE_GNOME+= libgnomeprintui -CONFIGURE_ARGS+=--enable-plugin-scintilla -GCONF_SCHEMAS+= anjuta-editor-scintilla.schemas -PLIST_SUB+= SCINTILLA="" -.else -#CONFIGURE_ARGS+=--disable-plugin-scintilla -PLIST_SUB+= SCINTILLA="@comment " -.endif - -.if defined(WITH_SYMBOL) -USE_GNOME+= libgda4 -CONFIGURE_ARGS+=--enable-plugin-symbol-db -GCONF_SCHEMAS+= anjuta-symbol-db.schemas -PLIST_SUB+= SYMBOL="" -.else -CONFIGURE_ARGS+=--disable-plugin-symbol-db -PLIST_SUB+= SYMBOL="@comment " -.endif - -post-configure: - @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \ - s|/usr/local|${PREFIX}|' \ - ${WRKSRC}/global-tags/create_global_tags.sh.in - @${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ - ${WRKSRC}/plugins/build-basic-autotools/plugin.c - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \ - doc/ScintillaDoc.html TODO - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif - @-update-mime-database ${PREFIX}/share/mime - -.include <bsd.port.post.mk> diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo deleted file mode 100644 index aa83de891..000000000 --- a/devel/anjuta/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/anjuta-2.24.2.tar.bz2) = d1db75bc1c8d4ab4c9d180767e24e39a -SHA256 (gnome2/anjuta-2.24.2.tar.bz2) = 7b60753b98a12c5ae85b7fee126d280385ac67dd94a855ab50c17de862df6c68 -SIZE (gnome2/anjuta-2.24.2.tar.bz2) = 6713913 diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in deleted file mode 100644 index 132cd2755..000000000 --- a/devel/anjuta/files/patch-Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.in.orig 2008-09-22 14:17:35.000000000 -0400 -+++ Makefile.in 2008-09-22 14:20:32.000000000 -0400 -@@ -505,14 +505,14 @@ uninstall-anjuta_dataDATA: - rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \ - done - install-anjutadocDATA: $(anjutadoc_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" -- @list='$(anjutadoc_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \ -- $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ -- done -+# @$(NORMAL_INSTALL) -+# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" -+# @list='$(anjutadoc_DATA)'; for p in $$list; do \ -+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# f=$(am__strip_dir) \ -+# echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \ -+# $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ -+# done - - uninstall-anjutadocDATA: - @$(NORMAL_UNINSTALL) diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in deleted file mode 100644 index a567fda33..000000000 --- a/devel/anjuta/files/patch-doc::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig 2008-08-06 17:40:26.000000000 +0200 -+++ doc/Makefile.in 2008-08-06 17:41:04.000000000 +0200 -@@ -540,7 +540,7 @@ - - info-am: - --install-data-am: install-anjuta_docDATA install-man -+install-data-am: install-man - - install-dvi: install-dvi-am - diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh deleted file mode 100644 index f542c83ea..000000000 --- a/devel/anjuta/files/patch-global-tags_create_global_tags.sh +++ /dev/null @@ -1,23 +0,0 @@ ---- global-tags/create_global_tags.sh.in.orig Sun Jul 8 03:39:26 2007 -+++ global-tags/create_global_tags.sh.in Sun Jul 8 03:41:12 2007 -@@ -68,9 +68,9 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C - ## the packages, which we don't like. We only want cflags relevent - ## to the packages alone. - ## -- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/` -+ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/libdata\/pkgconfig'/` - PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH" -- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib64\/pkgconfig'/` -+ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/` - PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH" - - PKG_CONFIG_PATH_PROPER=`echo $PKG_CONFIG_PATH | sed -e 's/\:/ /g'` -@@ -88,7 +88,7 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C - for pkg_path in $PKG_CONFIG_PATH_PROPER; do - for pkg_file in `find "$pkg_path" -name '*.pc' 2>/dev/null`; do - # echo "Scanning package: $pkg_file" -- PKG_CFLAGS=`grep -e '^\(\w\+=\|\s*Cflags:\)' "$pkg_file"|sed -e 's/Cflags:\s*"\?\(.*\)"\?\s*/echo "\1"/' -e 's/^\(\w\+\)=\("\([^"]*\)"\|\(.*\)\)/\1="\3\4"/'|sh` -+ PKG_CFLAGS=`grep -E -e '^([a-zA-Z0-9_]+=|[[:space:]]*Cflags:)' "$pkg_file"|sed -E -e 's/Cflags:[[:space:]]*"?(.*)"?[[:space:]]*/echo "\1"/' -e 's/^([a-zA-Z0-9_]+)=("([^"]*)"|(.*))/\1="\3\4"/'|sh` - # echo $PKG_CFLAGS - package=`basename "$pkg_file" '.pc'` - # if [ ! -e $BASEDIR/tags/$package.anjutatags.gz ] ; then diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c deleted file mode 100644 index 0235ff1e8..000000000 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ /dev/null @@ -1,71 +0,0 @@ ---- libanjuta/anjuta-launcher.c.orig 2008-05-29 22:37:02.000000000 +0200 -+++ libanjuta/anjuta-launcher.c 2008-06-05 16:12:17.000000000 +0200 -@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel - GError *err = NULL; - do - { -- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); -+ GIOStatus status; -+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0) /* There is output */ - { - gchar *utf8_chars = NULL; -@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel - anjuta_launcher_synchronize (launcher); - ret = FALSE; - } -+ else if (status == G_IO_STATUS_EOF) -+ { -+ launcher->priv->stdout_is_done = TRUE; -+ anjuta_launcher_synchronize (launcher); -+ ret = FALSE; -+ } -+ - /* Read next chars if buffer was too small - * (the maximum length of one character is 6 bytes) */ - } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel * - GError *err = NULL; - do - { -- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); -+ GIOStatus status; -+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0) /* There is stderr output */ - { - gchar *utf8_chars; -@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel * - anjuta_launcher_synchronize (launcher); - ret = FALSE; - } -+ else if (status == G_IO_STATUS_EOF) -+ { -+ launcher->priv->stderr_is_done = TRUE; -+ anjuta_launcher_synchronize (launcher); -+ ret = FALSE; -+ } -+ - /* Read next chars if buffer was too small - * (the maximum length of one character is 6 bytes) */ - } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch - GError *err = NULL; - do - { -- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); -+ GIOStatus status; -+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0) /* There is stderr output */ - { - gchar *utf8_chars; -@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch - { - ret = FALSE; - } -+ else if (status == G_IO_STATUS_EOF) -+ { -+ ret = FALSE; -+ } - /* Read next chars if buffer was too small - * (the maximum length of one character is 6 bytes) */ - } while (!err && (n > FILE_BUFFER_SIZE - 7)); diff --git a/devel/anjuta/pkg-descr b/devel/anjuta/pkg-descr deleted file mode 100644 index eff552164..000000000 --- a/devel/anjuta/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Anjuta is a very versatile Integrated development environment for -C and C++. Written in GTK/GNOME and written for GTK+/GNOME, -it features many advanced programming tools and utilities. It is -basically a GUI interface for the bunch of command line programming -utilities and tools available for FreeBSD, which are usually run in console -and are very user unfriendly. - -WWW: http://anjuta.org/ diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist deleted file mode 100644 index 7aef13fec..000000000 --- a/devel/anjuta/pkg-plist +++ /dev/null @@ -1,1088 +0,0 @@ -bin/anjuta -bin/anjuta_import.sh -bin/anjuta_launcher -include/libanjuta-1.0/libanjuta/anjuta-async-command.h -include/libanjuta-1.0/libanjuta/anjuta-command.h -include/libanjuta-1.0/libanjuta/anjuta-convert.h -include/libanjuta-1.0/libanjuta/anjuta-debug.h -include/libanjuta-1.0/libanjuta/anjuta-encodings.h -include/libanjuta-1.0/libanjuta/anjuta-enum-types.h -include/libanjuta-1.0/libanjuta/anjuta-error.h -include/libanjuta-1.0/libanjuta/anjuta-launcher.h -include/libanjuta-1.0/libanjuta/anjuta-marshal.h -include/libanjuta-1.0/libanjuta/anjuta-message-area.h -include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h -include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h -include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h -include/libanjuta-1.0/libanjuta/anjuta-plugin.h -include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h -include/libanjuta-1.0/libanjuta/anjuta-preferences.h -include/libanjuta-1.0/libanjuta/anjuta-profile-manager.h -include/libanjuta-1.0/libanjuta/anjuta-profile.h -include/libanjuta-1.0/libanjuta/anjuta-save-prompt.h -include/libanjuta-1.0/libanjuta/anjuta-serializer.h -include/libanjuta-1.0/libanjuta/anjuta-session.h -include/libanjuta-1.0/libanjuta/anjuta-shell.h -include/libanjuta-1.0/libanjuta/anjuta-status.h -include/libanjuta-1.0/libanjuta/anjuta-sync-command.h -include/libanjuta-1.0/libanjuta/anjuta-ui.h -include/libanjuta-1.0/libanjuta/anjuta-utils.h -include/libanjuta-1.0/libanjuta/anjuta-vcs-status-tree-view.h -include/libanjuta-1.0/libanjuta/anjuta-version.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-builder.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-breakpoint.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-instruction.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-memory.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-register.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-variable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-assist.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell-style.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-comment.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-convert.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-factory.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-folds.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-goto.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-hover.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-environment.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-loader.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-savable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-help.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-factory.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-vcs.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-wizard.h -include/libanjuta-1.0/libanjuta/interfaces/libanjuta-iface-marshallers.h -include/libanjuta-1.0/libanjuta/interfaces/libanjuta-interfaces.h -include/libanjuta-1.0/libanjuta/interfaces/libanjuta.idl -include/libanjuta-1.0/libanjuta/libanjuta.h -include/libanjuta-1.0/libanjuta/resources.h -lib/anjuta/anjuta-build-basic-autotools.plugin -lib/anjuta/anjuta-class-gen.plugin -lib/anjuta/anjuta-class-inheritance.plugin -lib/anjuta/anjuta-cvs.plugin -lib/anjuta/anjuta-debug-manager.plugin -lib/anjuta/anjuta-devhelp.plugin -lib/anjuta/anjuta-document-manager.plugin -%%SCINTILLA%%lib/anjuta/anjuta-editor.plugin -lib/anjuta/anjuta-file-wizard.plugin -lib/anjuta/anjuta-gdb.plugin -lib/anjuta/anjuta-glade.plugin -lib/anjuta/anjuta-gtodo.plugin -lib/anjuta/anjuta-language-cpp-java.plugin -lib/anjuta/anjuta-loader.plugin -lib/anjuta/anjuta-macro.plugin -lib/anjuta/anjuta-message-manager.plugin -lib/anjuta/anjuta-patch.plugin -lib/anjuta/anjuta-project-import.plugin -lib/anjuta/anjuta-project-manager.plugin -lib/anjuta/anjuta-project-wizard.plugin -lib/anjuta/anjuta-run-program.plugin -lib/anjuta/anjuta-sample.plugin -lib/anjuta/anjuta-scratchbox.plugin -lib/anjuta/anjuta-search.plugin -%%SVN%%lib/anjuta/anjuta-subversion.plugin -lib/anjuta/anjuta-symbol-browser.plugin -lib/anjuta/anjuta-tags -lib/anjuta/anjuta-terminal.plugin -lib/anjuta/anjuta-tools.plugin -lib/anjuta/file-manager.plugin -lib/anjuta/git.plugin -lib/anjuta/language-manager.plugin -lib/anjuta/libanjuta-build-basic-autotools.la -lib/anjuta/libanjuta-build-basic-autotools.so -lib/anjuta/libanjuta-class-gen.la -lib/anjuta/libanjuta-class-gen.so -lib/anjuta/libanjuta-class-inheritance.la -lib/anjuta/libanjuta-class-inheritance.so -lib/anjuta/libanjuta-cvs-plugin.la -lib/anjuta/libanjuta-cvs-plugin.so -lib/anjuta/libanjuta-debug-manager.la -lib/anjuta/libanjuta-debug-manager.so -lib/anjuta/libanjuta-devhelp.la -lib/anjuta/libanjuta-devhelp.so -lib/anjuta/libanjuta-document-manager.la -lib/anjuta/libanjuta-document-manager.so -%%SCINTILLA%%lib/anjuta/libanjuta-editor.la -%%SCINTILLA%%lib/anjuta/libanjuta-editor.so -lib/anjuta/libanjuta-file-wizard.la -lib/anjuta/libanjuta-file-wizard.so -lib/anjuta/libanjuta-gdb.la -lib/anjuta/libanjuta-gdb.so -lib/anjuta/libanjuta-git.la -lib/anjuta/libanjuta-git.so -lib/anjuta/libanjuta-glade.la -lib/anjuta/libanjuta-glade.so -lib/anjuta/libanjuta-gtodo.la -lib/anjuta/libanjuta-gtodo.so -lib/anjuta/libanjuta-language-cpp-java.la -lib/anjuta/libanjuta-language-cpp-java.so -lib/anjuta/libanjuta-loader.la -lib/anjuta/libanjuta-loader.so -lib/anjuta/libanjuta-macro.la -lib/anjuta/libanjuta-macro.so -lib/anjuta/libanjuta-message-view.la -lib/anjuta/libanjuta-message-view.so -lib/anjuta/libanjuta-patch.la -lib/anjuta/libanjuta-patch.so -lib/anjuta/libanjuta-profiler.la -lib/anjuta/libanjuta-profiler.so -lib/anjuta/libanjuta-project-import.la -lib/anjuta/libanjuta-project-import.so -lib/anjuta/libanjuta-project-manager.la -lib/anjuta/libanjuta-project-manager.so -lib/anjuta/libanjuta-project-wizard.la -lib/anjuta/libanjuta-project-wizard.so -lib/anjuta/libanjuta-run-program.la -lib/anjuta/libanjuta-run-program.so -lib/anjuta/libanjuta-sample.la -lib/anjuta/libanjuta-sample.so -lib/anjuta/libanjuta-scratchbox.la -lib/anjuta/libanjuta-scratchbox.so -lib/anjuta/libanjuta-search.la -lib/anjuta/libanjuta-search.so -lib/anjuta/libanjuta-sourceview.la -lib/anjuta/libanjuta-sourceview.so -%%SVN%%lib/anjuta/libanjuta-subversion.la -%%SVN%%lib/anjuta/libanjuta-subversion.so -lib/anjuta/libanjuta-symbol-browser.la -lib/anjuta/libanjuta-symbol-browser.so -%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.la -%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.so -lib/anjuta/libanjuta-terminal.la -lib/anjuta/libanjuta-terminal.so -lib/anjuta/libanjuta-tools.la -lib/anjuta/libanjuta-tools.so -lib/anjuta/libfile-manager.la -lib/anjuta/libfile-manager.so -lib/anjuta/libfile-manager.so.0 -lib/anjuta/liblanguage-manager.la -lib/anjuta/liblanguage-manager.so -lib/anjuta/profiler.plugin -lib/anjuta/sourceview.plugin -%%SYMBOL%%lib/anjuta/symbol-db.plugin -lib/glade3/modules/libgladeanjuta.la -lib/glade3/modules/libgladeanjuta.so -lib/libanjuta-ctags.la -lib/libanjuta-ctags.so -lib/libanjuta-ctags.so.0 -lib/libanjuta.la -lib/libanjuta.so -lib/libanjuta.so.0 -libdata/pkgconfig/libanjuta-1.0.pc -share/anjuta/AUTHORS -share/anjuta/anjuta_project.template -share/anjuta/build/automake-c.filters -share/anjuta/class-templates/cc-header.tpl -share/anjuta/class-templates/cc-source.tpl -share/anjuta/class-templates/go-header.tpl -share/anjuta/class-templates/go-source.tpl -share/anjuta/gdb.init -share/anjuta/glade/anjuta-build-basic-autotools-plugin.glade -share/anjuta/glade/anjuta-class-gen-plugin.glade -share/anjuta/glade/anjuta-cvs-plugin.glade -share/anjuta/glade/anjuta-debug-manager.glade -share/anjuta/glade/anjuta-document-manager.glade -%%SCINTILLA%%share/anjuta/glade/anjuta-editor-scintilla.glade -share/anjuta/glade/anjuta-editor-sourceview.glade -share/anjuta/glade/anjuta-file-wizard.glade -share/anjuta/glade/anjuta-gdb.glade -share/anjuta/glade/anjuta-git.glade -share/anjuta/glade/anjuta-language-cpp-java.glade -share/anjuta/glade/anjuta-macro.glade -share/anjuta/glade/anjuta-message-manager-plugin.glade -share/anjuta/glade/anjuta-project-wizard.glade -share/anjuta/glade/anjuta-run-program.glade -share/anjuta/glade/anjuta-scratchbox.glade -share/anjuta/glade/anjuta-search.glade -%%SVN%%share/anjuta/glade/anjuta-subversion.glade -share/anjuta/glade/anjuta-symbol-browser-plugin.glade -%%SYMBOL%%share/anjuta/glade/anjuta-symbol-db.glade -share/anjuta/glade/anjuta-terminal-plugin.glade -share/anjuta/glade/anjuta-tools.glade -share/anjuta/glade/anjuta.glade -share/anjuta/glade/applogo.png -share/anjuta/glade/appwizard.png -share/anjuta/glade/file-manager.glade -share/anjuta/glade/patch-plugin.glade -share/anjuta/glade/profiler-call-graph.glade -share/anjuta/glade/profiler-flat-profile.glade -share/anjuta/glade/profiler-function-call-tree.glade -share/anjuta/glade/profiler.glade -share/anjuta/glade/start-with-import.png -share/anjuta/glade/start-with-open.png -share/anjuta/glade/start-with-wizard.png -share/anjuta/gtodo/gtodo.css -share/anjuta/gtodo/gtodo.xsl -share/anjuta/languages.xml -share/anjuta/layout.xml -share/anjuta/macros.xml -share/anjuta/profiles/default.profile -share/anjuta/project/anjuta-plugin-logo.png -share/anjuta/project/anjuta-plugin.wiz -share/anjuta/project/anjuta-plugin/configure.ac.tpl -share/anjuta/project/anjuta-plugin/po/POTFILES.in -share/anjuta/project/anjuta-plugin/src/Makefile.am.tpl -share/anjuta/project/anjuta-plugin/src/plugin.c -share/anjuta/project/anjuta-plugin/src/plugin.glade -share/anjuta/project/anjuta-plugin/src/plugin.h -share/anjuta/project/anjuta-plugin/src/plugin.plugin.in -share/anjuta/project/anjuta-plugin/src/plugin.ui -share/anjuta/project/anjuta-plugin-vala.wiz -share/anjuta/project/anjuta-plugin-vala/configure.ac.tpl -share/anjuta/project/anjuta-plugin-vala/po/POTFILES.in -share/anjuta/project/anjuta-plugin-vala/src/Makefile.am.tpl -share/anjuta/project/anjuta-plugin-vala/src/config.vapi -share/anjuta/project/anjuta-plugin-vala/src/plugin.vala -share/anjuta/project/appwiz_sdl.png -share/anjuta/project/cpp-logo.png -share/anjuta/project/cpp.wiz -share/anjuta/project/cpp/configure.ac.tpl -share/anjuta/project/cpp/po/POTFILES.in -share/anjuta/project/cpp/src/Makefile.am.tpl -share/anjuta/project/cpp/src/cvsignore -share/anjuta/project/cpp/src/main.cc -share/anjuta/project/django-logo.png -share/anjuta/project/django.wiz -share/anjuta/project/gcj-logo.png -share/anjuta/project/gcj.wiz -share/anjuta/project/gcj/configure.ac.tpl -share/anjuta/project/gcj/src/Makefile.am.tpl -share/anjuta/project/gnome-logo.png -share/anjuta/project/gnome.wiz -share/anjuta/project/gnome/po/POTFILES.in -share/anjuta/project/gnome/src/Makefile.am.tpl -share/anjuta/project/gnome/src/callbacks.c -share/anjuta/project/gnome/src/callbacks.h -share/anjuta/project/gnome/src/main.c -share/anjuta/project/gnome/src/project.glade -share/anjuta/project/gtk-logo.png -share/anjuta/project/gtk.wiz -share/anjuta/project/gtk/po/POTFILES.in -share/anjuta/project/gtk/src/Makefile.am.tpl -share/anjuta/project/gtk/src/callbacks.c -share/anjuta/project/gtk/src/callbacks.h -share/anjuta/project/gtk/src/main.c -share/anjuta/project/gtk/src/project.glade -share/anjuta/project/gtkmm-logo.png -share/anjuta/project/gtkmm.wiz -share/anjuta/project/gtkmm/po/POTFILES.in -share/anjuta/project/gtkmm/src/Makefile.am.tpl -share/anjuta/project/gtkmm/src/main.cc -share/anjuta/project/gtkmm/src/project.glade -share/anjuta/project/java-logo.png -share/anjuta/project/java.wiz -share/anjuta/project/java/configure.ac.tpl -share/anjuta/project/java/po/POTFILES.in -share/anjuta/project/java/project.anjuta -share/anjuta/project/java/src/Makefile.am.tpl -share/anjuta/project/java/src/main.java -share/anjuta/project/licenses/BSD -share/anjuta/project/licenses/GPL -share/anjuta/project/licenses/LGPL -share/anjuta/project/licenses/None -share/anjuta/project/minimal.wiz -share/anjuta/project/minimal/Makefile.am.tpl -share/anjuta/project/minimal/autogen.sh -share/anjuta/project/minimal/configure.ac.tpl -share/anjuta/project/minimal/project.anjuta -share/anjuta/project/mkfile-logo.png -share/anjuta/project/mkfile.wiz -share/anjuta/project/mkfile/po/ChangeLog -share/anjuta/project/mkfile/po/POTFILES.in -share/anjuta/project/mkfile/project.anjuta -share/anjuta/project/mkfile/src/Makefile.tpl -share/anjuta/project/mkfile/src/main.c -share/anjuta/project/python-logo.png -share/anjuta/project/python.wiz -share/anjuta/project/python/configure.ac.tpl -share/anjuta/project/python/po/POTFILES.in -share/anjuta/project/python/project.anjuta -share/anjuta/project/python/src/Makefile.am.tpl -share/anjuta/project/python/src/main.py -share/anjuta/project/sdl.wiz -share/anjuta/project/sdl/acinclude.m4.tpl -share/anjuta/project/sdl/configure.ac.tpl -share/anjuta/project/sdl/po/POTFILES.in -share/anjuta/project/sdl/src/Makefile.am.tpl -share/anjuta/project/sdl/src/main.c -share/anjuta/project/terminal-logo.png -share/anjuta/project/terminal.wiz -share/anjuta/project/terminal/AUTHORS -share/anjuta/project/terminal/ChangeLog -share/anjuta/project/terminal/Makefile.am.tpl -share/anjuta/project/terminal/NEWS -share/anjuta/project/terminal/README -share/anjuta/project/terminal/autogen.sh -share/anjuta/project/terminal/configure.ac.tpl -share/anjuta/project/terminal/cvsignore -share/anjuta/project/terminal/po/ChangeLog -share/anjuta/project/terminal/po/LINGUAS -share/anjuta/project/terminal/po/POTFILES.in -share/anjuta/project/terminal/po/cvsignore -share/anjuta/project/terminal/project.anjuta -share/anjuta/project/terminal/src/Makefile.am.tpl -share/anjuta/project/terminal/src/cvsignore -share/anjuta/project/terminal/src/main.c -share/anjuta/project/wxwin-logo.png -share/anjuta/project/wxwin.wiz -share/anjuta/project/wxwin/configure.ac.tpl -share/anjuta/project/wxwin/po/POTFILES.in -share/anjuta/project/wxwin/src/Makefile.am.tpl -share/anjuta/project/wxwin/src/main.cc -share/anjuta/project/xlib-dock.wiz -share/anjuta/project/xlib-dock/po/POTFILES.in -share/anjuta/project/xlib-dock/src/Makefile.am.tpl -share/anjuta/project/xlib-dock/src/main.c -share/anjuta/project/xlib-dock/src/pixmaps.h -share/anjuta/project/xlib-dock/src/wmgeneral.c -share/anjuta/project/xlib-dock/src/wmgeneral.h -share/anjuta/project/xlib-logo.png -share/anjuta/project/xlib.wiz -share/anjuta/project/xlib/configure.ac.tpl -share/anjuta/project/xlib/po/POTFILES.in -share/anjuta/project/xlib/src/Makefile.am.tpl -share/anjuta/project/xlib/src/main.c -%%SCINTILLA%%share/anjuta/properties/Embedded.properties -%%SCINTILLA%%share/anjuta/properties/SciTEGlobal.properties -%%SCINTILLA%%share/anjuta/properties/ada.properties -%%SCINTILLA%%share/anjuta/properties/anjuta.properties -%%SCINTILLA%%share/anjuta/properties/asm.properties -%%SCINTILLA%%share/anjuta/properties/asn1.properties -%%SCINTILLA%%share/anjuta/properties/au3.properties -%%SCINTILLA%%share/anjuta/properties/ave.properties -%%SCINTILLA%%share/anjuta/properties/baan.properties -%%SCINTILLA%%share/anjuta/properties/bullant.properties -%%SCINTILLA%%share/anjuta/properties/conf.properties -%%SCINTILLA%%share/anjuta/properties/cpp.properties -%%SCINTILLA%%share/anjuta/properties/css.properties -%%SCINTILLA%%share/anjuta/properties/eiffel.properties -%%SCINTILLA%%share/anjuta/properties/erlang.properties -%%SCINTILLA%%share/anjuta/properties/escript.properties -%%SCINTILLA%%share/anjuta/properties/forth.properties -%%SCINTILLA%%share/anjuta/properties/fortran.properties -%%SCINTILLA%%share/anjuta/properties/html.properties -%%SCINTILLA%%share/anjuta/properties/kix.properties -%%SCINTILLA%%share/anjuta/properties/latex.properties -%%SCINTILLA%%share/anjuta/properties/lisp.properties -%%SCINTILLA%%share/anjuta/properties/lot.properties -%%SCINTILLA%%share/anjuta/properties/lout.properties -%%SCINTILLA%%share/anjuta/properties/lua.properties -%%SCINTILLA%%share/anjuta/properties/matlab.properties -%%SCINTILLA%%share/anjuta/properties/metapost.properties -%%SCINTILLA%%share/anjuta/properties/mmixal.properties -%%SCINTILLA%%share/anjuta/properties/nncrontab.properties -%%SCINTILLA%%share/anjuta/properties/nsis.properties -%%SCINTILLA%%share/anjuta/properties/others.properties -%%SCINTILLA%%share/anjuta/properties/pascal.properties -%%SCINTILLA%%share/anjuta/properties/perl.properties -%%SCINTILLA%%share/anjuta/properties/pov.properties -%%SCINTILLA%%share/anjuta/properties/ps.properties -%%SCINTILLA%%share/anjuta/properties/python.properties -%%SCINTILLA%%share/anjuta/properties/ruby.properties -%%SCINTILLA%%share/anjuta/properties/scriptol.properties -%%SCINTILLA%%share/anjuta/properties/specman.properties -%%SCINTILLA%%share/anjuta/properties/sql.properties -%%SCINTILLA%%share/anjuta/properties/styles.properties -%%SCINTILLA%%share/anjuta/properties/tcl.properties -%%SCINTILLA%%share/anjuta/properties/tex.properties -%%SCINTILLA%%share/anjuta/properties/user.properties -%%SCINTILLA%%share/anjuta/properties/vb.properties -%%SCINTILLA%%share/anjuta/properties/verilog.properties -%%SCINTILLA%%share/anjuta/properties/vhdl.properties -%%SCINTILLA%%share/anjuta/properties/yaml.properties -share/anjuta/scripts/create_global_tags.sh -%%SYMBOL%%share/anjuta/tables.sql -share/anjuta/tools/find-fixmes.pl -share/anjuta/tools/prepare-changelog.pl -share/anjuta/tools/tools-2.xml -share/anjuta/tools/translation-status.pl -share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui -share/anjuta/ui/anjuta-cvs.ui -share/anjuta/ui/anjuta-debug-manager.ui -share/anjuta/ui/anjuta-devhelp-simple.ui -share/anjuta/ui/anjuta-devhelp.ui -share/anjuta/ui/anjuta-document-manager.ui -share/anjuta/ui/anjuta-git.ui -share/anjuta/ui/anjuta-glade.ui -share/anjuta/ui/anjuta-gtodo.ui -share/anjuta/ui/anjuta-language-support-cpp-java.ui -share/anjuta/ui/anjuta-loader-plugin.ui -share/anjuta/ui/anjuta-macro.ui -share/anjuta/ui/anjuta-message-manager.ui -share/anjuta/ui/anjuta-patch.ui -share/anjuta/ui/anjuta-project-manager.ui -share/anjuta/ui/anjuta-run-program.ui -share/anjuta/ui/anjuta-sample.ui -share/anjuta/ui/anjuta-search.ui -%%SVN%%share/anjuta/ui/anjuta-subversion.ui -share/anjuta/ui/anjuta-symbol-browser-plugin.ui -share/anjuta/ui/anjuta-terminal-plugin.ui -share/anjuta/ui/anjuta-tools.ui -share/anjuta/ui/anjuta.ui -share/anjuta/ui/file-manager.ui -share/anjuta/ui/profiler.ui -share/anjuta/welcome.txt -share/applications/anjuta.desktop -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/FUTURE -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html -%%PORTDOCS%%%%DOCSDIR%%/TODO -share/doc/libanjuta/AnjutaAsyncCommand.html -share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html -share/doc/libanjuta/AnjutaCommand.html -share/doc/libanjuta/AnjutaLauncher.html -share/doc/libanjuta/AnjutaMessageArea.html -share/doc/libanjuta/AnjutaPlugin.html -share/doc/libanjuta/AnjutaPluginHandle.html -share/doc/libanjuta/AnjutaPluginManager.html -share/doc/libanjuta/AnjutaPreferences.html -share/doc/libanjuta/AnjutaPreferencesDialog.html -share/doc/libanjuta/AnjutaProfile.html -share/doc/libanjuta/AnjutaProfileManager.html -share/doc/libanjuta/AnjutaSavePrompt.html -share/doc/libanjuta/AnjutaSerializer.html -share/doc/libanjuta/AnjutaSession.html -share/doc/libanjuta/AnjutaStatus.html -share/doc/libanjuta/AnjutaSyncCommand.html -share/doc/libanjuta/AnjutaVcsStatusTreeView.html -share/doc/libanjuta/AnjutaUI.html -share/doc/libanjuta/action-block.html -share/doc/libanjuta/anjuta-architecture.html -share/doc/libanjuta/anjuta-architecture.png -share/doc/libanjuta/content-block.html -share/doc/libanjuta/header-block.html -share/doc/libanjuta/home.png -share/doc/libanjuta/index.html -share/doc/libanjuta/index.sgml -share/doc/libanjuta/left.png -share/doc/libanjuta/libanjuta-ESplash.html -share/doc/libanjuta/libanjuta-anjuta-c-module.html -share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html -share/doc/libanjuta/libanjuta-anjuta-convert.html -share/doc/libanjuta/libanjuta-anjuta-debug.html -share/doc/libanjuta/libanjuta-anjuta-encodings.html -share/doc/libanjuta/libanjuta-anjuta-enum-types.html -share/doc/libanjuta/libanjuta-anjuta-error.html -share/doc/libanjuta/libanjuta-anjuta-marshal.html -share/doc/libanjuta/libanjuta-anjuta-plugin-description.html -share/doc/libanjuta/libanjuta-anjuta-shell.html -share/doc/libanjuta/libanjuta-anjuta-utils-priv.html -share/doc/libanjuta/libanjuta-anjuta-utils.html -share/doc/libanjuta/libanjuta-anjuta-version.html -share/doc/libanjuta/libanjuta-api.html -share/doc/libanjuta/libanjuta-ianjuta-bookmark.html -share/doc/libanjuta/libanjuta-ianjuta-buildable.html -share/doc/libanjuta/libanjuta-ianjuta-builder.html -share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html -share/doc/libanjuta/libanjuta-ianjuta-environment.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html -share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html -share/doc/libanjuta/libanjuta-ianjuta-debugger.html -share/doc/libanjuta/libanjuta-ianjuta-document-manager.html -share/doc/libanjuta/libanjuta-ianjuta-document.html -share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html -share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html -share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html -share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html -share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html -share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html -share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html -share/doc/libanjuta/libanjuta-ianjuta-editor-language.html -share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html -share/doc/libanjuta/libanjuta-ianjuta-editor-search.html -share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html -share/doc/libanjuta/libanjuta-ianjuta-editor-view.html -share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html -share/doc/libanjuta/libanjuta-ianjuta-editor.html -share/doc/libanjuta/libanjuta-ianjuta-file-loader.html -share/doc/libanjuta/libanjuta-ianjuta-file-manager.html -share/doc/libanjuta/libanjuta-ianjuta-file-savable.html -share/doc/libanjuta/libanjuta-ianjuta-file.html -share/doc/libanjuta/libanjuta-ianjuta-help.html -share/doc/libanjuta/libanjuta-ianjuta-indicable.html -share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html -share/doc/libanjuta/libanjuta-ianjuta-iterable.html -share/doc/libanjuta/libanjuta-ianjuta-language-support.html -share/doc/libanjuta/libanjuta-ianjuta-language.html -share/doc/libanjuta/libanjuta-ianjuta-loader.html -share/doc/libanjuta/libanjuta-ianjuta-macro.html -share/doc/libanjuta/libanjuta-ianjuta-markable.html -share/doc/libanjuta/libanjuta-ianjuta-message-manager.html -share/doc/libanjuta/libanjuta-ianjuta-message-view.html -share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html -share/doc/libanjuta/libanjuta-ianjuta-preferences.html -share/doc/libanjuta/libanjuta-ianjuta-print.html -share/doc/libanjuta/libanjuta-ianjuta-project-manager.html -share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html -share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html -share/doc/libanjuta/libanjuta-ianjuta-stream.html -share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html -share/doc/libanjuta/libanjuta-ianjuta-symbol.html -share/doc/libanjuta/libanjuta-ianjuta-terminal.html -share/doc/libanjuta/libanjuta-ianjuta-todo.html -share/doc/libanjuta/libanjuta-ianjuta-vcs.html -share/doc/libanjuta/libanjuta-ianjuta-wizard.html -share/doc/libanjuta/libanjuta-internal-api.html -share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html -share/doc/libanjuta/libanjuta-resources.html -share/doc/libanjuta/libanjuta.devhelp -share/doc/libanjuta/libanjuta.devhelp2 -share/doc/libanjuta/object-hierarchy.html -share/doc/libanjuta/page-block.html -share/doc/libanjuta/plugin-description-file.html -share/doc/libanjuta/plugin-interfaces.html -share/doc/libanjuta/project-wizard-format.html -share/doc/libanjuta/right.png -share/doc/libanjuta/style.css -share/doc/libanjuta/up.png -share/doc/libanjuta/writing-plugins-build-setup.html -share/doc/libanjuta/writing-plugins-simple.html -share/doc/libanjuta/writing-plugins-sources.html -share/doc/libanjuta/writing-plugins.html -share/glade3/catalogs/anjuta-glade.xml -share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml -share/gnome/help/anjuta-faqs/C/legal.xml -share/gnome/help/anjuta-manual/C/anjuta-manual.xml -share/gnome/help/anjuta-manual/C/authors.xml -share/gnome/help/anjuta-manual/C/build.xml -share/gnome/help/anjuta-manual/C/debugger.xml -share/gnome/help/anjuta-manual/C/figures/add_edit_macro.png -share/gnome/help/anjuta-manual/C/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/C/figures/attach.png -share/gnome/help/anjuta-manual/C/figures/brk_add.png -share/gnome/help/anjuta-manual/C/figures/brk_dlg.png -share/gnome/help/anjuta-manual/C/figures/configure_dlg.png -share/gnome/help/anjuta-manual/C/figures/display_macro.png -share/gnome/help/anjuta-manual/C/figures/editor_guides.png -share/gnome/help/anjuta-manual/C/figures/editor_margins.png -share/gnome/help/anjuta-manual/C/figures/editor_markers.png -share/gnome/help/anjuta-manual/C/figures/file_menu.png -share/gnome/help/anjuta-manual/C/figures/insert_text.png -share/gnome/help/anjuta-manual/C/figures/keyword_macro.png -share/gnome/help/anjuta-manual/C/figures/local_variables.png -share/gnome/help/anjuta-manual/C/figures/menubar.png -share/gnome/help/anjuta-manual/C/figures/message_win.png -share/gnome/help/anjuta-manual/C/figures/new_file_wizard.png -share/gnome/help/anjuta-manual/C/figures/open_file.png -share/gnome/help/anjuta-manual/C/figures/open_file_multiple.png -share/gnome/help/anjuta-manual/C/figures/prefs_print.png -share/gnome/help/anjuta-manual/C/figures/print_dlg.png -share/gnome/help/anjuta-manual/C/figures/print_preview.png -share/gnome/help/anjuta-manual/C/figures/project-window.png -share/gnome/help/anjuta-manual/C/figures/project_info.png -share/gnome/help/anjuta-manual/C/figures/registers.png -share/gnome/help/anjuta-manual/C/figures/save_as_file.png -share/gnome/help/anjuta-manual/C/figures/search_expr.png -share/gnome/help/anjuta-manual/C/figures/search_expr_basic.png -share/gnome/help/anjuta-manual/C/figures/search_file_pattern.png -share/gnome/help/anjuta-manual/C/figures/search_replace.png -share/gnome/help/anjuta-manual/C/figures/search_setting.png -share/gnome/help/anjuta-manual/C/figures/search_target.png -share/gnome/help/anjuta-manual/C/figures/search_target_action.png -share/gnome/help/anjuta-manual/C/figures/search_target_in.png -share/gnome/help/anjuta-manual/C/figures/sharedlibs.png -share/gnome/help/anjuta-manual/C/figures/signals.png -share/gnome/help/anjuta-manual/C/figures/stack.png -share/gnome/help/anjuta-manual/C/figures/symbol_browser.png -share/gnome/help/anjuta-manual/C/figures/tool-editor.png -share/gnome/help/anjuta-manual/C/fileoperations.xml -share/gnome/help/anjuta-manual/C/interface.xml -share/gnome/help/anjuta-manual/C/introduction.xml -share/gnome/help/anjuta-manual/C/legal.xml -share/gnome/help/anjuta-manual/C/license.xml -share/gnome/help/anjuta-manual/C/preferences.xml -share/gnome/help/anjuta-manual/C/projects.xml -share/gnome/help/anjuta-manual/C/template.xml -share/gnome/help/anjuta-manual/C/tools.xml -share/gnome/help/anjuta-manual/es/anjuta-manual.xml -share/gnome/help/anjuta-manual/es/figures/add_edit_macro.png -share/gnome/help/anjuta-manual/es/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/es/figures/attach.png -share/gnome/help/anjuta-manual/es/figures/brk_add.png -share/gnome/help/anjuta-manual/es/figures/brk_dlg.png -share/gnome/help/anjuta-manual/es/figures/configure_dlg.png -share/gnome/help/anjuta-manual/es/figures/display_macro.png -share/gnome/help/anjuta-manual/es/figures/editor_guides.png -share/gnome/help/anjuta-manual/es/figures/editor_margins.png -share/gnome/help/anjuta-manual/es/figures/editor_markers.png -share/gnome/help/anjuta-manual/es/figures/file_menu.png -share/gnome/help/anjuta-manual/es/figures/insert_text.png -share/gnome/help/anjuta-manual/es/figures/keyword_macro.png -share/gnome/help/anjuta-manual/es/figures/local_variables.png -share/gnome/help/anjuta-manual/es/figures/menubar.png -share/gnome/help/anjuta-manual/es/figures/message_win.png -share/gnome/help/anjuta-manual/es/figures/new_file_wizard.png -share/gnome/help/anjuta-manual/es/figures/open_file.png -share/gnome/help/anjuta-manual/es/figures/open_file_multiple.png -share/gnome/help/anjuta-manual/es/figures/prefs_print.png -share/gnome/help/anjuta-manual/es/figures/print_dlg.png -share/gnome/help/anjuta-manual/es/figures/print_preview.png -share/gnome/help/anjuta-manual/es/figures/project-window.png -share/gnome/help/anjuta-manual/es/figures/project_info.png -share/gnome/help/anjuta-manual/es/figures/registers.png -share/gnome/help/anjuta-manual/es/figures/save_as_file.png -share/gnome/help/anjuta-manual/es/figures/search_expr.png -share/gnome/help/anjuta-manual/es/figures/search_expr_basic.png -share/gnome/help/anjuta-manual/es/figures/search_file_pattern.png -share/gnome/help/anjuta-manual/es/figures/search_replace.png -share/gnome/help/anjuta-manual/es/figures/search_setting.png -share/gnome/help/anjuta-manual/es/figures/search_target.png -share/gnome/help/anjuta-manual/es/figures/search_target_action.png -share/gnome/help/anjuta-manual/es/figures/search_target_in.png -share/gnome/help/anjuta-manual/es/figures/sharedlibs.png -share/gnome/help/anjuta-manual/es/figures/signals.png -share/gnome/help/anjuta-manual/es/figures/stack.png -share/gnome/help/anjuta-manual/es/figures/symbol_browser.png -share/gnome/help/anjuta-manual/es/figures/tool-editor.png -share/gnome/help/anjuta-manual/oc/anjuta-manual.xml -share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png -share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/oc/figures/attach.png -share/gnome/help/anjuta-manual/oc/figures/brk_add.png -share/gnome/help/anjuta-manual/oc/figures/brk_dlg.png -share/gnome/help/anjuta-manual/oc/figures/configure_dlg.png -share/gnome/help/anjuta-manual/oc/figures/display_macro.png -share/gnome/help/anjuta-manual/oc/figures/editor_guides.png -share/gnome/help/anjuta-manual/oc/figures/editor_margins.png -share/gnome/help/anjuta-manual/oc/figures/editor_markers.png -share/gnome/help/anjuta-manual/oc/figures/file_menu.png -share/gnome/help/anjuta-manual/oc/figures/insert_text.png -share/gnome/help/anjuta-manual/oc/figures/keyword_macro.png -share/gnome/help/anjuta-manual/oc/figures/local_variables.png -share/gnome/help/anjuta-manual/oc/figures/menubar.png -share/gnome/help/anjuta-manual/oc/figures/message_win.png -share/gnome/help/anjuta-manual/oc/figures/new_file_wizard.png -share/gnome/help/anjuta-manual/oc/figures/open_file.png -share/gnome/help/anjuta-manual/oc/figures/open_file_multiple.png -share/gnome/help/anjuta-manual/oc/figures/prefs_print.png -share/gnome/help/anjuta-manual/oc/figures/print_dlg.png -share/gnome/help/anjuta-manual/oc/figures/print_preview.png -share/gnome/help/anjuta-manual/oc/figures/project-window.png -share/gnome/help/anjuta-manual/oc/figures/project_info.png -share/gnome/help/anjuta-manual/oc/figures/registers.png -share/gnome/help/anjuta-manual/oc/figures/save_as_file.png -share/gnome/help/anjuta-manual/oc/figures/search_expr.png -share/gnome/help/anjuta-manual/oc/figures/search_expr_basic.png -share/gnome/help/anjuta-manual/oc/figures/search_file_pattern.png -share/gnome/help/anjuta-manual/oc/figures/search_replace.png -share/gnome/help/anjuta-manual/oc/figures/search_setting.png -share/gnome/help/anjuta-manual/oc/figures/search_target.png -share/gnome/help/anjuta-manual/oc/figures/search_target_action.png -share/gnome/help/anjuta-manual/oc/figures/search_target_in.png -share/gnome/help/anjuta-manual/oc/figures/sharedlibs.png -share/gnome/help/anjuta-manual/oc/figures/signals.png -share/gnome/help/anjuta-manual/oc/figures/stack.png -share/gnome/help/anjuta-manual/oc/figures/symbol_browser.png -share/gnome/help/anjuta-manual/oc/figures/tool-editor.png -share/gnome/help/anjuta-manual/sv/anjuta-manual.xml -share/gnome/help/anjuta-manual/sv/figures/add_edit_macro.png -share/gnome/help/anjuta-manual/sv/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/sv/figures/attach.png -share/gnome/help/anjuta-manual/sv/figures/brk_add.png -share/gnome/help/anjuta-manual/sv/figures/brk_dlg.png -share/gnome/help/anjuta-manual/sv/figures/configure_dlg.png -share/gnome/help/anjuta-manual/sv/figures/display_macro.png -share/gnome/help/anjuta-manual/sv/figures/editor_guides.png -share/gnome/help/anjuta-manual/sv/figures/editor_margins.png -share/gnome/help/anjuta-manual/sv/figures/editor_markers.png -share/gnome/help/anjuta-manual/sv/figures/file_menu.png -share/gnome/help/anjuta-manual/sv/figures/insert_text.png -share/gnome/help/anjuta-manual/sv/figures/keyword_macro.png -share/gnome/help/anjuta-manual/sv/figures/local_variables.png -share/gnome/help/anjuta-manual/sv/figures/menubar.png -share/gnome/help/anjuta-manual/sv/figures/message_win.png -share/gnome/help/anjuta-manual/sv/figures/new_file_wizard.png -share/gnome/help/anjuta-manual/sv/figures/open_file.png -share/gnome/help/anjuta-manual/sv/figures/open_file_multiple.png -share/gnome/help/anjuta-manual/sv/figures/prefs_print.png -share/gnome/help/anjuta-manual/sv/figures/print_dlg.png -share/gnome/help/anjuta-manual/sv/figures/print_preview.png -share/gnome/help/anjuta-manual/sv/figures/project-window.png -share/gnome/help/anjuta-manual/sv/figures/project_info.png -share/gnome/help/anjuta-manual/sv/figures/registers.png -share/gnome/help/anjuta-manual/sv/figures/save_as_file.png -share/gnome/help/anjuta-manual/sv/figures/search_expr.png -share/gnome/help/anjuta-manual/sv/figures/search_expr_basic.png -share/gnome/help/anjuta-manual/sv/figures/search_file_pattern.png -share/gnome/help/anjuta-manual/sv/figures/search_replace.png -share/gnome/help/anjuta-manual/sv/figures/search_setting.png -share/gnome/help/anjuta-manual/sv/figures/search_target.png -share/gnome/help/anjuta-manual/sv/figures/search_target_action.png -share/gnome/help/anjuta-manual/sv/figures/search_target_in.png -share/gnome/help/anjuta-manual/sv/figures/sharedlibs.png -share/gnome/help/anjuta-manual/sv/figures/signals.png -share/gnome/help/anjuta-manual/sv/figures/stack.png -share/gnome/help/anjuta-manual/sv/figures/symbol_browser.png -share/gnome/help/anjuta-manual/sv/figures/tool-editor.png -share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png -share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg -share/icons/hicolor/48x48/apps/anjuta.png -share/icons/hicolor/scalable/apps/anjuta.svg -share/locale/ar/LC_MESSAGES/anjuta.mo -share/locale/az/LC_MESSAGES/anjuta.mo -share/locale/be/LC_MESSAGES/anjuta.mo -share/locale/be@latin/LC_MESSAGES/anjuta.mo -share/locale/bg/LC_MESSAGES/anjuta.mo -share/locale/ca/LC_MESSAGES/anjuta.mo -share/locale/cs/LC_MESSAGES/anjuta.mo -share/locale/da/LC_MESSAGES/anjuta.mo -share/locale/de/LC_MESSAGES/anjuta.mo -share/locale/dz/LC_MESSAGES/anjuta.mo -share/locale/el/LC_MESSAGES/anjuta.mo -share/locale/en_CA/LC_MESSAGES/anjuta.mo -share/locale/en_GB/LC_MESSAGES/anjuta.mo -share/locale/es/LC_MESSAGES/anjuta.mo -share/locale/fi/LC_MESSAGES/anjuta.mo -share/locale/fr/LC_MESSAGES/anjuta.mo -share/locale/ga/LC_MESSAGES/anjuta.mo -share/locale/gl/LC_MESSAGES/anjuta.mo -share/locale/gu/LC_MESSAGES/anjuta.mo -share/locale/he/LC_MESSAGES/anjuta.mo -share/locale/hi/LC_MESSAGES/anjuta.mo -share/locale/hr/LC_MESSAGES/anjuta.mo -share/locale/hu/LC_MESSAGES/anjuta.mo -share/locale/id/LC_MESSAGES/anjuta.mo -share/locale/it/LC_MESSAGES/anjuta.mo -share/locale/ja/LC_MESSAGES/anjuta.mo -share/locale/kn/LC_MESSAGES/anjuta.mo -share/locale/ko/LC_MESSAGES/anjuta.mo -share/locale/lt/LC_MESSAGES/anjuta.mo -share/locale/mk/LC_MESSAGES/anjuta.mo -share/locale/ml/LC_MESSAGES/anjuta.mo -share/locale/mr/LC_MESSAGES/anjuta.mo -share/locale/ms/LC_MESSAGES/anjuta.mo -share/locale/nb/LC_MESSAGES/anjuta.mo -share/locale/ne/LC_MESSAGES/anjuta.mo -share/locale/nl/LC_MESSAGES/anjuta.mo -share/locale/oc/LC_MESSAGES/anjuta.mo -share/locale/pa/LC_MESSAGES/anjuta.mo -share/locale/pl/LC_MESSAGES/anjuta.mo -share/locale/pt/LC_MESSAGES/anjuta.mo -share/locale/pt_BR/LC_MESSAGES/anjuta.mo -share/locale/ru/LC_MESSAGES/anjuta.mo -share/locale/rw/LC_MESSAGES/anjuta.mo -share/locale/si/LC_MESSAGES/anjuta.mo -share/locale/sk/LC_MESSAGES/anjuta.mo -share/locale/sl/LC_MESSAGES/anjuta.mo -share/locale/sq/LC_MESSAGES/anjuta.mo -share/locale/sr/LC_MESSAGES/anjuta.mo -share/locale/sr@latin/LC_MESSAGES/anjuta.mo -share/locale/sv/LC_MESSAGES/anjuta.mo -share/locale/th/LC_MESSAGES/anjuta.mo -share/locale/tr/LC_MESSAGES/anjuta.mo -share/locale/uk/LC_MESSAGES/anjuta.mo -share/locale/vi/LC_MESSAGES/anjuta.mo -share/locale/zh_CN/LC_MESSAGES/anjuta.mo -share/locale/zh_HK/LC_MESSAGES/anjuta.mo -share/locale/zh_TW/LC_MESSAGES/anjuta.mo -share/mime/application/x-anjuta.xml -share/mime/packages/anjuta.xml -share/omf/anjuta-manual/anjuta-manual-C.omf -share/omf/anjuta-manual/anjuta-manual-es.omf -share/omf/anjuta-manual/anjuta-manual-oc.omf -share/omf/anjuta-manual/anjuta-manual-sv.omf -share/pixmaps/anjuta/anjuta-attach-16.png -share/pixmaps/anjuta/anjuta-attach-24.png -share/pixmaps/anjuta/anjuta-block-end-16.png -share/pixmaps/anjuta/anjuta-block-end-24.png -share/pixmaps/anjuta/anjuta-block-select-16.png -share/pixmaps/anjuta/anjuta-block-select-24.png -share/pixmaps/anjuta/anjuta-block-start-16.png -share/pixmaps/anjuta/anjuta-block-start-24.png -share/pixmaps/anjuta/anjuta-bookmark-16.png -share/pixmaps/anjuta/anjuta-bookmark-clear-16.png -share/pixmaps/anjuta/anjuta-bookmark-clear-24.png -share/pixmaps/anjuta/anjuta-bookmark-first-16.png -share/pixmaps/anjuta/anjuta-bookmark-first-24.png -share/pixmaps/anjuta/anjuta-bookmark-last-16.png -share/pixmaps/anjuta/anjuta-bookmark-last-24.png -share/pixmaps/anjuta/anjuta-bookmark-next-16.png -share/pixmaps/anjuta/anjuta-bookmark-next-24.png -share/pixmaps/anjuta/anjuta-bookmark-prev-16.png -share/pixmaps/anjuta/anjuta-bookmark-prev-24.png -share/pixmaps/anjuta/anjuta-bookmark-toggle-16.png -share/pixmaps/anjuta/anjuta-bookmark-toggle-24.png -share/pixmaps/anjuta/anjuta-breakpoint-clear-16.png -share/pixmaps/anjuta/anjuta-breakpoint-clear-24.png -share/pixmaps/anjuta/anjuta-breakpoint-disabled-16.png -share/pixmaps/anjuta/anjuta-breakpoint-enabled-16.png -share/pixmaps/anjuta/anjuta-breakpoint-toggle-16.png -share/pixmaps/anjuta/anjuta-breakpoint-toggle-24.png -share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin-48.png -share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.svg -share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png -share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg -share/pixmaps/anjuta/anjuta-complete-16.png -share/pixmaps/anjuta/anjuta-complete-24.png -share/pixmaps/anjuta/anjuta-complete-auto-16.png -share/pixmaps/anjuta/anjuta-complete-auto-24.png -share/pixmaps/anjuta/anjuta-cvs-plugin-48.png -share/pixmaps/anjuta/anjuta-cvs-plugin.svg -share/pixmaps/anjuta/anjuta-debug-manager-plugin-48.png -share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg -share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png -share/pixmaps/anjuta/anjuta-devhelp-plugin.svg -share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png -share/pixmaps/anjuta/anjuta-document-manager-plugin.svg -%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png -%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg -share/pixmaps/anjuta/element-class-16.png -share/pixmaps/anjuta/element-delegate-16.png -share/pixmaps/anjuta/element-enumeration-16.png -share/pixmaps/anjuta/element-event-16.png -share/pixmaps/anjuta/element-field-16.png -share/pixmaps/anjuta/element-interface-16.png -share/pixmaps/anjuta/element-literal-16.png -share/pixmaps/anjuta/element-method-16.png -share/pixmaps/anjuta/element-namespace-16.png -share/pixmaps/anjuta/element-property-16.png -share/pixmaps/anjuta/element-structure-16.png -share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png -share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png -share/pixmaps/anjuta/anjuta-file-manager-plugin.svg -share/pixmaps/anjuta/anjuta-file-wizard-plugin.png -share/pixmaps/anjuta/anjuta-fold-close-16.png -share/pixmaps/anjuta/anjuta-fold-close-24.png -share/pixmaps/anjuta/anjuta-fold-open-16.png -share/pixmaps/anjuta/anjuta-fold-open-24.png -share/pixmaps/anjuta/anjuta-fold-toggle-16.png -share/pixmaps/anjuta/anjuta-fold-toggle-24.png -share/pixmaps/anjuta/anjuta-gdb.plugin.png -share/pixmaps/anjuta/anjuta-git-plugin-48.png -share/pixmaps/anjuta/anjuta-glade-plugin-48.png -share/pixmaps/anjuta/anjuta-glade-plugin.svg -share/pixmaps/anjuta/anjuta-go-help-next-16.png -share/pixmaps/anjuta/anjuta-go-help-next-24.png -share/pixmaps/anjuta/anjuta-go-help-prev-16.png -share/pixmaps/anjuta/anjuta-go-help-prev-24.png -share/pixmaps/anjuta/anjuta-go-history-next-16.png -share/pixmaps/anjuta/anjuta-go-history-next-24.png -share/pixmaps/anjuta/anjuta-go-history-prev-16.png -share/pixmaps/anjuta/anjuta-go-history-prev-24.png -share/pixmaps/anjuta/anjuta-go-line-16.png -share/pixmaps/anjuta/anjuta-go-line-24.png -share/pixmaps/anjuta/anjuta-go-match-next-16.png -share/pixmaps/anjuta/anjuta-go-match-next-24.png -share/pixmaps/anjuta/anjuta-go-match-prev-16.png -share/pixmaps/anjuta/anjuta-go-match-prev-24.png -share/pixmaps/anjuta/anjuta-go-message-next-16.png -share/pixmaps/anjuta/anjuta-go-message-next-24.png -share/pixmaps/anjuta/anjuta-go-message-prev-16.png -share/pixmaps/anjuta/anjuta-go-message-prev-24.png -share/pixmaps/anjuta/anjuta-gtodo-plugin-48.png -share/pixmaps/anjuta/anjuta-gtodo-plugin.svg -share/pixmaps/anjuta/anjuta-indent-auto-16.png -share/pixmaps/anjuta/anjuta-indent-auto-24.png -share/pixmaps/anjuta/anjuta-indent-less-16.png -share/pixmaps/anjuta/anjuta-indent-less-24.png -share/pixmaps/anjuta/anjuta-indent-more-16.png -share/pixmaps/anjuta/anjuta-indent-more-24.png -share/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png -share/pixmaps/anjuta/anjuta-language-manager-plugin-48.png -share/pixmaps/anjuta/anjuta-language-manager-plugin.svg -share/pixmaps/anjuta/anjuta-linemark-16.png -share/pixmaps/anjuta/anjuta-loader-plugin-48.png -share/pixmaps/anjuta/anjuta-loader-plugin.svg -share/pixmaps/anjuta/anjuta-macro.png -share/pixmaps/anjuta/anjuta-messages-plugin-48.png -share/pixmaps/anjuta/anjuta-messages-plugin.svg -share/pixmaps/anjuta/anjuta-patch-plugin-48.png -share/pixmaps/anjuta/anjuta-patch-plugin.svg -share/pixmaps/anjuta/anjuta-pcmark-16.png -share/pixmaps/anjuta/anjuta-preferences-general-48.png -share/pixmaps/anjuta/anjuta-preferences-general.svg -share/pixmaps/anjuta/anjuta-profiler-plugin-48.png -share/pixmaps/anjuta/anjuta-profiler-plugin.svg -share/pixmaps/anjuta/anjuta-project-import-plugin-48.png -share/pixmaps/anjuta/anjuta-project-import-plugin.svg -share/pixmaps/anjuta/anjuta-project-manager-plugin-48.png -share/pixmaps/anjuta/anjuta-project-manager-plugin.svg -share/pixmaps/anjuta/anjuta-project-wizard-plugin-48.png -share/pixmaps/anjuta/anjuta-project-wizard-plugin.svg -share/pixmaps/anjuta/anjuta-run-to-cursor-16.png -share/pixmaps/anjuta/anjuta-run-to-cursor-24.png -share/pixmaps/anjuta/anjuta-run-program-48.png -share/pixmaps/anjuta/anjuta-sample-plugin-48.png -share/pixmaps/anjuta/anjuta-sample-plugin.svg -share/pixmaps/anjuta/anjuta-scratchbox-48.png -share/pixmaps/anjuta/anjuta-search-plugin-48.png -share/pixmaps/anjuta/anjuta-search-plugin.svg -share/pixmaps/anjuta/anjuta-step-into-16.png -share/pixmaps/anjuta/anjuta-step-into-24.png -share/pixmaps/anjuta/anjuta-step-out-16.png -share/pixmaps/anjuta/anjuta-step-out-24.png -share/pixmaps/anjuta/anjuta-step-over-16.png -share/pixmaps/anjuta/anjuta-step-over-24.png -%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin-48.png -%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg -share/pixmaps/anjuta/anjuta-swap-16.png -share/pixmaps/anjuta/anjuta-swap-24.png -share/pixmaps/anjuta/anjuta-symbol-browser-plugin-48.png -share/pixmaps/anjuta/anjuta-symbol-browser-plugin.svg -%%SYMBOL%%share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png -share/pixmaps/anjuta/anjuta-terminal-plugin-48.png -share/pixmaps/anjuta/anjuta-terminal-plugin.svg -share/pixmaps/anjuta/anjuta-tools-plugin-48.png -share/pixmaps/anjuta/anjuta-tools-plugin.svg -share/pixmaps/anjuta/anjuta-watch-16.png -share/pixmaps/anjuta/anjuta-watch-24.png -share/pixmaps/anjuta/anjuta-watch.svg -share/pixmaps/anjuta/anjuta.png -share/pixmaps/anjuta/anjuta.svg -share/pixmaps/anjuta/anjuta_logo.png -share/pixmaps/anjuta/anjuta_splash.png -share/pixmaps/anjuta/breakpoint.png -share/pixmaps/anjuta/class_logo.xpm -share/pixmaps/anjuta/directory-accept.png -share/pixmaps/anjuta/directory.png -share/pixmaps/anjuta/gtodo-about.png -share/pixmaps/anjuta/gtodo-edit.png -share/pixmaps/anjuta/gtodo_tray.png -share/pixmaps/anjuta/locals.png -share/pixmaps/anjuta/madeinanjuta.xcf -share/pixmaps/anjuta/password.png -share/pixmaps/anjuta/pointer.png -share/pixmaps/anjuta/preferences-editor.png -share/pixmaps/anjuta/stack.png -share/pixmaps/anjuta/start-with-import.png -@dirrm share/pixmaps/anjuta -@dirrm share/omf/anjuta-manual -@dirrm share/gnome/help/anjuta-manual/sv/figures -@dirrm share/gnome/help/anjuta-manual/sv -@dirrm share/gnome/help/anjuta-manual/oc/figures -@dirrm share/gnome/help/anjuta-manual/oc -@dirrm share/gnome/help/anjuta-manual/es/figures -@dirrm share/gnome/help/anjuta-manual/es -@dirrm share/gnome/help/anjuta-manual/C/figures -@dirrm share/gnome/help/anjuta-manual/C -@dirrm share/gnome/help/anjuta-manual -@dirrm share/gnome/help/anjuta-faqs/C -@dirrm share/gnome/help/anjuta-faqs -@dirrmtry share/icons/gnome/48x48/mimetypes -@dirrm share/anjuta/ui -@dirrm share/anjuta/tools -@dirrm share/anjuta/scripts -%%SCINTILLA%%@dirrm share/anjuta/properties -@dirrm share/anjuta/project/xlib/src -@dirrm share/anjuta/project/xlib/po -@dirrm share/anjuta/project/xlib-dock/src -@dirrm share/anjuta/project/xlib-dock/po -@dirrm share/anjuta/project/xlib-dock -@dirrm share/anjuta/project/xlib -@dirrm share/anjuta/project/wxwin/src -@dirrm share/anjuta/project/wxwin/po -@dirrm share/anjuta/project/wxwin -@dirrm share/anjuta/project/terminal/src -@dirrm share/anjuta/project/terminal/po -@dirrm share/anjuta/project/terminal -@dirrm share/anjuta/project/sdl/src -@dirrm share/anjuta/project/sdl/po -@dirrm share/anjuta/project/sdl -@dirrm share/anjuta/project/python/src -@dirrm share/anjuta/project/python/po -@dirrm share/anjuta/project/python -@dirrm share/anjuta/project/mkfile/src -@dirrm share/anjuta/project/mkfile/po -@dirrm share/anjuta/project/mkfile -@dirrm share/anjuta/project/minimal -@dirrm share/anjuta/project/licenses -@dirrm share/anjuta/project/java/src -@dirrm share/anjuta/project/java/po -@dirrm share/anjuta/project/java -@dirrm share/anjuta/project/gtkmm/src -@dirrm share/anjuta/project/gtkmm/po -@dirrm share/anjuta/project/gtkmm -@dirrm share/anjuta/project/gtk/src -@dirrm share/anjuta/project/gtk/po -@dirrm share/anjuta/project/gtk -@dirrm share/anjuta/project/gnome/src -@dirrm share/anjuta/project/gnome/po -@dirrm share/anjuta/project/gnome -@dirrm share/anjuta/project/gcj/src -@dirrm share/anjuta/project/gcj -@dirrm share/anjuta/project/cpp/src -@dirrm share/anjuta/project/cpp/po -@dirrm share/anjuta/project/cpp -@dirrm share/anjuta/project/anjuta-plugin-vala/src -@dirrm share/anjuta/project/anjuta-plugin-vala/po -@dirrm share/anjuta/project/anjuta-plugin-vala -@dirrm share/anjuta/project/anjuta-plugin/src -@dirrm share/anjuta/project/anjuta-plugin/po -@dirrm share/anjuta/project/anjuta-plugin -@dirrm share/anjuta/project -@dirrm share/anjuta/profiles -@dirrm share/anjuta/gtodo -@dirrm share/anjuta/glade -@dirrm share/anjuta/class-templates -@dirrm share/anjuta/build -@dirrm share/anjuta -@dirrm share/doc/libanjuta -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/anjuta -@dirrm include/libanjuta-1.0/libanjuta/interfaces -@dirrm include/libanjuta-1.0/libanjuta -@dirrm include/libanjuta-1.0 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@dirrmtry share/applications -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile deleted file mode 100644 index e5bb91ecf..000000000 --- a/devel/bug-buddy/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: bugbuddy2 -# Date created: 14 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.70 2008/10/20 03:06:58 mezz Exp $ -# - -PORTNAME= bug-buddy -PORTVERSION= 2.24.2 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A bug reporting tool for GNOME 2 - -LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - soup-2.4.1:${PORTSDIR}/devel/libsoup - -USE_BZIP2= yes -USE_GETTEXT= yes -INSTALLS_ICONS= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus \ - gnomedocutils evolutiondataserver -GNOME_DESKTOP_VERSION=2 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -GCONF_SCHEMAS= bug-buddy.schemas - -MAN1= bug-buddy.1 - -post-patch: - @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ - ${WRKSRC}/src/bugzilla.c - @${REINPLACE_CMD} -e 's|libelf.h||g ; \ - s|gelf.h||g' \ - ${WRKSRC}/configure - -.include <bsd.port.mk> diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo deleted file mode 100644 index b4d410c17..000000000 --- a/devel/bug-buddy/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/bug-buddy-2.24.2.tar.bz2) = faeeb2351398b9284eee794ff6ea9588 -SHA256 (gnome2/bug-buddy-2.24.2.tar.bz2) = d64125505546183d44727e812b0ac7e9c60f0fff0eaf164b874974647067cbb4 -SIZE (gnome2/bug-buddy-2.24.2.tar.bz2) = 1109562 diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc deleted file mode 100644 index 801be1064..000000000 --- a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc +++ /dev/null @@ -1,52 +0,0 @@ ---- gnome-breakpad/gnome-breakpad.cc.orig 2007-08-16 13:55:38.000000000 -0400 -+++ gnome-breakpad/gnome-breakpad.cc 2007-09-02 19:21:10.000000000 -0400 -@@ -6,8 +6,14 @@ - #include <cassert> - #include <cstring> - -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#endif -+ -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - #include <libelf.h> - #include <gelf.h> -+#endif - - #include <sys/types.h> - #include <sys/stat.h> -@@ -114,6 +120,7 @@ find_in_debug_path (const char *filename - } - - -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - static gboolean - elf_has_debug_symbols (const char *filename) - { -@@ -166,7 +173,7 @@ elf_has_debug_symbols (const char *filen - elf_end (elf); - return false; - } -- -+#endif - - - -@@ -269,9 +276,17 @@ check_if_gdb (void *callback_context) - _exit(0); - } - -+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024 - memset(mypath, 0, sizeof(mypath)); -+#ifndef __FreeBSD__ - readlink ("/proc/self/exe", mypath, sizeof(mypath)); -+#else -+ readlink ("/proc/curproc/file", mypath, sizeof(mypath)); -+#endif - has_debug_symbols = elf_has_debug_symbols (mypath); -+#else -+ has_debug_symbols = TRUE; -+#endif - - - if (bugbuddy && gdb && has_debug_symbols) { diff --git a/devel/bug-buddy/pkg-descr b/devel/bug-buddy/pkg-descr deleted file mode 100644 index 7268130ab..000000000 --- a/devel/bug-buddy/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is a bug reporting tool. It pops up automatically when a GNOME -app crashes under the GNOME desktop (via gnome_segv), and allows -the crash information to be sent to the app's developers. - -Jacob Berkman <jberkman@andrew.cmu.edu> - -WWW: http://www.gnome.org/ diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist deleted file mode 100644 index 7655acd7e..000000000 --- a/devel/bug-buddy/pkg-plist +++ /dev/null @@ -1,150 +0,0 @@ -bin/bug-buddy -lib/gtk-2.0/modules/libgnomebreakpad.la -lib/gtk-2.0/modules/libgnomebreakpad.so -share/applications/bug-buddy.desktop -%%DATADIR%%/bug-buddy.gtkbuilder -%%DATADIR%%/bug-buddy.menu -%%DATADIR%%/bugzilla/gnome.bugzilla -%%DATADIR%%/bugzilla/gnome/config -%%DATADIR%%/bugzilla/gnome/mostfreq -%%DATADIR%%/bugzilla/gnome/products -%%DATADIR%%/bugzilla/ximian.bugzilla -%%DATADIR%%/bugzilla/ximian/config -%%DATADIR%%/bugzilla/ximian/mostfreq -%%DATADIR%%/bugzilla/ximian/products -%%DATADIR%%/gdb-cmd -share/icons/HighContrastLargePrint/48x48/apps/bug-buddy.png -share/icons/hicolor/16x16/apps/bug-buddy.png -share/icons/hicolor/22x22/apps/bug-buddy.png -share/icons/hicolor/24x24/apps/bug-buddy.png -share/icons/hicolor/32x32/apps/bug-buddy.png -share/icons/hicolor/48x48/apps/bug-buddy.png -share/icons/hicolor/scalable/apps/bug-buddy.svg -share/locale/af/LC_MESSAGES/bug-buddy.mo -share/locale/am/LC_MESSAGES/bug-buddy.mo -share/locale/ar/LC_MESSAGES/bug-buddy.mo -share/locale/as/LC_MESSAGES/bug-buddy.mo -share/locale/az/LC_MESSAGES/bug-buddy.mo -share/locale/be/LC_MESSAGES/bug-buddy.mo -share/locale/be@latin/LC_MESSAGES/bug-buddy.mo -share/locale/bg/LC_MESSAGES/bug-buddy.mo -share/locale/bn/LC_MESSAGES/bug-buddy.mo -share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo -share/locale/bs/LC_MESSAGES/bug-buddy.mo -share/locale/ca/LC_MESSAGES/bug-buddy.mo -share/locale/cs/LC_MESSAGES/bug-buddy.mo -share/locale/cy/LC_MESSAGES/bug-buddy.mo -share/locale/da/LC_MESSAGES/bug-buddy.mo -share/locale/de/LC_MESSAGES/bug-buddy.mo -share/locale/dz/LC_MESSAGES/bug-buddy.mo -share/locale/el/LC_MESSAGES/bug-buddy.mo -share/locale/en_CA/LC_MESSAGES/bug-buddy.mo -share/locale/en_GB/LC_MESSAGES/bug-buddy.mo -share/locale/es/LC_MESSAGES/bug-buddy.mo -share/locale/et/LC_MESSAGES/bug-buddy.mo -share/locale/eu/LC_MESSAGES/bug-buddy.mo -share/locale/fa/LC_MESSAGES/bug-buddy.mo -share/locale/fi/LC_MESSAGES/bug-buddy.mo -share/locale/fr/LC_MESSAGES/bug-buddy.mo -share/locale/ga/LC_MESSAGES/bug-buddy.mo -share/locale/gl/LC_MESSAGES/bug-buddy.mo -share/locale/gu/LC_MESSAGES/bug-buddy.mo -share/locale/he/LC_MESSAGES/bug-buddy.mo -share/locale/hi/LC_MESSAGES/bug-buddy.mo -share/locale/hr/LC_MESSAGES/bug-buddy.mo -share/locale/hu/LC_MESSAGES/bug-buddy.mo -share/locale/id/LC_MESSAGES/bug-buddy.mo -share/locale/is/LC_MESSAGES/bug-buddy.mo -share/locale/it/LC_MESSAGES/bug-buddy.mo -share/locale/ja/LC_MESSAGES/bug-buddy.mo -share/locale/ka/LC_MESSAGES/bug-buddy.mo -share/locale/kn/LC_MESSAGES/bug-buddy.mo -share/locale/ko/LC_MESSAGES/bug-buddy.mo -share/locale/ku/LC_MESSAGES/bug-buddy.mo -share/locale/ky/LC_MESSAGES/bug-buddy.mo -share/locale/lt/LC_MESSAGES/bug-buddy.mo -share/locale/lv/LC_MESSAGES/bug-buddy.mo -share/locale/mg/LC_MESSAGES/bug-buddy.mo -share/locale/mk/LC_MESSAGES/bug-buddy.mo -share/locale/ml/LC_MESSAGES/bug-buddy.mo -share/locale/mn/LC_MESSAGES/bug-buddy.mo -share/locale/mr/LC_MESSAGES/bug-buddy.mo -share/locale/ms/LC_MESSAGES/bug-buddy.mo -share/locale/nb/LC_MESSAGES/bug-buddy.mo -share/locale/ne/LC_MESSAGES/bug-buddy.mo -share/locale/nl/LC_MESSAGES/bug-buddy.mo -share/locale/nn/LC_MESSAGES/bug-buddy.mo -share/locale/oc/LC_MESSAGES/bug-buddy.mo -share/locale/or/LC_MESSAGES/bug-buddy.mo -share/locale/pa/LC_MESSAGES/bug-buddy.mo -share/locale/pl/LC_MESSAGES/bug-buddy.mo -share/locale/ps/LC_MESSAGES/bug-buddy.mo -share/locale/pt/LC_MESSAGES/bug-buddy.mo -share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo -share/locale/ro/LC_MESSAGES/bug-buddy.mo -share/locale/ru/LC_MESSAGES/bug-buddy.mo -share/locale/rw/LC_MESSAGES/bug-buddy.mo -share/locale/si/LC_MESSAGES/bug-buddy.mo -share/locale/sk/LC_MESSAGES/bug-buddy.mo -share/locale/sl/LC_MESSAGES/bug-buddy.mo -share/locale/sq/LC_MESSAGES/bug-buddy.mo -share/locale/sr/LC_MESSAGES/bug-buddy.mo -share/locale/sr@latin/LC_MESSAGES/bug-buddy.mo -share/locale/sv/LC_MESSAGES/bug-buddy.mo -share/locale/ta/LC_MESSAGES/bug-buddy.mo -share/locale/te/LC_MESSAGES/bug-buddy.mo -share/locale/th/LC_MESSAGES/bug-buddy.mo -share/locale/tr/LC_MESSAGES/bug-buddy.mo -share/locale/ug/LC_MESSAGES/bug-buddy.mo -share/locale/uk/LC_MESSAGES/bug-buddy.mo -share/locale/uz@cyrillic/LC_MESSAGES/bug-buddy.mo -share/locale/vi/LC_MESSAGES/bug-buddy.mo -share/locale/wa/LC_MESSAGES/bug-buddy.mo -share/locale/xh/LC_MESSAGES/bug-buddy.mo -share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo -share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo -share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo -@dirrmtry share/icons/HighContrastLargePrint/48x48/apps -@dirrmtry share/icons/HighContrastLargePrint/48x48 -@dirrmtry share/icons/HighContrastLargePrint -@dirrm %%DATADIR%%/bugzilla/ximian -@dirrm %%DATADIR%%/bugzilla/gnome -@dirrm %%DATADIR%%/bugzilla -@dirrm %%DATADIR%% -@dirrmtry share/applications -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES -@dirrmtry share/locale/uz@cyrillic -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ps/LC_MESSAGES -@dirrmtry share/locale/ps -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile deleted file mode 100644 index ad75aa4b1..000000000 --- a/devel/dbus-glib/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: dbus-glib -# Date Created: 07 October 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD: ports/devel/dbus-glib/Makefile,v 1.7 2008/06/17 23:27:09 marcus Exp $ -# - -PORTNAME= dbus -PORTVERSION= 0.78 -CATEGORIES= devel gnome -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/ -PKGNAMESUFFIX= -glib -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GLib bindings for the D-BUS messaging system - -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus - -USE_GNOME= gnomehack glib20 ltverhack -USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ - --disable-doxygen-docs \ - --disable-xml-docs \ - --disable-gtk-doc \ - --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -PLIST_SUB= VERSION="1.0" - -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} - -.include <bsd.port.mk> diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo deleted file mode 100644 index aae323c5b..000000000 --- a/devel/dbus-glib/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (dbus-glib-0.78.tar.gz) = d4aa04b9df35b4bd663be38e959941c8 -SHA256 (dbus-glib-0.78.tar.gz) = ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21 -SIZE (dbus-glib-0.78.tar.gz) = 683454 diff --git a/devel/dbus-glib/pkg-descr b/devel/dbus-glib/pkg-descr deleted file mode 100644 index bc3c57d8f..000000000 --- a/devel/dbus-glib/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -GLib bindings for the D-BUS interprocess messaging system. - -WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist deleted file mode 100644 index 54bca8460..000000000 --- a/devel/dbus-glib/pkg-plist +++ /dev/null @@ -1,35 +0,0 @@ -bin/dbus-binding-tool -etc/profile.d/dbus-bash-completion.sh -include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h -include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h -include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h -include/dbus-%%VERSION%%/dbus/dbus-glib.h -include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h -lib/libdbus-glib-1.a -lib/libdbus-glib-1.la -lib/libdbus-glib-1.so -lib/libdbus-glib-1.so.2 -libdata/pkgconfig/dbus-glib-1.pc -libexec/dbus-bash-completion-helper -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/ch03.html -%%DOCSDIR%%/dbus-binding-tool.html -%%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html -%%DOCSDIR%%/dbus-glib-DBusGConnection.html -%%DOCSDIR%%/dbus-glib-DBusGError.html -%%DOCSDIR%%/dbus-glib-DBusGMessage.html -%%DOCSDIR%%/dbus-glib-DBusGMethod.html -%%DOCSDIR%%/dbus-glib-DBusGProxy.html -%%DOCSDIR%%/dbus-glib-Specializable-GType-System.html -%%DOCSDIR%%/dbus-glib.devhelp -%%DOCSDIR%%/dbus-glib.devhelp2 -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -@dirrm %%DOCSDIR%% -@dirrmtry etc/profile.d diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile deleted file mode 100644 index 89df6ae07..000000000 --- a/devel/dbus/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# New ports collection makefile for: D-BUS -# Date Created: 22 June 2004 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= dbus -PORTVERSION?= 1.2.4.2 -PORTREVISION?= 0 -CATEGORIES= devel gnome -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ -DISTNAME= dbus-${PORTVERSION}permissive - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A message bus system for inter-application communication - -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 - -USE_GNOME?= gnomehack libxml2 ltverhack -USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -CONFIGURE_ARGS=--localstatedir=/var \ - --with-test-socket-dir=${WRKDIR} \ - --with-system-pid-file=/var/run/dbus/dbus.pid \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-session-socket-dir=/var/tmp \ - --disable-doxygen-docs \ - --disable-xml-docs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -.if !defined(DBUS_SLAVE) -USE_RC_SUBR= dbus -USE_GNOME_SUBR= yes - -PLIST_SUB= VERSION="1.0" - -MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \ - dbus-monitor.1 dbus-send.1 dbus-uuidgen.1 - -.if !defined(WITHOUT_X11) -USE_XORG= x11 -.else -CONFIGURE_ARGS+=--without-x -.endif -.endif - -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/dbus/dbus-sysdeps-unix.c - @${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \ - ${WRKSRC}/dbus/Makefile.in \ - ${WRKSRC}/tools/Makefile.in - -.if !defined(DBUS_SLAVE) -post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - ${MKDIR} ${PREFIX}/share/dbus-1/interfaces -.endif - -.include <bsd.port.post.mk> diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo deleted file mode 100644 index 00cc4ea6a..000000000 --- a/devel/dbus/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (dbus-1.2.4.2permissive.tar.gz) = 92418f1d2932c2f4980b815e00c993cc -SHA256 (dbus-1.2.4.2permissive.tar.gz) = 1d384f4d1c7d2e022e68e421f980c3e60557016d44999560f2136d2a58f7c9c9 -SIZE (dbus-1.2.4.2permissive.tar.gz) = 1574034 diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in deleted file mode 100644 index 59ef29ec7..000000000 --- a/devel/dbus/files/dbus.in +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dbus -# REQUIRE: DAEMON -# -# Add the following lines to /etc/rc.conf to enable the D-BUS messaging system: -# -# dbus_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -dbus_enable=${dbus_enable-${gnome_enable}} -dbus_flags=${dbus_flags-"--system"} - -name=dbus -rcvar=`set_rcvar` - -command="%%PREFIX%%/bin/dbus-daemon" -pidfile="/var/run/dbus/${name}.pid" - -start_precmd="dbus_prestart" -stop_postcmd="dbus_poststop" - -dbus_prestart() -{ - mkdir -p $(dirname $pidfile) -} - -dbus_poststop() -{ - rm -f $pidfile -} - - -load_rc_config ${name} -run_rc_command "$1" diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in deleted file mode 100644 index b55c5dc79..000000000 --- a/devel/dbus/files/patch-bus_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500 -+++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500 -@@ -412,7 +412,7 @@ target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - configdir = $(sysconfdir)/dbus-1 --INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ -+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION - -@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \ - $(DBUS_BUS_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la - --dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ -+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ - LAUNCH_HELPER_SOURCES = \ - $(XML_SOURCES) \ - config-parser-common.c \ diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in deleted file mode 100644 index 44c97a29e..000000000 --- a/devel/dbus/files/patch-dbus-1.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- dbus-1.pc.in.orig Mon Nov 6 02:55:38 2006 -+++ dbus-1.pc.in Mon Nov 6 02:55:57 2006 -@@ -10,5 +10,5 @@ Name: dbus - Description: Free desktop message bus - Version: @VERSION@ - Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@ --Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include -+Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include - diff --git a/devel/dbus/files/patch-dbus_Makefile.in b/devel/dbus/files/patch-dbus_Makefile.in deleted file mode 100644 index 42a58caed..000000000 --- a/devel/dbus/files/patch-dbus_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- dbus/Makefile.in.orig Fri Jan 21 19:43:46 2005 -+++ dbus/Makefile.in Fri Jan 21 19:44:43 2005 -@@ -360,7 +360,7 @@ - @HAVE_GLIB_TRUE@ $(DBUS_GLIB_BUILT_INCLUDES) - - dbusincludedir = $(includedir)/dbus-1.0/dbus --dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus -+dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus - lib_LTLIBRARIES = libdbus-1.la - dbusinclude_HEADERS = \ - dbus.h \ diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c deleted file mode 100644 index aa623c158..000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ /dev/null @@ -1,75 +0,0 @@ ---- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400 -+++ dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400 -@@ -1041,9 +1041,9 @@ write_credentials_byte (int - int bytes_written; - char buf[1] = { '\0' }; - #if defined(HAVE_CMSGCRED) -- struct { -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - struct iovec iov; - struct msghdr msg; -@@ -1054,10 +1054,10 @@ write_credentials_byte (int - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - memset (&cmsg, 0, sizeof (cmsg)); -- cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); - cmsg.hdr.cmsg_level = SOL_SOCKET; - cmsg.hdr.cmsg_type = SCM_CREDS; - #endif -@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int - pid_read = DBUS_PID_UNSET; - - #ifdef HAVE_CMSGCRED -- struct { -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - - #elif defined(LOCAL_CREDS) -@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int - - #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) - memset (&cmsg, 0, sizeof (cmsg)); -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - #endif - - again: -@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int - } - - #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) -- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) -+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) -+ || cmsg.hdr.cmsg_type != SCM_CREDS) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "Message from recvmsg() was not SCM_CREDS"); -@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket (int - cr_len, (int) sizeof (cr), _dbus_strerror (errno)); - } - #elif defined(HAVE_CMSGCRED) -- pid_read = cmsg.cred.cmcred_pid; -- uid_read = cmsg.cred.cmcred_euid; -+ struct cmsgcred *cred; -+ -+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ pid_read = cred->cmcred_pid; -+ uid_read = cred->cmcred_euid; - #elif defined(LOCAL_CREDS) - pid_read = DBUS_PID_UNSET; - uid_read = cmsg.cred.sc_uid; diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c deleted file mode 100644 index cdf6eaf07..000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c +++ /dev/null @@ -1,10 +0,0 @@ ---- dbus/dbus-sysdeps-util-unix.c.orig 2008-12-21 14:51:17.000000000 -0500 -+++ dbus/dbus-sysdeps-util-unix.c 2008-12-21 14:51:37.000000000 -0500 -@@ -38,6 +38,7 @@ - #include <stdio.h> - #include <errno.h> - #include <fcntl.h> -+#include <syslog.h> - #include <sys/stat.h> - #include <grp.h> - #include <sys/socket.h> diff --git a/devel/dbus/pkg-descr b/devel/dbus/pkg-descr deleted file mode 100644 index 2a1c3cc0a..000000000 --- a/devel/dbus/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -D-BUS supplies both a system daemon (for events such as "new hardware device -added" or "printer queue changed") and a per-user-login-session daemon (for -general IPC needs among user applications). Also, the message bus is built on -top of a general one-to-one message passing framework, which can be used by -any two apps to communicate directly (without going through the message bus -daemon). - -WWW: http://www.freedesktop.org/Software/dbus diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install deleted file mode 100644 index 4ed46afa7..000000000 --- a/devel/dbus/pkg-install +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - USER=messagebus - GROUP=${USER} - UID=556 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - - /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus - /usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus - /usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper - ${PKG_PREFIX}/bin/dbus-uuidgen --ensure - exit 0 - ;; -esac diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist deleted file mode 100644 index 3bbf8b3c9..000000000 --- a/devel/dbus/pkg-plist +++ /dev/null @@ -1,54 +0,0 @@ -bin/dbus-cleanup-sockets -bin/dbus-daemon -bin/dbus-launch -bin/dbus-monitor -bin/dbus-send -bin/dbus-uuidgen -etc/dbus-1/session.conf -etc/dbus-1/system.conf -include/dbus-%%VERSION%%/dbus/dbus-address.h -include/dbus-%%VERSION%%/dbus/dbus-bus.h -include/dbus-%%VERSION%%/dbus/dbus-connection.h -include/dbus-%%VERSION%%/dbus/dbus-errors.h -include/dbus-%%VERSION%%/dbus/dbus-macros.h -include/dbus-%%VERSION%%/dbus/dbus-memory.h -include/dbus-%%VERSION%%/dbus/dbus-message.h -include/dbus-%%VERSION%%/dbus/dbus-misc.h -include/dbus-%%VERSION%%/dbus/dbus-pending-call.h -include/dbus-%%VERSION%%/dbus/dbus-protocol.h -include/dbus-%%VERSION%%/dbus/dbus-server.h -include/dbus-%%VERSION%%/dbus/dbus-shared.h -include/dbus-%%VERSION%%/dbus/dbus-signature.h -include/dbus-%%VERSION%%/dbus/dbus-threads.h -include/dbus-%%VERSION%%/dbus/dbus-types.h -include/dbus-%%VERSION%%/dbus/dbus.h -include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h -lib/libdbus-1.a -lib/libdbus-1.la -lib/libdbus-1.so -lib/libdbus-1.so.3 -libdata/pkgconfig/dbus-1.pc -libexec/dbus-daemon-launch-helper -@exec mkdir -p %D/libexec/dbus-1 -@exec mkdir -p %D/etc/dbus-1/system.d -@exec mkdir -p %D/share/dbus-1/interfaces -@exec mkdir -p %D/share/dbus-1/services -@exec mkdir -p %D/share/dbus-1/system-services -@exec mkdir -p %D/etc/dbus-1/session.d -@dirrmtry share/dbus-1/system-services -@dirrmtry share/dbus-1/services -@dirrmtry share/dbus-1/interfaces -@dirrmtry share/dbus-1 -@dirrmtry libexec/dbus-1 -@dirrm include/dbus-%%VERSION%%/include/dbus -@dirrm include/dbus-%%VERSION%%/include -@dirrm include/dbus-%%VERSION%%/dbus -@dirrm include/dbus-%%VERSION%% -@dirrm etc/dbus-1/system.d -@dirrm etc/dbus-1/session.d -@dirrm etc/dbus-1 -@unexec rm -f /var/run/dbus/dbus.pid -@unexec rm -f /var/run/dbus/dbus.pipe -@unexec rmdir /var/run/dbus 2>/dev/null || true -@unexec rm -f /var/db/dbus/machine-id -@unexec rmdir /var/db/dbus 2>/dev/null || true diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile deleted file mode 100644 index a47ffc10b..000000000 --- a/devel/devhelp/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# New ports collection makefile for: devhelp -# Date created: 29 May 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/devhelp/Makefile,v 1.9 2008/09/22 14:06:12 kwm Exp $ - -PORTNAME= devhelp -PORTVERSION= 0.22 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= kwm@FreeBSD.org -COMMENT= Developer help browser for GNOME 2 - -USE_BZIP2= yes -USE_XORG= x11 -USE_GETTEXT= yes -USE_GECKO= firefox xulrunner -USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck -USE_AUTOTOOLS= libtool:15 -GNU_CONFIGURE= yes -INSTALLS_ICONS= yes -USE_LDCONFIG= yes -GCONF_SCHEMAS= devhelp.schemas -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gecko=${GECKO} - -OPTIONS= GEDIT "Enable GEdit plug-in support" off - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" - -.if defined(WITH_GEDIT) -BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit -RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit -PLIST_SUB+= GEDIT="" -.else -PLIST_SUB+= GEDIT="@comment " -.endif - -post-patch: -.if defined(WITHOUT_GEDIT) - @${REINPLACE_CMD} -e 's|gedit-plugin||' \ - ${WRKSRC}/misc/Makefile.in -.endif - -.include <bsd.port.post.mk> diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo deleted file mode 100644 index 8c21dd82e..000000000 --- a/devel/devhelp/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/devhelp-0.22.tar.bz2) = 7cdd0688dba0184b6dd2688532af24cb -SHA256 (gnome2/devhelp-0.22.tar.bz2) = 1fa4b69c99b10de0e27374e18eea7988e3e8f9243020a22a47f79c9ccad92947 -SIZE (gnome2/devhelp-0.22.tar.bz2) = 517581 diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c deleted file mode 100644 index 3dbf1c71c..000000000 --- a/devel/devhelp/files/patch-src_dh-base.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/dh-base.c.orig 2008-10-11 00:00:18.000000000 +0200 -+++ src/dh-base.c 2009-01-09 23:10:12.000000000 +0100 -@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase - dir = g_build_filename (data_dir, "devhelp", "books", NULL); - base_add_books (base, dir); - g_free (dir); -+ -+ dir = g_build_filename (data_dir, "doc", NULL); -+ base_add_books (base, dir); -+ g_free (dir); -+ - } - - static void diff --git a/devel/devhelp/pkg-descr b/devel/devhelp/pkg-descr deleted file mode 100644 index 2d617b391..000000000 --- a/devel/devhelp/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -devhelp is a developer's help browser for GNOME 2. It is a GUI -frontend to books about GNOME development, providing cross-referenced, -easily searchable information. Many books are available, and can -be found through the project's website. - -WWW: http://www.imendio.com/projects/devhelp/ - --Adam Weinberger <adamw@FreeBSD.org> diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist deleted file mode 100644 index 83649fae2..000000000 --- a/devel/devhelp/pkg-plist +++ /dev/null @@ -1,127 +0,0 @@ -bin/devhelp -include/devhelp-1.0/devhelp/dh-assistant-view.h -include/devhelp-1.0/devhelp/dh-assistant.h -include/devhelp-1.0/devhelp/dh-base.h -include/devhelp-1.0/devhelp/dh-book-tree.h -include/devhelp-1.0/devhelp/dh-error.h -include/devhelp-1.0/devhelp/dh-keyword-model.h -include/devhelp-1.0/devhelp/dh-link.h -include/devhelp-1.0/devhelp/dh-search.h -include/devhelp-1.0/devhelp/dh-window.h -%%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin -%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py -%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc -%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyo -%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.py -%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyc -%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyo -lib/libdevhelp-1.a -lib/libdevhelp-1.la -lib/libdevhelp-1.so -lib/libdevhelp-1.so.0 -libdata/pkgconfig/libdevhelp-1.0.pc -share/applications/devhelp.desktop -share/devhelp/assistant/assistant.css -share/devhelp/assistant/assistant.js -share/devhelp/devhelp.defaults -share/devhelp/dtd/devhelp-1.dtd -share/devhelp/ui/devhelp.builder -share/devhelp/ui/window.ui -share/icons/hicolor/16x16/apps/devhelp.png -share/icons/hicolor/22x22/apps/devhelp.png -share/icons/hicolor/24x24/apps/devhelp.png -share/icons/hicolor/32x32/apps/devhelp.png -share/icons/hicolor/48x48/apps/devhelp.png -share/icons/hicolor/scalable/apps/devhelp.svg -share/locale/am/LC_MESSAGES/devhelp.mo -share/locale/ar/LC_MESSAGES/devhelp.mo -share/locale/az/LC_MESSAGES/devhelp.mo -share/locale/be/LC_MESSAGES/devhelp.mo -share/locale/be@latin/LC_MESSAGES/devhelp.mo -share/locale/bg/LC_MESSAGES/devhelp.mo -share/locale/bn/LC_MESSAGES/devhelp.mo -share/locale/bn_IN/LC_MESSAGES/devhelp.mo -share/locale/ca/LC_MESSAGES/devhelp.mo -share/locale/cs/LC_MESSAGES/devhelp.mo -share/locale/da/LC_MESSAGES/devhelp.mo -share/locale/de/LC_MESSAGES/devhelp.mo -share/locale/dz/LC_MESSAGES/devhelp.mo -share/locale/el/LC_MESSAGES/devhelp.mo -share/locale/en_CA/LC_MESSAGES/devhelp.mo -share/locale/en_GB/LC_MESSAGES/devhelp.mo -share/locale/es/LC_MESSAGES/devhelp.mo -share/locale/et/LC_MESSAGES/devhelp.mo -share/locale/fi/LC_MESSAGES/devhelp.mo -share/locale/fr/LC_MESSAGES/devhelp.mo -share/locale/gl/LC_MESSAGES/devhelp.mo -share/locale/gu/LC_MESSAGES/devhelp.mo -share/locale/he/LC_MESSAGES/devhelp.mo -share/locale/hi/LC_MESSAGES/devhelp.mo -share/locale/hr/LC_MESSAGES/devhelp.mo -share/locale/hu/LC_MESSAGES/devhelp.mo -share/locale/is/LC_MESSAGES/devhelp.mo -share/locale/it/LC_MESSAGES/devhelp.mo -share/locale/ja/LC_MESSAGES/devhelp.mo -share/locale/kn/LC_MESSAGES/devhelp.mo -share/locale/ko/LC_MESSAGES/devhelp.mo -share/locale/lt/LC_MESSAGES/devhelp.mo -share/locale/lv/LC_MESSAGES/devhelp.mo -share/locale/mk/LC_MESSAGES/devhelp.mo -share/locale/ml/LC_MESSAGES/devhelp.mo -share/locale/ms/LC_MESSAGES/devhelp.mo -share/locale/nb/LC_MESSAGES/devhelp.mo -share/locale/ne/LC_MESSAGES/devhelp.mo -share/locale/nl/LC_MESSAGES/devhelp.mo -share/locale/nn/LC_MESSAGES/devhelp.mo -share/locale/oc/LC_MESSAGES/devhelp.mo -share/locale/or/LC_MESSAGES/devhelp.mo -share/locale/pa/LC_MESSAGES/devhelp.mo -share/locale/pl/LC_MESSAGES/devhelp.mo -share/locale/ps/LC_MESSAGES/devhelp.mo -share/locale/pt/LC_MESSAGES/devhelp.mo -share/locale/pt_BR/LC_MESSAGES/devhelp.mo -share/locale/ru/LC_MESSAGES/devhelp.mo -share/locale/rw/LC_MESSAGES/devhelp.mo -share/locale/sk/LC_MESSAGES/devhelp.mo -share/locale/sl/LC_MESSAGES/devhelp.mo -share/locale/sq/LC_MESSAGES/devhelp.mo -share/locale/sr/LC_MESSAGES/devhelp.mo -share/locale/sr@Latn/LC_MESSAGES/devhelp.mo -share/locale/sv/LC_MESSAGES/devhelp.mo -share/locale/ta/LC_MESSAGES/devhelp.mo -share/locale/te/LC_MESSAGES/devhelp.mo -share/locale/th/LC_MESSAGES/devhelp.mo -share/locale/tr/LC_MESSAGES/devhelp.mo -share/locale/uk/LC_MESSAGES/devhelp.mo -share/locale/vi/LC_MESSAGES/devhelp.mo -share/locale/zh_CN/LC_MESSAGES/devhelp.mo -share/locale/zh_HK/LC_MESSAGES/devhelp.mo -share/locale/zh_TW/LC_MESSAGES/devhelp.mo -@dirrm share/devhelp/ui -@dirrm share/devhelp/images -@dirrm share/devhelp/dtd -@dirrm share/devhelp/assistant -@dirrm share/devhelp -@dirrm include/devhelp-1.0/devhelp -@dirrm include/devhelp-1.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@Latn/LC_MESSAGES -@dirrmtry share/locale/sr@Latn -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ps/LC_MESSAGES -@dirrmtry share/locale/ps -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile deleted file mode 100644 index 2fd9515fc..000000000 --- a/devel/gamin/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# ports collection makefile for: gamin -# Date created: 24 March 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.4 2008/01/09 19:55:24 marcus Exp $ -# - -PORTNAME= gamin -PORTVERSION= 0.1.10 -CATEGORIES?= devel -MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ - -MAINTAINER?= gnome@FreeBSD.org -COMMENT?= A file and directory monitoring system - -USE_AUTOTOOLS= libtool:15 -USE_GMAKE= yes -USE_GNOME?= gnomehack _glib20 -USE_LDCONFIG= yes -CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ - --without-python -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} - -CONFLICTS= fam-[0-9]* - -GNU_CONFIGURE= yes - -.if !defined(GAMIN_SLAVE) -OPTIONS= GAM_POLLER "Use gamin's poller instead of kqueue's" off -.endif - -.include <bsd.port.pre.mk> - -.if !defined(GAMIN_SLAVE) -.if defined(WITH_GAM_POLLER) -CPPFLAGS+= -DUSE_GAMIN_POLLER=1 -.endif -.endif - -post-patch: - @${REINPLACE_CMD} "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/server/gam_conf.c - -.if !defined(GAMIN_SLAVE) -regression-test: build - @${ECHO_MSG} "===> Running gamin regression tests" - @(cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} tests) - -post-install: - @${CAT} ${PKGMESSAGE} -.endif - -.include <bsd.port.post.mk> diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo deleted file mode 100644 index 399e96288..000000000 --- a/devel/gamin/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gamin-0.1.10.tar.gz) = b4ec549e57da470c04edd5ec2876a028 -SHA256 (gamin-0.1.10.tar.gz) = 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 -SIZE (gamin-0.1.10.tar.gz) = 653392 diff --git a/devel/gamin/files/patch-libgamin_gam_api.c b/devel/gamin/files/patch-libgamin_gam_api.c deleted file mode 100644 index 7c46e9335..000000000 --- a/devel/gamin/files/patch-libgamin_gam_api.c +++ /dev/null @@ -1,119 +0,0 @@ ---- libgamin/gam_api.c.orig Tue Feb 7 17:49:07 2006 -+++ libgamin/gam_api.c Tue Feb 7 17:49:13 2006 -@@ -14,6 +14,7 @@ - #include <sys/socket.h> - #include <sys/un.h> - #include <sys/uio.h> -+#include <string.h> - #include "fam.h" - #include "gam_protocol.h" - #include "gam_data.h" -@@ -421,10 +422,10 @@ - { - char data[2] = { 0, 0 }; - int written; --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -- struct { -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - struct iovec iov; - struct msghdr msg; -@@ -436,16 +437,16 @@ - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - memset (&cmsg, 0, sizeof (cmsg)); -- cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); - cmsg.hdr.cmsg_level = SOL_SOCKET; - cmsg.hdr.cmsg_type = SCM_CREDS; - #endif - - retry: --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) - written = sendmsg(fd, &msg, 0); - #else - written = write(fd, &data[0], 1); -@@ -647,15 +648,16 @@ - gid_t c_gid; - - #ifdef HAVE_CMSGCRED -- struct { -+ struct cmsgcred *cred; -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - #endif - - s_uid = getuid(); - --#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) -+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__) - /* Set the socket to receive credentials on the next message */ - { - int on = 1; -@@ -676,8 +678,8 @@ - - #ifdef HAVE_CMSGCRED - memset(&cmsg, 0, sizeof(cmsg)); -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof(cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - #endif - - retry: -@@ -694,7 +696,7 @@ - goto failed; - } - #ifdef HAVE_CMSGCRED -- if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) { -+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || cmsg.hdr.cmsg_type != SCM_CREDS) { - GAM_DEBUG(DEBUG_INFO, - "Message from recvmsg() was not SCM_CREDS\n"); - goto failed; -@@ -720,9 +722,10 @@ - goto failed; - } - #elif defined(HAVE_CMSGCRED) -- c_pid = cmsg.cred.cmcred_pid; -- c_uid = cmsg.cred.cmcred_euid; -- c_gid = cmsg.cred.cmcred_groups[0]; -+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ c_pid = cred->cmcred_pid; -+ c_uid = cred->cmcred_euid; -+ c_gid = cred->cmcred_groups[0]; - #else /* !SO_PEERCRED && !HAVE_CMSGCRED */ - GAM_DEBUG(DEBUG_INFO, - "Socket credentials not supported on this OS\n"); -@@ -1283,14 +1286,17 @@ - - // FIXME: drop and reacquire lock while blocked? - gamin_data_lock(conn); -- if (!gamin_data_event_ready(conn)) { -+ while ((ret = gamin_data_event_ready(conn)) == 0) { - if (gamin_read_data(conn, fc->fd, 1) < 0) { - gamin_try_reconnect(conn, fc->fd); - FAMErrno = FAM_CONNECT; - return (-1); - } - } -- ret = gamin_data_read_event(conn, fe); -+ -+ if (ret > 0) -+ ret = gamin_data_read_event(conn, fe); -+ - gamin_data_unlock(conn); - - if (ret < 0) { diff --git a/devel/gamin/files/patch-python_Makefile.in b/devel/gamin/files/patch-python_Makefile.in deleted file mode 100644 index 24bbe73c6..000000000 --- a/devel/gamin/files/patch-python_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- python/Makefile.in.orig 2008-11-26 01:42:29.000000000 -0500 -+++ python/Makefile.in 2008-11-26 01:43:26.000000000 -0500 -@@ -53,7 +53,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. - am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)" - pythonLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(python_LTLIBRARIES) --_gamin_la_DEPENDENCIES = $(top_builddir)/libgamin/libgamin-1.la -+_gamin_la_DEPENDENCIES = -lgamin-1 - am__gamin_la_OBJECTS = gamin.lo - _gamin_la_OBJECTS = $(am__gamin_la_OBJECTS) - _gamin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -228,7 +228,7 @@ INCLUDES = \ - - python_LTLIBRARIES = _gamin.la - _gamin_la_SOURCES = gamin.c --_gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la -+_gamin_la_LIBADD = -lgamin-1 - _gamin_la_LDFLAGS = -module -avoid-version - python_PYTHON = gamin.py - all: all-recursive diff --git a/devel/gamin/files/patch-server_gam_channel.c b/devel/gamin/files/patch-server_gam_channel.c deleted file mode 100644 index 7b5fb8aee..000000000 --- a/devel/gamin/files/patch-server_gam_channel.c +++ /dev/null @@ -1,127 +0,0 @@ ---- server/gam_channel.c.orig Tue Aug 9 12:17:39 2005 -+++ server/gam_channel.c Fri Feb 10 01:22:46 2006 -@@ -7,6 +7,7 @@ - #include <sys/stat.h> - #include <sys/un.h> - #include <sys/uio.h> -+#include <string.h> - #include "gam_error.h" - #include "gam_connection.h" - #include "gam_channel.h" -@@ -30,10 +31,10 @@ gam_client_conn_send_cred(int fd) - { - char data[2] = { 0, 0 }; - int written; --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -- struct { -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - struct iovec iov; - struct msghdr msg; -@@ -45,16 +46,16 @@ gam_client_conn_send_cred(int fd) - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - memset (&cmsg, 0, sizeof (cmsg)); -- cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); - cmsg.hdr.cmsg_level = SOL_SOCKET; - cmsg.hdr.cmsg_type = SCM_CREDS; - #endif - - retry: --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__)) - written = sendmsg(fd, &msg, 0); - #else - written = write(fd, &data[0], 1); -@@ -95,15 +96,16 @@ gam_client_conn_check_cred(GIOChannel * - gid_t c_gid; - - #ifdef HAVE_CMSGCRED -- struct { -+ struct cmsgcred *cred; -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - #endif - - s_uid = getuid(); - --#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) -+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__) - /* Set the socket to receive credentials on the next message */ - { - int on = 1; -@@ -124,8 +126,8 @@ gam_client_conn_check_cred(GIOChannel * - - #ifdef HAVE_CMSGCRED - memset(&cmsg, 0, sizeof(cmsg)); -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof(cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - #endif - - retry: -@@ -142,7 +144,7 @@ gam_client_conn_check_cred(GIOChannel * - goto failed; - } - #ifdef HAVE_CMSGCRED -- if (cmsg.hdr.cmsg_len < sizeof(cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) { -+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || cmsg.hdr.cmsg_type != SCM_CREDS) { - GAM_DEBUG(DEBUG_INFO, - "Message from recvmsg() was not SCM_CREDS\n"); - goto failed; -@@ -168,9 +170,10 @@ gam_client_conn_check_cred(GIOChannel * - goto failed; - } - #elif defined(HAVE_CMSGCRED) -- c_pid = cmsg.cred.cmcred_pid; -- c_uid = cmsg.cred.cmcred_euid; -- c_gid = cmsg.cred.cmcred_groups[0]; -+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ c_pid = cred->cmcred_pid; -+ c_uid = cred->cmcred_euid; -+ c_gid = cred->cmcred_groups[0]; - #else /* !SO_PEERCRED && !HAVE_CMSGCRED */ - GAM_DEBUG(DEBUG_INFO, - "Socket credentials not supported on this OS\n"); -@@ -620,6 +621,7 @@ gam_listen_unix_socket(const char *path) - { - int fd; - struct sockaddr_un addr; -+ struct stat st; - - fd = socket(PF_UNIX, SOCK_STREAM, 0); - if (fd < 0) { -@@ -640,8 +642,18 @@ gam_listen_unix_socket(const char *path) - * some extra protection checks. Also make sure the socket is created - * with restricted mode - */ -- if (!gam_check_secure_path(path)) { -+ if (!gam_check_secure_dir()) { -+ close(fd); - return (-1); -+ } -+ -+ if (stat(path, &st) == 0) { -+ /* bind() will fail if the socket already exists */ -+ if (unlink(path) < 0) { -+ GAM_DEBUG(DEBUG_INFO, "Failed to remove %s\n", path); -+ close(fd); -+ return (-1); -+ } - } - strncpy(&addr.sun_path[0], path, (sizeof(addr) - 4) - 1); - umask(0077); diff --git a/devel/gamin/files/patch-server_gam_fs.c b/devel/gamin/files/patch-server_gam_fs.c deleted file mode 100644 index 2fcc24209..000000000 --- a/devel/gamin/files/patch-server_gam_fs.c +++ /dev/null @@ -1,161 +0,0 @@ ---- server/gam_fs.c.orig 2007-07-04 09:36:49.000000000 -0400 -+++ server/gam_fs.c 2007-08-10 15:05:41.000000000 -0400 -@@ -7,6 +7,11 @@ - #include <string.h> - #include <errno.h> - #include <glib.h> -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#include <sys/ucred.h> -+#include <sys/mount.h> -+#endif - #include "gam_error.h" - #include "gam_fs.h" - -@@ -21,9 +26,13 @@ typedef struct _gam_fs_properties { - typedef struct _gam_fs { - char *path; - char *fsname; -+ guint64 flags; - } gam_fs; - - static gboolean initialized = FALSE; -+#ifdef __FreeBSD__ -+static gboolean initializing = FALSE; -+#endif - static GList *filesystems = NULL; - static GList *fs_props = NULL; - static struct stat mtab_sbuf; -@@ -110,6 +119,7 @@ gam_fs_filesystem_sort_cb (gconstpointer - return strlen(fsb->path) - strlen (fsa->path); - } - -+#ifdef __linux__ - static void - gam_fs_scan_mtab (void) - { -@@ -165,10 +175,41 @@ gam_fs_scan_mtab (void) - gam_fs_free_filesystems (); - filesystems = g_list_sort (new_filesystems, gam_fs_filesystem_sort_cb); - } -+#endif -+ -+#ifdef __FreeBSD__ -+static void -+gam_fs_getmntinfo (void) -+{ -+ struct statfs *stat; -+ GList *new_filesystems = NULL; -+ gam_fs *fs = NULL; -+ int i, n; -+ -+ n = getmntinfo(&stat, MNT_NOWAIT); -+ if (n == -1) -+ return; -+ -+ for (i = 0; i < n; i++) -+ { -+ fs = g_new0 (gam_fs, 1); -+ fs->path = g_strdup (stat[i].f_mntonname); -+ fs->fsname = g_strdup (stat[i].f_fstypename); -+ fs->flags = stat[i].f_flags; -+ -+ new_filesystems = g_list_prepend (new_filesystems, fs); -+ } -+ -+ /* Replace the old file systems list with the new one */ -+ gam_fs_free_filesystems (); -+ filesystems = g_list_sort (new_filesystems, gam_fs_filesystem_sort_cb); -+} -+#endif - - void - gam_fs_init (void) - { -+#if defined(__linux__) - if (initialized == FALSE) - { - initialized = TRUE; -@@ -181,6 +222,7 @@ gam_fs_init (void) - if (stat("/etc/mtab", &mtab_sbuf) != 0) - { - GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n"); -+ return; - } - gam_fs_scan_mtab (); - } else { -@@ -189,6 +231,7 @@ gam_fs_init (void) - if (stat("/etc/mtab", &sbuf) != 0) - { - GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n"); -+ return; - } - - /* /etc/mtab has changed */ -@@ -199,6 +242,54 @@ gam_fs_init (void) - - mtab_sbuf = sbuf; - } -+#elif defined(__FreeBSD__) -+ if (initialized == FALSE && initializing == FALSE) -+ { -+ GList *iterator = NULL; -+ GHashTable *fs_hash = NULL; -+ gam_fs *fs = NULL; -+ -+ initialized = TRUE; -+ initializing = TRUE; -+ -+ gam_fs_getmntinfo (); -+ -+ iterator = filesystems; -+ fs_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); -+ -+ while (iterator) { -+ fs = iterator->data; -+ -+ if (!g_hash_table_lookup (fs_hash, fs->fsname)) { -+ if (fs->flags & MNT_LOCAL) -+ gam_fs_set (fs->fsname, GFS_MT_DEFAULT, 0); -+ else -+ gam_fs_set (fs->fsname, GFS_MT_POLL, 5); -+ -+ g_hash_table_insert (fs_hash, g_strdup (fs->fsname), GINT_TO_POINTER (1)); -+ } -+ -+ iterator = g_list_next (iterator); -+ } -+ -+ g_hash_table_destroy (fs_hash); -+ initializing = FALSE; -+ } else if (initializing == FALSE) { -+ struct stat sbuf; -+ -+ if (stat ("/etc/fstab", &sbuf) != 0) { -+ GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/fstab\n"); -+ return; -+ } -+ -+ if (sbuf.st_mtime != mtab_sbuf.st_mtime) { -+ GAM_DEBUG(DEBUG_INFO, "Updating list of mounted filesystems\n"); -+ gam_fs_getmntinfo (); -+ } -+ -+ mtab_sbuf = sbuf; -+ } -+#endif - } - - gam_fs_mon_type -@@ -210,7 +301,11 @@ gam_fs_get_mon_type (const char *path) - props = gam_fs_find_fs_props (path); - - if (!props) -+#ifdef USE_GAMIN_POLLER -+ return GFS_MT_POLL; -+#else - return GFS_MT_DEFAULT; -+#endif - - return props->mon_type; - } diff --git a/devel/gamin/files/patch-server_gam_kqueue.c b/devel/gamin/files/patch-server_gam_kqueue.c deleted file mode 100644 index df4437e31..000000000 --- a/devel/gamin/files/patch-server_gam_kqueue.c +++ /dev/null @@ -1,129 +0,0 @@ ---- server/gam_kqueue.c.orig 2007-07-04 09:50:41.000000000 -0400 -+++ server/gam_kqueue.c 2007-08-10 15:03:59.000000000 -0400 -@@ -10,9 +10,10 @@ - * FAM should do: we do not call g_dir_open() if the file is a - * symbolic link). - * -- * * kqueue cannot monitor files residing on anything but a UFS -- * file system. If kqueue cannot monitor a file, this backend -- * will poll it periodically. -+ * * While kqueue is no longer tied to the UFS file system, it is -+ * better to not use it for remote file systems (because for -+ * such file systems, only local changes are detected by -+ * the kernel). - * - * * Monitoring a file with kqueue prevents the file system it - * resides on from being unmounted, because kqueue can only -@@ -28,10 +29,9 @@ - * - kqueue needs to be augmented with a filename-based - * monitoring facility; - * -- * - kqueue needs to be moved out the UFS code. -- * - * Copyright (C) 2005 Joe Marcus Clarke <marcus@FreeBSD.org> -- * Copyright (C) 2005 Jean-Yves Lefort <jylefort@FreeBSD.org> -+ * Copyright (C) 2005, 2006 Jean-Yves Lefort <jylefort@FreeBSD.org> -+ * Copyright (C) 2006 Alex Dupre <ale@FreeBSD.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -53,6 +53,9 @@ - #include <fcntl.h> - #include <unistd.h> - #include <sys/param.h> -+#ifndef USE_GAMIN_POLLER -+#include <sys/mount.h> -+#endif - #include <sys/types.h> - #include <sys/sysctl.h> - #include <sys/stat.h> -@@ -326,7 +329,7 @@ gam_kqueue_isdir (const char *pathname, - static gboolean - gam_kqueue_get_uint_sysctl (const char *name, unsigned int *value) - { -- unsigned int value_len = sizeof(*value); -+ size_t value_len = sizeof(*value); - - if (sysctlbyname(name, value, &value_len, (void *)NULL, 0) < 0) - { -@@ -509,6 +512,9 @@ static gboolean - gam_kqueue_monitor_enable_kqueue (Monitor *mon) - { - struct kevent ev[1]; -+#ifndef USE_GAMIN_POLLER -+ struct statfs sb; -+#endif - - if (open_files == max_open_files) - { -@@ -516,26 +522,36 @@ gam_kqueue_monitor_enable_kqueue (Monito - return FALSE; - } - -- mon->fd = open(mon->pathname, O_RDONLY | O_NOFOLLOW); -+ mon->fd = open(mon->pathname, O_RDONLY | O_NONBLOCK | O_NOFOLLOW); - if (mon->fd < 0) - { - GAM_DEBUG(DEBUG_INFO, "cannot open %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno)); - return FALSE; - } - -+#ifndef USE_GAMIN_POLLER -+ if (fstatfs(mon->fd, &sb) == 0 && (sb.f_flags & MNT_LOCAL) == 0) -+ { -+ GAM_DEBUG(DEBUG_INFO, "%s resides on a remote file system, falling back to poll\n", mon->pathname); -+ goto poll; -+ } -+#endif -+ - EV_SET(ev, mon->fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, VN_NOTE_ALL, 0, mon); - if (kevent(kq, ev, G_N_ELEMENTS(ev), NULL, 0, NULL) < 0) - { - GAM_DEBUG(DEBUG_INFO, "cannot enable kqueue notification for %s (%s), falling back to poll\n", mon->pathname, g_strerror(errno)); -- -- close(mon->fd); -- mon->fd = -1; -- -- return FALSE; -+ goto poll; - } - - open_files++; - return TRUE; -+ -+ poll: -+ close(mon->fd); -+ mon->fd = -1; -+ -+ return FALSE; - } - - static void -@@ -840,6 +856,8 @@ gam_kqueue_sub_monitor_emit_event (SubMo - case GAMIN_EVENT_MOVED: - gam_kqueue_sub_monitor_set_missing(smon); - break; -+ default: -+ break; - } - - gam_server_emit_event(mon->pathname, isdir, event, smon->subs, 1); -@@ -981,6 +999,8 @@ gam_kqueue_file_monitor_emit_event (File - - gam_kqueue_hash_table_remove(fmon->smon->fmons, fmon); - break; -+ default: -+ break; - } - } - -@@ -1167,6 +1187,9 @@ gam_kqueue_init (void) - channel = g_io_channel_unix_new(kq); - g_io_add_watch(channel, G_IO_IN, gam_kqueue_kevent_cb, NULL); - -+#ifdef USE_GAMIN_POLLER -+ gam_poll_basic_init (); -+#endif - - gam_server_install_kernel_hooks(GAMIN_K_KQUEUE, - gam_kqueue_add_subscription, diff --git a/devel/gamin/files/patch-server_gam_node.c b/devel/gamin/files/patch-server_gam_node.c deleted file mode 100644 index dbf7f638b..000000000 --- a/devel/gamin/files/patch-server_gam_node.c +++ /dev/null @@ -1,10 +0,0 @@ ---- server/gam_node.c.orig Thu Feb 9 01:22:56 2006 -+++ server/gam_node.c Thu Feb 9 01:23:03 2006 -@@ -23,6 +23,7 @@ - #include "gam_event.h" - #include "gam_node.h" - #include "gam_error.h" -+#include "gam_server.h" - - /** - * Create a new node diff --git a/devel/gamin/files/patch-server_gam_poll_basic.c b/devel/gamin/files/patch-server_gam_poll_basic.c deleted file mode 100644 index 9a0333149..000000000 --- a/devel/gamin/files/patch-server_gam_poll_basic.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server/gam_poll_basic.c.orig 2007-08-10 15:12:29.000000000 -0400 -+++ server/gam_poll_basic.c 2007-08-10 15:16:07.000000000 -0400 -@@ -345,7 +345,7 @@ gam_poll_basic_poll_file(GamNode * node) - #ifdef ST_MTIM_NSEC - GAM_DEBUG(DEBUG_INFO, "%d %d : %d %d\n", node->sbuf.st_mtim.tv_sec, node->sbuf.st_mtim.tv_nsec, sbuf.st_mtim.tv_sec, sbuf.st_mtim.tv_nsec); - #else -- GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtim.tv_nsec); -+ GAM_DEBUG(DEBUG_INFO, "%d : %d\n", node->sbuf.st_mtime, sbuf.st_mtime); - #endif /* ST_MTIM_NSEC */ - #endif /* VERBOSE_POLL */ - } diff --git a/devel/gamin/files/patch-server_gam_server.c b/devel/gamin/files/patch-server_gam_server.c deleted file mode 100644 index 282dc28f0..000000000 --- a/devel/gamin/files/patch-server_gam_server.c +++ /dev/null @@ -1,20 +0,0 @@ ---- server/gam_server.c.orig 2007-07-04 09:36:49.000000000 -0400 -+++ server/gam_server.c 2007-08-10 15:09:14.000000000 -0400 -@@ -32,7 +32,7 @@ - #include "gam_server.h" - #include "gam_channel.h" - #include "gam_subscription.h" --#include "gam_poll_generic.h" -+#include "gam_poll_basic.h" - #ifdef ENABLE_INOTIFY - #include "gam_inotify.h" - #endif -@@ -438,7 +438,7 @@ gam_server_get_kernel_handler (void) - GamPollHandler - gam_server_get_poll_handler (void) - { -- return __gam_kernel_handler; -+ return __gam_poll_handler; - } - - gboolean diff --git a/devel/gamin/files/patch-tests_testing.c b/devel/gamin/files/patch-tests_testing.c deleted file mode 100644 index 35097790d..000000000 --- a/devel/gamin/files/patch-tests_testing.c +++ /dev/null @@ -1,27 +0,0 @@ ---- tests/testing.c.orig Thu Oct 27 10:51:03 2005 -+++ tests/testing.c Tue Feb 14 17:46:01 2006 -@@ -376,11 +376,11 @@ processCommand(char *line, int no) - } - printf("chmod %s to %s\n", arg, arg2); - } else if (!strcmp(command, "chown")) { -+ struct stat sb; - if (args != 3) { - fprintf(stderr, "chown line %d: lacks path and owner\n", no); - return (-1); - } -- struct stat sb; - if (!lstat (arg, &sb)) { - ret = (S_ISLNK (sb.st_mode)) ? - lchown(arg, strtol(arg2, NULL, 10), -1) : -@@ -486,9 +486,9 @@ processCommand(char *line, int no) - return (-1); - } - /* -- * wait at most 3 secs before declaring failure -+ * wait at most 7 secs before declaring failure - */ -- while ((delay < 30) && (testState.nb_events < nb_events + count)) { -+ while ((delay < 70) && (testState.nb_events < nb_events + count)) { - debugLoop(100); - - /* printf("+"); fflush(stdout); */ diff --git a/devel/gamin/pkg-descr b/devel/gamin/pkg-descr deleted file mode 100644 index 7bac17f94..000000000 --- a/devel/gamin/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Gamin is a file and directory monitoring system defined to be a subset of the -FAM (File Alteration Monitor) system. This is a service provided by a library -which allows to detect when a file or a directory has been modified. - -Whereas the FreeBSD port of FAM polls files every few seconds, this port -includes a kqueue(2) backend for immediate notification of most alterations. - -WWW: http://www.gnome.org/~veillard/gamin/index.html diff --git a/devel/gamin/pkg-message b/devel/gamin/pkg-message deleted file mode 100644 index 1e1ea39bb..000000000 --- a/devel/gamin/pkg-message +++ /dev/null @@ -1,16 +0,0 @@ -=============================================================================== - -Gamin will only provide realtime notification of changes for at most n files, -where n is the minimum value between (kern.maxfiles * 0.7) and -(kern.maxfilesperproc - 200). Beyond that limit, files will be polled. - -If you often open several large folders with Nautilus, you might want to -increase the kern.maxfiles tunable (you do not need to set -kern.maxfilesperproc, since it is computed at boot time from kern.maxfiles). - -For a typical desktop, add the following line to /boot/loader.conf, then -reboot the system: - - kern.maxfiles="25000" - -=============================================================================== diff --git a/devel/gamin/pkg-plist b/devel/gamin/pkg-plist deleted file mode 100644 index 008f29b34..000000000 --- a/devel/gamin/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -include/fam.h -lib/libfam.a -lib/libfam.la -lib/libfam.so -lib/libfam.so.0 -lib/libgamin-1.a -lib/libgamin-1.la -lib/libgamin-1.so -lib/libgamin-1.so.1 -lib/libgamin_shared.a -libdata/pkgconfig/gamin.pc -libexec/gam_server diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile deleted file mode 100644 index 1aebc9089..000000000 --- a/devel/gconf2/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# New ports collection makefile for: gconf2 -# Date created: 28th June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.101 2008/08/19 12:35:57 kwm Exp $ -# - -PORTNAME= gconf2 -PORTVERSION= 2.24.0 -PORTREVISION?= 0 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= GConf-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A configuration database system for GNOME - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit.2:${PORTSDIR}/sysutils/policykit - -USE_GMAKE= yes -USE_GETTEXT= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ - referencehack intlhack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc -# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -MAN1= gconftool-2.1 - -.include <bsd.port.pre.mk> - -.if defined(WITH_LDAP) || exists(${LOCALBASE}/include/ldap.h) -USE_OPENLDAP= yes - -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif - -pre-everything:: -.if !defined(WITH_LDAP) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable ldap support by defining" - @${ECHO_MSG} "WITH_LDAP" - @${ECHO_MSG} -.endif - -.include <bsd.port.post.mk> - -.endif diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo deleted file mode 100644 index f3cebd9ee..000000000 --- a/devel/gconf2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/GConf-2.24.0.tar.bz2) = 4971d96f5ba94fe4a69396267bd5afe8 -SHA256 (gnome2/GConf-2.24.0.tar.bz2) = 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b -SIZE (gnome2/GConf-2.24.0.tar.bz2) = 1467817 diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab deleted file mode 100644 index 6f25900e7..000000000 --- a/devel/gconf2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Aug 4 22:38:39 2002 -+++ Makefile.in Sun Aug 4 22:39:52 2002 -@@ -35,7 +35,7 @@ - DESTDIR = - - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/pkgconfig - pkgincludedir = $(includedir)/@PACKAGE@ - - top_builddir = . diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c deleted file mode 100644 index 31a6470a4..000000000 --- a/devel/gconf2/files/patch-gconf_gconfd.c +++ /dev/null @@ -1,62 +0,0 @@ ---- gconf/gconfd.c.orig 2008-05-10 08:34:31.000000000 -0400 -+++ gconf/gconfd.c 2008-08-16 14:08:05.000000000 -0400 -@@ -123,12 +123,6 @@ static void gconf_handle_segv (int signu - - static gboolean in_shutdown = FALSE; - --/* -- * Flag indicating we received a SIGHUP and we should reaload -- * all sources during the next periodic_cleanup() -- */ --static gboolean need_db_reload = FALSE; -- - /* - * CORBA goo - */ -@@ -408,6 +402,18 @@ gconf_server_load_sources(void) - } - } - -+static void -+reload_db (void) -+{ -+ gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); -+ -+ logfile_save (); -+ shutdown_databases (); -+ init_databases (); -+ gconf_server_load_sources (); -+ logfile_read (); -+} -+ - /* - * Signal handlers should not log debug messages as this code is non-reentrant. - * Please avoid calling gconf_log in this function. -@@ -471,8 +477,7 @@ signal_handler (int signo) - case SIGHUP: - --in_fatal; - -- /* reload sources during next periodic_cleanup() */ -- need_db_reload = TRUE; -+ reload_db (); - break; - #endif - -@@ -828,17 +833,6 @@ static gboolean need_log_cleanup = FALSE - static gboolean - periodic_cleanup_timeout(gpointer data) - { -- if (need_db_reload) -- { -- gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); -- -- need_db_reload = FALSE; -- logfile_save (); -- shutdown_databases (); -- init_databases (); -- gconf_server_load_sources (); -- logfile_read (); -- } - - gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); - diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c deleted file mode 100644 index f3c3d2fb0..000000000 --- a/devel/gconf2/files/patch-gconf_gconftool.c +++ /dev/null @@ -1,16 +0,0 @@ ---- gconf/gconftool.c.orig Fri Mar 2 17:10:13 2007 -+++ gconf/gconftool.c Tue Mar 6 12:01:04 2007 -@@ -3781,6 +3781,13 @@ do_makefile_install(GConfEngine* conf, c - } - - retval |= do_sync (conf); -+ -+ /* -+ * Send all the gconfd-2 processes a SIGHUP so that they reload the -+ * databases and pick up the added/removed schemas. -+ */ -+ system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1"); -+ - return retval; - } - diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr deleted file mode 100644 index 010cc810e..000000000 --- a/devel/gconf2/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -GConf extends the concept of a configuration registry. It provides -a simple way for applications and administrators to store data; -often GConf is used to store preferences for applications. - -Some of the features of GConf are: -GConf provides: - - * Documentation for each configuration key, so that administrators - can better modify the value. - - * Notifications to interested applications when configuration data - is changed. The notification service works across networks, - affecting all login sessions for a single user. - - * Proper locking so that configuration data doesn't get corrupted - when accessed by multiple applications at the same time. - -WWW: http://www.gnome.org/projects/gconf/ diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist deleted file mode 100644 index 85be04736..000000000 --- a/devel/gconf2/pkg-plist +++ /dev/null @@ -1,153 +0,0 @@ -bin/gconf-merge-tree -bin/gconftool-2 -etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf -%%LDAP%%etc/gconf/2/evoldap.conf -etc/gconf/2/path -include/gconf/2/gconf/gconf-changeset.h -include/gconf/2/gconf/gconf-client.h -include/gconf/2/gconf/gconf-engine.h -include/gconf/2/gconf/gconf-enum-types.h -include/gconf/2/gconf/gconf-error.h -include/gconf/2/gconf/gconf-listeners.h -include/gconf/2/gconf/gconf-schema.h -include/gconf/2/gconf/gconf-value.h -include/gconf/2/gconf/gconf.h -libexec/gconf-defaults-mechanism -%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.a -%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.la -%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so -lib/GConf/2/libgconfbackend-oldxml.a -lib/GConf/2/libgconfbackend-oldxml.la -lib/GConf/2/libgconfbackend-oldxml.so -lib/GConf/2/libgconfbackend-xml.a -lib/GConf/2/libgconfbackend-xml.la -lib/GConf/2/libgconfbackend-xml.so -lib/libgconf-2.a -lib/libgconf-2.la -lib/libgconf-2.so -lib/libgconf-2.so.4 -libdata/pkgconfig/gconf-2.0.pc -libexec/gconf-sanity-check-2 -libexec/gconfd-2 -%%LDAP%%share/GConf/schema/evoldap.schema -share/aclocal/gconf-2.m4 -share/PolicyKit/policy/org.gnome.gconf.defaults.policy -share/dbus-1/system-services/org.gnome.GConf.Defaults.service -share/dbus-1/services/org.gnome.GConf.service -share/locale/am/LC_MESSAGES/GConf2.mo -share/locale/ar/LC_MESSAGES/GConf2.mo -share/locale/as/LC_MESSAGES/GConf2.mo -share/locale/az/LC_MESSAGES/GConf2.mo -share/locale/be/LC_MESSAGES/GConf2.mo -share/locale/bg/LC_MESSAGES/GConf2.mo -share/locale/bn/LC_MESSAGES/GConf2.mo -share/locale/bn_IN/LC_MESSAGES/GConf2.mo -share/locale/bs/LC_MESSAGES/GConf2.mo -share/locale/ca/LC_MESSAGES/GConf2.mo -share/locale/cs/LC_MESSAGES/GConf2.mo -share/locale/cy/LC_MESSAGES/GConf2.mo -share/locale/da/LC_MESSAGES/GConf2.mo -share/locale/de/LC_MESSAGES/GConf2.mo -share/locale/dz/LC_MESSAGES/GConf2.mo -share/locale/el/LC_MESSAGES/GConf2.mo -share/locale/en_CA/LC_MESSAGES/GConf2.mo -share/locale/en_GB/LC_MESSAGES/GConf2.mo -share/locale/es/LC_MESSAGES/GConf2.mo -share/locale/et/LC_MESSAGES/GConf2.mo -share/locale/eu/LC_MESSAGES/GConf2.mo -share/locale/fa/LC_MESSAGES/GConf2.mo -share/locale/fi/LC_MESSAGES/GConf2.mo -share/locale/fr/LC_MESSAGES/GConf2.mo -share/locale/ga/LC_MESSAGES/GConf2.mo -share/locale/gl/LC_MESSAGES/GConf2.mo -share/locale/gu/LC_MESSAGES/GConf2.mo -share/locale/he/LC_MESSAGES/GConf2.mo -share/locale/hi/LC_MESSAGES/GConf2.mo -share/locale/hr/LC_MESSAGES/GConf2.mo -share/locale/hu/LC_MESSAGES/GConf2.mo -share/locale/id/LC_MESSAGES/GConf2.mo -share/locale/is/LC_MESSAGES/GConf2.mo -share/locale/it/LC_MESSAGES/GConf2.mo -share/locale/ja/LC_MESSAGES/GConf2.mo -share/locale/ka/LC_MESSAGES/GConf2.mo -share/locale/kn/LC_MESSAGES/GConf2.mo -share/locale/ko/LC_MESSAGES/GConf2.mo -share/locale/ku/LC_MESSAGES/GConf2.mo -share/locale/lt/LC_MESSAGES/GConf2.mo -share/locale/lv/LC_MESSAGES/GConf2.mo -share/locale/mai/LC_MESSAGES/GConf2.mo -share/locale/mg/LC_MESSAGES/GConf2.mo -share/locale/mk/LC_MESSAGES/GConf2.mo -share/locale/ml/LC_MESSAGES/GConf2.mo -share/locale/mn/LC_MESSAGES/GConf2.mo -share/locale/mr/LC_MESSAGES/GConf2.mo -share/locale/ms/LC_MESSAGES/GConf2.mo -share/locale/nb/LC_MESSAGES/GConf2.mo -share/locale/ne/LC_MESSAGES/GConf2.mo -share/locale/nl/LC_MESSAGES/GConf2.mo -share/locale/nn/LC_MESSAGES/GConf2.mo -share/locale/oc/LC_MESSAGES/GConf2.mo -share/locale/or/LC_MESSAGES/GConf2.mo -share/locale/pa/LC_MESSAGES/GConf2.mo -share/locale/pl/LC_MESSAGES/GConf2.mo -share/locale/pt/LC_MESSAGES/GConf2.mo -share/locale/pt_BR/LC_MESSAGES/GConf2.mo -share/locale/ro/LC_MESSAGES/GConf2.mo -share/locale/ru/LC_MESSAGES/GConf2.mo -share/locale/rw/LC_MESSAGES/GConf2.mo -share/locale/si/LC_MESSAGES/GConf2.mo -share/locale/sk/LC_MESSAGES/GConf2.mo -share/locale/sl/LC_MESSAGES/GConf2.mo -share/locale/sq/LC_MESSAGES/GConf2.mo -share/locale/sr/LC_MESSAGES/GConf2.mo -share/locale/sr@latin/LC_MESSAGES/GConf2.mo -share/locale/sv/LC_MESSAGES/GConf2.mo -share/locale/ta/LC_MESSAGES/GConf2.mo -share/locale/te/LC_MESSAGES/GConf2.mo -share/locale/th/LC_MESSAGES/GConf2.mo -share/locale/tr/LC_MESSAGES/GConf2.mo -share/locale/uk/LC_MESSAGES/GConf2.mo -share/locale/vi/LC_MESSAGES/GConf2.mo -share/locale/xh/LC_MESSAGES/GConf2.mo -share/locale/yi/LC_MESSAGES/GConf2.mo -share/locale/zh_CN/LC_MESSAGES/GConf2.mo -share/locale/zh_HK/LC_MESSAGES/GConf2.mo -share/locale/zh_TW/LC_MESSAGES/GConf2.mo -share/sgml/gconf/gconf-1.0.dtd -@dirrm share/sgml/gconf -%%LDAP%%@dirrm share/GConf/schema -%%LDAP%%@dirrm share/GConf -@dirrm lib/GConf/2 -@dirrm include/gconf/2/gconf -@dirrm include/gconf/2 -@dirrm etc/gconf/2 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile deleted file mode 100644 index 8ef578e17..000000000 --- a/devel/gconfmm26/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# New ports collection makefile for: gconfmm -# Date created: 22 May 2003 -# Whom: Alexander Nedotsukov <bland@mail.ru> -# -# $FreeBSD$ -# $MCom: ports/devel/gconfmm26/Makefile,v 1.22 2008/09/10 17:41:16 marcus Exp $ -# - -PORTNAME= gconfmm -PORTVERSION= 2.24.0 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= bland@FreeBSD.org -COMMENT= C++ wrapper for gconf2 API library - -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ - ${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24 - -LATEST_LINK= gconfmm26 - -USE_BZIP2= yes -USE_XORG= x11 -USE_GMAKE= yes -USE_GNOME= gnomehack gconf2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-static - -PLIST_SUB= VERSION="2.6" API_VERSION="2.6" - -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \ - ${WRKSRC}/tools/extra_defs_gen/Makefile.in - -.include <bsd.port.mk> diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo deleted file mode 100644 index 20aa775d8..000000000 --- a/devel/gconfmm26/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gconfmm-2.24.0.tar.bz2) = cd2c3c919dbf8f90f703680d2fa088b2 -SHA256 (gnome2/gconfmm-2.24.0.tar.bz2) = d801f3422411269b4234e97589d8c90a2495336320e608c5aab4a277c0010baa -SIZE (gnome2/gconfmm-2.24.0.tar.bz2) = 298222 diff --git a/devel/gconfmm26/pkg-descr b/devel/gconfmm26/pkg-descr deleted file mode 100644 index d161fcbb7..000000000 --- a/devel/gconfmm26/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a set of thin C++ wrappers for GConf v2 API library. - -WWW: http://gtkmm.sourceforge.net/ diff --git a/devel/gconfmm26/pkg-plist b/devel/gconfmm26/pkg-plist deleted file mode 100644 index b9959427d..000000000 --- a/devel/gconfmm26/pkg-plist +++ /dev/null @@ -1,31 +0,0 @@ -include/gconfmm-%%API_VERSION%%/gconfmm.h -include/gconfmm-%%API_VERSION%%/gconfmm/callback.h -include/gconfmm-%%API_VERSION%%/gconfmm/changeset.h -include/gconfmm-%%API_VERSION%%/gconfmm/client.h -include/gconfmm-%%API_VERSION%%/gconfmm/entry.h -include/gconfmm-%%API_VERSION%%/gconfmm/init.h -include/gconfmm-%%API_VERSION%%/gconfmm/private/changeset_p.h -include/gconfmm-%%API_VERSION%%/gconfmm/private/client_p.h -include/gconfmm-%%API_VERSION%%/gconfmm/private/entry_p.h -include/gconfmm-%%API_VERSION%%/gconfmm/private/schema_p.h -include/gconfmm-%%API_VERSION%%/gconfmm/private/value_p.h -include/gconfmm-%%API_VERSION%%/gconfmm/schema.h -include/gconfmm-%%API_VERSION%%/gconfmm/setinterface.h -include/gconfmm-%%API_VERSION%%/gconfmm/value.h -include/gconfmm-%%API_VERSION%%/gconfmm/value_listhelpers.h -include/gconfmm-%%API_VERSION%%/gconfmm/wrap_init.h -lib/gconfmm-%%API_VERSION%%/include/gconfmmconfig.h -lib/gconfmm-%%API_VERSION%%/proc/m4/convert.m4 -lib/gconfmm-%%API_VERSION%%/proc/m4/convert_gconfmm.m4 -lib/libgconfmm-%%VERSION%%.a -lib/libgconfmm-%%VERSION%%.la -lib/libgconfmm-%%VERSION%%.so -lib/libgconfmm-%%VERSION%%.so.1 -libdata/pkgconfig/gconfmm-%%API_VERSION%%.pc -@dirrm lib/gconfmm-%%API_VERSION%%/proc/m4 -@dirrm lib/gconfmm-%%API_VERSION%%/proc -@dirrm lib/gconfmm-%%API_VERSION%%/include -@dirrm lib/gconfmm-%%API_VERSION%% -@dirrm include/gconfmm-%%API_VERSION%%/gconfmm/private -@dirrm include/gconfmm-%%API_VERSION%%/gconfmm -@dirrm include/gconfmm-%%API_VERSION%% diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile deleted file mode 100644 index 0a027d514..000000000 --- a/devel/gio-fam-backend/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: gio-fam-backend -# Date Created: 22 December 2007 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.23 2008/11/24 20:03:49 mezz Exp $ -# - -PORTNAME= gio-fam-backend -PORTVERSION= 2.18.4 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ - ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= glib-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= FAM backend for GLib's GIO library - -USE_BZIP2= yes -BUILD_WRKSRC= ${WRKSRC}/gio/fam -INSTALL_WRKSRC= ${BUILD_WRKSRC} -GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig _glib20 -USE_FAM= yes -USE_GMAKE= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -.include <bsd.port.mk> diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo deleted file mode 100644 index d16c3b42f..000000000 --- a/devel/gio-fam-backend/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf -SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 -SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in deleted file mode 100644 index 0f6a9e25e..000000000 --- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- gio/fam/Makefile.in.orig 2008-01-07 19:40:38.000000000 -0500 -+++ gio/fam/Makefile.in 2008-01-07 19:41:53.000000000 -0500 -@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule - giomoduleLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(giomodule_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ -- $(top_builddir)/gobject/libgobject-2.0.la \ -- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ -+libgiofam_la_DEPENDENCIES = \ -+ $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - am__objects_1 = - am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ -@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \ - - libgiofam_la_LDFLAGS = $(module_flags) - libgiofam_la_LIBADD = \ -- $(top_builddir)/gio/libgio-2.0.la \ -- $(top_builddir)/gobject/libgobject-2.0.la \ -- $(top_builddir)/glib/libglib-2.0.la \ -+ -lgio-2.0 \ -+ -lgobject-2.0 \ -+ -lglib-2.0 \ - $(GLIB_LIBS) \ - $(FAM_LIBS) \ - $(NULL) diff --git a/devel/gio-fam-backend/pkg-descr b/devel/gio-fam-backend/pkg-descr deleted file mode 100644 index b44b5d557..000000000 --- a/devel/gio-fam-backend/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -gio-fam-backend provides a file Alteration Monitor (FAM) backend module for -GLib's GIO subsystem. diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist deleted file mode 100644 index 7e06d5a98..000000000 --- a/devel/gio-fam-backend/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/gio/modules/libgiofam.a -lib/gio/modules/libgiofam.la -lib/gio/modules/libgiofam.so diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile deleted file mode 100644 index ada2f0ac4..000000000 --- a/devel/glib20/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# New ports collection makefile for: glib13 -# Date Created: 28 July 1998 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.136 2008/11/25 18:53:17 marcus Exp $ -# -# !! DON'T FORGET ABOUT devel/gio-fam-backend !! - -PORTNAME= glib -PORTVERSION= 2.18.4 -PORTREVISION?= 0 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ - ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Some useful routines of C programming (current stable version) - -LATEST_LINK= glib20 - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre - -USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig ltverhack -USE_GMAKE= yes -USE_PYTHON= yes -USE_PERL5= yes -CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ - --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ - --disable-man --without-xml-catalog \ - --with-pcre=system \ - --disable-fam -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -OPTIONS= COLLATION_FIX "fix string collation" off - -.include <bsd.port.pre.mk> - -# Let glib use asm code for implementing atomic ops on i386 and amd64. -.if ${ARCH} == "i386" -GLIB_ARCH= i486 -.elif ${ARCH} == "amd64" -GLIB_ARCH= x86_64 -.else -GLIB_ARCH= ${ARCH} -.endif -CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL} - -.if defined(WITH_COLLATION_FIX) -LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ - ${FILESDIR}/extra-patch-glib_gunicollate.c -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/glib/gutils.c - -.include <bsd.port.post.mk> - -.endif diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo deleted file mode 100644 index d16c3b42f..000000000 --- a/devel/glib20/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf -SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 -SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in deleted file mode 100644 index 4791780e2..000000000 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500 -+++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500 -@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -licui18n - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c deleted file mode 100644 index dfcb99209..000000000 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ /dev/null @@ -1,116 +0,0 @@ ---- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006 -+++ glib/gunicollate.c Thu Oct 19 20:12:50 2006 -@@ -26,10 +26,57 @@ - #include <wchar.h> - #endif - -+#include <unicode/umachine.h> -+#include <unicode/ustring.h> -+#include <unicode/ucol.h> -+ - #include "glib.h" - #include "gunicodeprivate.h" - #include "galias.h" - -+static gboolean icu_collator_initialized = FALSE; -+static UCollator *icu_collator = NULL; -+G_LOCK_DEFINE_STATIC(icu_collator); -+ -+static void -+init_icu_collator (void) -+{ -+ G_LOCK(icu_collator); -+ if (! icu_collator_initialized) -+ { -+ UErrorCode error = U_ZERO_ERROR; -+ -+ icu_collator = ucol_open(NULL, &error); -+ if (icu_collator == NULL) -+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error)); -+ -+ icu_collator_initialized = TRUE; -+ } -+ G_UNLOCK(icu_collator); -+} -+ -+static UChar * -+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len) -+{ -+ UErrorCode error = U_ZERO_ERROR; -+ UChar *result = NULL; -+ -+ u_strFromUTF8(NULL, 0, result_len, str, len, &error); -+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR) -+ { -+ error = U_ZERO_ERROR; -+ result = g_new(UChar, *result_len); -+ u_strFromUTF8(result, *result_len, NULL, str, len, &error); -+ if (error > U_ZERO_ERROR) -+ { -+ g_free(result); -+ result = NULL; -+ } -+ } -+ -+ return result; -+} -+ - #ifdef _MSC_VER - /* Workaround for bug in MSVCR80.DLL */ - static size_t -@@ -94,6 +141,28 @@ - g_return_val_if_fail (str1 != NULL, 0); - g_return_val_if_fail (str2 != NULL, 0); - -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr1_len; -+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len); -+ if (wstr1 != NULL) -+ { -+ int32_t wstr2_len; -+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len); -+ if (wstr2 != NULL) -+ { -+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len); -+ -+ g_free(wstr1); -+ g_free(wstr2); -+ -+ return result; -+ } -+ g_free(wstr1); -+ } -+ } -+ - str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); - str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); - -@@ -235,6 +304,26 @@ - gchar *str_norm; - - g_return_val_if_fail (str != NULL, NULL); -+ -+ init_icu_collator(); -+ if (icu_collator != NULL) -+ { -+ int32_t wstr_len; -+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len); -+ if (wstr != NULL) -+ { -+ int32_t result_len; -+ -+ /* get size of result */ -+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0); -+ -+ result = g_new(char, result_len); -+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len); -+ g_free(wstr); -+ -+ return result; -+ } -+ } - - str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); - diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae deleted file mode 100644 index 0345b8acd..000000000 --- a/devel/glib20/files/patch-ae +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.orig 2008-11-24 13:44:42.000000000 -0600 -+++ configure 2008-11-24 13:50:51.000000000 -0600 -@@ -29576,6 +29576,12 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+#ifdef HAVE_SYS_MOUNT_H -+#include <sys/mount.h> -+#endif - int - main () - { -@@ -31407,7 +31413,7 @@ - - - --for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid -+for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -36810,6 +36816,8 @@ - ;; - esac - fi -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" -+ G_THREAD_LIBS="${PTHREAD_LIBS}" - - if test x"$G_THREAD_CFLAGS" = x; then - diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag deleted file mode 100644 index 5ee7fe3d5..000000000 --- a/devel/glib20/files/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100 -+++ Makefile.in 2008-02-12 00:16:23.000000000 +0100 -@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo - gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in - TEST_PROGS = - AUTOMAKE_OPTIONS = 1.7 --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs - DIST_SUBDIRS = $(SUBDIRS) build - bin_SCRIPTS = glib-gettextize - AM_CPPFLAGS = \ -@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \ - config.h.win32 \ - gtk-doc.make - --configexecincludedir = $(libdir)/glib-2.0/include -+glibincludedir = $(includedir)/glib-2.0 -+configexecincludedir = $(glibincludedir) - configexecinclude_DATA = glibconfig.h - CONFIGURE_DEPENDENCIES = acglib.m4 - BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah deleted file mode 100644 index 3784d16b8..000000000 --- a/devel/glib20/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/reference/Makefile.in.orig 2007-12-21 16:54:10.000000000 -0500 -+++ docs/reference/Makefile.in 2007-12-21 16:54:40.000000000 -0500 -@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt - # initialize variables for unconditional += appending - EXTRA_DIST = - TEST_PROGS = --SUBDIRS = glib gobject gio -+SUBDIRS = #glib gobject gio - all: all-recursive - - .SUFFIXES: diff --git a/devel/glib20/files/patch-config.h.in b/devel/glib20/files/patch-config.h.in deleted file mode 100644 index 3c2bc5d26..000000000 --- a/devel/glib20/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2008-03-18 18:24:24.000000000 -0400 -+++ config.h.in 2008-03-18 18:24:59.000000000 -0400 -@@ -197,6 +197,9 @@ - /* Define to 1 if you have the `getpwuid' function. */ - #undef HAVE_GETPWUID - -+/* Define to 1 if you have the `sysctlbyname' function. */ -+#undef HAVE_SYSCTLBYNAME -+ - /* Define if the GNU gettext() function is already present or preinstalled. */ - #undef HAVE_GETTEXT - diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c deleted file mode 100644 index b9bfe143e..000000000 --- a/devel/glib20/files/patch-gio_gunixmount.c +++ /dev/null @@ -1,21 +0,0 @@ ---- gio/gunixmount.c.orig 2007-12-23 15:53:50.000000000 -0500 -+++ gio/gunixmount.c 2007-12-23 15:52:52.000000000 -0500 -@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount * - gpointer user_data) - { - GUnixMount *unix_mount = G_UNIX_MOUNT (mount); -+#ifndef __FreeBSD__ - char *argv[] = {"eject", NULL, NULL}; - - if (unix_mount->mount_path != NULL) - argv[1] = unix_mount->mount_path; - else - argv[1] = unix_mount->device_path; -+#else -+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; -+ -+ argv[2] = unix_mount->device_path; -+#endif - - return eject_unmount_do (mount, cancellable, callback, user_data, argv); - } diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c deleted file mode 100644 index 9b6fa2df3..000000000 --- a/devel/glib20/files/patch-gio_gunixmounts.c +++ /dev/null @@ -1,148 +0,0 @@ ---- ggio/unixmounts.c.orig 2008-03-10 20:31:58.000000000 -0400 -+++ gio/gunixmounts.c 2008-03-19 22:31:23.000000000 -0400 -@@ -128,6 +128,9 @@ struct _GUnixMountMonitor { - - GFileMonitor *fstab_monitor; - GFileMonitor *mtab_monitor; -+ -+ guint mount_poller_source; -+ GList *mount_poller_mounts; - }; - - struct _GUnixMountMonitorClass { -@@ -139,6 +142,8 @@ static GUnixMountMonitor *the_mount_moni - static GList *_g_get_unix_mounts (void); - static GList *_g_get_unix_mount_points (void); - -+static guint64 mount_poller_time = 0; -+ - G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); - - #define MOUNT_POLL_INTERVAL 4000 -@@ -165,6 +170,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix - #endif - - #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) -+#include <sys/param.h> - #include <sys/ucred.h> - #include <sys/mount.h> - #include <fstab.h> -@@ -215,20 +221,28 @@ g_unix_is_mount_path_system_internal (co - "/", /* we already have "Filesystem root" in Nautilus */ - "/bin", - "/boot", -+ "/compat/linux/proc", -+ "/compat/linux/sys", - "/dev", - "/etc", - "/home", - "/lib", - "/lib64", -+ "/libexec", - "/media", - "/mnt", - "/opt", -+ "/rescue", - "/root", - "/sbin", - "/srv", - "/tmp", - "/usr", -+ "/usr/X11R6", - "/usr/local", -+ "/usr/obj", -+ "/usr/ports", -+ "/usr/src", - "/var", - "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */ - "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */ -@@ -988,6 +1002,10 @@ get_mounts_timestamp (void) - if (stat (monitor_file, &buf) == 0) - return (guint64)buf.st_mtime; - } -+ else -+ { -+ return mount_poller_time; -+ } - return 0; - } - -@@ -1129,6 +1147,13 @@ g_unix_mount_monitor_finalize (GObject * - g_object_unref (monitor->mtab_monitor); - } - -+ if (monitor->mount_poller_source > 0) -+ { -+ g_source_remove (monitor->mount_poller_source); -+ g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL); -+ g_list_free (monitor->mount_poller_mounts); -+ } -+ - the_mount_monitor = NULL; - - if (G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize) -@@ -1206,6 +1231,51 @@ mtab_file_changed (GFileMonitor *mo - g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); - } - -+static gboolean -+mount_change_poller (gpointer user_data) -+{ -+ GUnixMountMonitor *mount_monitor; -+ GList *current_mounts; -+ gboolean has_changed = FALSE; -+ -+ mount_monitor = user_data; -+ current_mounts = _g_get_unix_mounts (); -+ -+ if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts)) -+ { -+ g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL); -+ has_changed = TRUE; -+ } -+ else -+ { -+ int i; -+ -+ for (i = 0; i < g_list_length (current_mounts); i++) -+ { -+ GUnixMountEntry *m1; -+ GUnixMountEntry *m2; -+ -+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); -+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); -+ if (! has_changed && g_unix_mount_compare (m1, m2) != 0) -+ has_changed = TRUE; -+ -+ g_unix_mount_free (m2); -+ } -+ } -+ -+ g_list_free (mount_monitor->mount_poller_mounts); -+ mount_monitor->mount_poller_mounts = current_mounts; -+ -+ if (has_changed) -+ { -+ mount_poller_time = (guint64)time (NULL); -+ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); -+ } -+ -+ return TRUE; -+} -+ - static void - g_unix_mount_monitor_init (GUnixMountMonitor *monitor) - { -@@ -1228,6 +1298,12 @@ g_unix_mount_monitor_init (GUnixMountMon - - g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); - } -+ else -+ { -+ monitor->mount_poller_mounts = _g_get_unix_mounts (); -+ mount_poller_time = (guint64)time (NULL); -+ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor); -+ } - } - - /** diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c deleted file mode 100644 index 377a7d6b5..000000000 --- a/devel/glib20/files/patch-gio_gunixvolume.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500 -+++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500 -@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume, - gpointer user_data) - { - GUnixVolume *unix_volume = G_UNIX_VOLUME (volume); -+#ifdef __FreeBSD__ -+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; -+ argv[2] = unix_volume->device_path; -+#else - char *argv[] = {"eject", NULL, NULL}; -- - argv[1] = unix_volume->device_path; -+#endif - - eject_mount_do (volume, cancellable, callback, user_data, argv); - } diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmime.c b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c deleted file mode 100644 index 8c36dc5d8..000000000 --- a/devel/glib20/files/patch-gio_xdgmime_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 -+++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 -@@ -204,7 +204,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/"; - - ptr = xdg_data_dirs; - diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h deleted file mode 100644 index 039571d8b..000000000 --- a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 -+++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 -@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) - #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) - #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) -+#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) - #endif - - extern XdgMimeCache **_caches; diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in deleted file mode 100644 index 352c0cf60..000000000 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200 -+++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200 -@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a - codeset.m4 update.sh make-patch.sh libcharset-glib.patch - TEST_PROGS = - INCLUDES = \ -- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir) -+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir) - - noinst_LTLIBRARIES = libcharset.la - libcharset_la_SOURCES = \ -@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \ - localcharset.h \ - localcharset.c - --charset_alias = $(DESTDIR)$(libdir)/charset.alias --charset_tmp = $(DESTDIR)$(libdir)/charset.tmp -+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias -+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp - SUFFIXES = .sed .sin - CLEANFILES = charset.alias ref-add.sed ref-del.sed - all: all-am -@@ -498,7 +498,7 @@ install-data-am: - - install-dvi: install-dvi-am - --install-exec-am: install-exec-local -+install-exec-am: # install-exec-local - - install-html: install-html-am - diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c deleted file mode 100644 index ef7f0a87b..000000000 --- a/devel/glib20/files/patch-glib_gregex.c +++ /dev/null @@ -1,13 +0,0 @@ ---- glib/gregex.c.orig 2007-09-09 18:35:32.000000000 -0400 -+++ glib/gregex.c 2007-09-09 18:36:05.000000000 -0400 -@@ -164,8 +164,10 @@ match_error (gint errcode) - case PCRE_ERROR_DFA_RECURSE: - case PCRE_ERROR_RECURSIONLIMIT: - return _("recursion limit reached"); -+#ifdef PCRE_ERROR_NULLWSLIMIT - case PCRE_ERROR_NULLWSLIMIT: - return _("workspace limit for empty substrings reached"); -+#endif - case PCRE_ERROR_BADNEWLINE: - return _("invalid combination of newline flags"); - default: diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c deleted file mode 100644 index 95a02e475..000000000 --- a/devel/glib20/files/patch-glib_gutils.c +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/gutils.c.orig Wed Mar 23 09:55:02 2005 -+++ glib/gutils.c Thu Apr 7 01:06:16 2005 -@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void) - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/"; - - data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); - #endif -@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void) - conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); - - if (!conf_dirs || !conf_dirs[0]) -- conf_dirs = "/etc/xdg"; -+ conf_dirs = "/usr/local/etc/xdg:/etc/xdg"; - - conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); - #endif diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c deleted file mode 100644 index 586d7f80b..000000000 --- a/devel/glib20/files/patch-gmodule::gmodule-dl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 -+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 -@@ -104,6 +104,7 @@ - static gpointer - _g_module_self (void) - { -+#ifndef __FreeBSD__ - gpointer handle; - - /* to query symbols from the program itself, special link options -@@ -115,6 +116,9 @@ - g_module_set_error (fetch_dlerror (TRUE)); - - return handle; -+#else -+ return RTLD_DEFAULT; -+#endif - } - - static void diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c deleted file mode 100644 index 47c5ab8f1..000000000 --- a/devel/glib20/files/patch-gthread_gthread-posix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 -+++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 -@@ -125,7 +129,8 @@ - g_thread_impl_init(void) - { - #ifdef _SC_THREAD_STACK_MIN -- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0); -+ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), -+ g_thread_min_stack_size); - #endif /* _SC_THREAD_STACK_MIN */ - #ifdef HAVE_PRIORITIES - # ifdef G_THREADS_IMPL_POSIX -@@ -176,7 +181,7 @@ - result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); - - #ifdef G_THREADS_IMPL_POSIX -- if (result == EBUSY) -+ if ((result == EBUSY) || (result == EDEADLK)) - return FALSE; - #else /* G_THREADS_IMPL_DCE */ - if (result == 0) diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr deleted file mode 100644 index 3b3059030..000000000 --- a/devel/glib20/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -GLib provides a simple, abstract, and highly portable set of C support -routines such as lists, trees, hashes, memory allocation, and much, much -more. It is a foundation for writing portable applications. - -WWW: http://www.gtk.org/ diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist deleted file mode 100644 index 48f0c14e7..000000000 --- a/devel/glib20/pkg-plist +++ /dev/null @@ -1,307 +0,0 @@ -bin/glib-genmarshal -bin/glib-gettextize -bin/glib-mkenums -bin/gobject-query -bin/gtester -bin/gtester-report -include/gio-unix-2.0/gio/gdesktopappinfo.h -include/gio-unix-2.0/gio/gunixinputstream.h -include/gio-unix-2.0/gio/gunixmounts.h -include/gio-unix-2.0/gio/gunixoutputstream.h -include/glib-2.0/gio/gappinfo.h -include/glib-2.0/gio/gasyncresult.h -include/glib-2.0/gio/gbufferedinputstream.h -include/glib-2.0/gio/gbufferedoutputstream.h -include/glib-2.0/gio/gcancellable.h -include/glib-2.0/gio/gcontenttype.h -include/glib-2.0/gio/gdatainputstream.h -include/glib-2.0/gio/gdataoutputstream.h -include/glib-2.0/gio/gdrive.h -include/glib-2.0/gio/gemblem.h -include/glib-2.0/gio/gemblemedicon.h -include/glib-2.0/gio/gfile.h -include/glib-2.0/gio/gfileattribute.h -include/glib-2.0/gio/gfileenumerator.h -include/glib-2.0/gio/gfileicon.h -include/glib-2.0/gio/gfileinfo.h -include/glib-2.0/gio/gfileinputstream.h -include/glib-2.0/gio/gfilemonitor.h -include/glib-2.0/gio/gfilenamecompleter.h -include/glib-2.0/gio/gfileoutputstream.h -include/glib-2.0/gio/gfilterinputstream.h -include/glib-2.0/gio/gfilteroutputstream.h -include/glib-2.0/gio/gicon.h -include/glib-2.0/gio/ginputstream.h -include/glib-2.0/gio/gio.h -include/glib-2.0/gio/gioenums.h -include/glib-2.0/gio/gioenumtypes.h -include/glib-2.0/gio/gioerror.h -include/glib-2.0/gio/giomodule.h -include/glib-2.0/gio/gioscheduler.h -include/glib-2.0/gio/giotypes.h -include/glib-2.0/gio/gloadableicon.h -include/glib-2.0/gio/gmemoryinputstream.h -include/glib-2.0/gio/gmemoryoutputstream.h -include/glib-2.0/gio/gmount.h -include/glib-2.0/gio/gmountoperation.h -include/glib-2.0/gio/gnativevolumemonitor.h -include/glib-2.0/gio/goutputstream.h -include/glib-2.0/gio/gseekable.h -include/glib-2.0/gio/gsimpleasyncresult.h -include/glib-2.0/gio/gthemedicon.h -include/glib-2.0/gio/gvfs.h -include/glib-2.0/gio/gvolume.h -include/glib-2.0/gio/gvolumemonitor.h -include/glib-2.0/glib-object.h -include/glib-2.0/glib.h -include/glib-2.0/glib/galloca.h -include/glib-2.0/glib/garray.h -include/glib-2.0/glib/gasyncqueue.h -include/glib-2.0/glib/gatomic.h -include/glib-2.0/glib/gbacktrace.h -include/glib-2.0/glib/gbase64.h -include/glib-2.0/glib/gbookmarkfile.h -include/glib-2.0/glib/gcache.h -include/glib-2.0/glib/gchecksum.h -include/glib-2.0/glib/gcompletion.h -include/glib-2.0/glib/gconvert.h -include/glib-2.0/glib/gdataset.h -include/glib-2.0/glib/gdate.h -include/glib-2.0/glib/gdir.h -include/glib-2.0/glib/gerror.h -include/glib-2.0/glib/gfileutils.h -include/glib-2.0/glib/ghash.h -include/glib-2.0/glib/ghook.h -include/glib-2.0/glib/gi18n-lib.h -include/glib-2.0/glib/gi18n.h -include/glib-2.0/glib/giochannel.h -include/glib-2.0/glib/gkeyfile.h -include/glib-2.0/glib/glist.h -include/glib-2.0/glib/gmacros.h -include/glib-2.0/glib/gmain.h -include/glib-2.0/glib/gmappedfile.h -include/glib-2.0/glib/gmarkup.h -include/glib-2.0/glib/gmem.h -include/glib-2.0/glib/gmessages.h -include/glib-2.0/glib/gnode.h -include/glib-2.0/glib/goption.h -include/glib-2.0/glib/gpattern.h -include/glib-2.0/glib/gprimes.h -include/glib-2.0/glib/gprintf.h -include/glib-2.0/glib/gqsort.h -include/glib-2.0/glib/gquark.h -include/glib-2.0/glib/gqueue.h -include/glib-2.0/glib/grand.h -include/glib-2.0/glib/gregex.h -include/glib-2.0/glib/grel.h -include/glib-2.0/glib/gscanner.h -include/glib-2.0/glib/gsequence.h -include/glib-2.0/glib/gshell.h -include/glib-2.0/glib/gslice.h -include/glib-2.0/glib/gslist.h -include/glib-2.0/glib/gspawn.h -include/glib-2.0/glib/gstdio.h -include/glib-2.0/glib/gstrfuncs.h -include/glib-2.0/glib/gstring.h -include/glib-2.0/glib/gtestutils.h -include/glib-2.0/glib/gthread.h -include/glib-2.0/glib/gthreadpool.h -include/glib-2.0/glib/gtimer.h -include/glib-2.0/glib/gtree.h -include/glib-2.0/glib/gtypes.h -include/glib-2.0/glib/gunicode.h -include/glib-2.0/glib/gurifuncs.h -include/glib-2.0/glib/gutils.h -include/glib-2.0/glib/gwin32.h -include/glib-2.0/glibconfig.h -include/glib-2.0/gmodule.h -include/glib-2.0/gobject/gboxed.h -include/glib-2.0/gobject/gclosure.h -include/glib-2.0/gobject/genums.h -include/glib-2.0/gobject/gmarshal.h -include/glib-2.0/gobject/gobject.h -include/glib-2.0/gobject/gobjectnotifyqueue.c -include/glib-2.0/gobject/gparam.h -include/glib-2.0/gobject/gparamspecs.h -include/glib-2.0/gobject/gsignal.h -include/glib-2.0/gobject/gsourceclosure.h -include/glib-2.0/gobject/gtype.h -include/glib-2.0/gobject/gtypemodule.h -include/glib-2.0/gobject/gtypeplugin.h -include/glib-2.0/gobject/gvalue.h -include/glib-2.0/gobject/gvaluearray.h -include/glib-2.0/gobject/gvaluecollector.h -include/glib-2.0/gobject/gvaluetypes.h -lib/libgio-2.0.a -lib/libgio-2.0.la -lib/libgio-2.0.so -lib/libgio-2.0.so.0 -lib/libglib-2.0.a -lib/libglib-2.0.la -lib/libglib-2.0.so -lib/libglib-2.0.so.0 -lib/libgmodule-2.0.a -lib/libgmodule-2.0.la -lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.0 -lib/libgobject-2.0.a -lib/libgobject-2.0.la -lib/libgobject-2.0.so -lib/libgobject-2.0.so.0 -lib/libgthread-2.0.a -lib/libgthread-2.0.la -lib/libgthread-2.0.so -lib/libgthread-2.0.so.0 -libdata/pkgconfig/gio-2.0.pc -libdata/pkgconfig/gio-unix-2.0.pc -libdata/pkgconfig/glib-2.0.pc -libdata/pkgconfig/gmodule-2.0.pc -libdata/pkgconfig/gmodule-export-2.0.pc -libdata/pkgconfig/gmodule-no-export-2.0.pc -libdata/pkgconfig/gobject-2.0.pc -libdata/pkgconfig/gthread-2.0.pc -share/aclocal/glib-2.0.m4 -share/aclocal/glib-gettext.m4 -share/glib-2.0/gettext/mkinstalldirs -share/glib-2.0/gettext/po/Makefile.in.in -share/locale/am/LC_MESSAGES/glib20.mo -share/locale/ar/LC_MESSAGES/glib20.mo -share/locale/as/LC_MESSAGES/glib20.mo -share/locale/az/LC_MESSAGES/glib20.mo -share/locale/be/LC_MESSAGES/glib20.mo -share/locale/be@latin/LC_MESSAGES/glib20.mo -share/locale/bg/LC_MESSAGES/glib20.mo -share/locale/bn/LC_MESSAGES/glib20.mo -share/locale/bn_IN/LC_MESSAGES/glib20.mo -share/locale/bs/LC_MESSAGES/glib20.mo -share/locale/ca/LC_MESSAGES/glib20.mo -share/locale/cs/LC_MESSAGES/glib20.mo -share/locale/cy/LC_MESSAGES/glib20.mo -share/locale/da/LC_MESSAGES/glib20.mo -share/locale/de/LC_MESSAGES/glib20.mo -share/locale/dz/LC_MESSAGES/glib20.mo -share/locale/el/LC_MESSAGES/glib20.mo -share/locale/en_CA/LC_MESSAGES/glib20.mo -share/locale/en_GB/LC_MESSAGES/glib20.mo -share/locale/eo/LC_MESSAGES/glib20.mo -share/locale/es/LC_MESSAGES/glib20.mo -share/locale/et/LC_MESSAGES/glib20.mo -share/locale/eu/LC_MESSAGES/glib20.mo -share/locale/fa/LC_MESSAGES/glib20.mo -share/locale/fi/LC_MESSAGES/glib20.mo -share/locale/fr/LC_MESSAGES/glib20.mo -share/locale/ga/LC_MESSAGES/glib20.mo -share/locale/gl/LC_MESSAGES/glib20.mo -share/locale/gu/LC_MESSAGES/glib20.mo -share/locale/he/LC_MESSAGES/glib20.mo -share/locale/hi/LC_MESSAGES/glib20.mo -share/locale/hr/LC_MESSAGES/glib20.mo -share/locale/hu/LC_MESSAGES/glib20.mo -share/locale/hy/LC_MESSAGES/glib20.mo -share/locale/id/LC_MESSAGES/glib20.mo -share/locale/is/LC_MESSAGES/glib20.mo -share/locale/it/LC_MESSAGES/glib20.mo -share/locale/ja/LC_MESSAGES/glib20.mo -share/locale/ka/LC_MESSAGES/glib20.mo -share/locale/kn/LC_MESSAGES/glib20.mo -share/locale/ko/LC_MESSAGES/glib20.mo -share/locale/ku/LC_MESSAGES/glib20.mo -share/locale/lt/LC_MESSAGES/glib20.mo -share/locale/lv/LC_MESSAGES/glib20.mo -share/locale/mai/LC_MESSAGES/glib20.mo -share/locale/mg/LC_MESSAGES/glib20.mo -share/locale/mk/LC_MESSAGES/glib20.mo -share/locale/ml/LC_MESSAGES/glib20.mo -share/locale/mn/LC_MESSAGES/glib20.mo -share/locale/mr/LC_MESSAGES/glib20.mo -share/locale/ms/LC_MESSAGES/glib20.mo -share/locale/nb/LC_MESSAGES/glib20.mo -share/locale/ne/LC_MESSAGES/glib20.mo -share/locale/nl/LC_MESSAGES/glib20.mo -share/locale/nn/LC_MESSAGES/glib20.mo -share/locale/oc/LC_MESSAGES/glib20.mo -share/locale/or/LC_MESSAGES/glib20.mo -share/locale/pa/LC_MESSAGES/glib20.mo -share/locale/pl/LC_MESSAGES/glib20.mo -share/locale/ps/LC_MESSAGES/glib20.mo -share/locale/pt/LC_MESSAGES/glib20.mo -share/locale/pt_BR/LC_MESSAGES/glib20.mo -share/locale/ro/LC_MESSAGES/glib20.mo -share/locale/ru/LC_MESSAGES/glib20.mo -share/locale/rw/LC_MESSAGES/glib20.mo -share/locale/si/LC_MESSAGES/glib20.mo -share/locale/sk/LC_MESSAGES/glib20.mo -share/locale/sl/LC_MESSAGES/glib20.mo -share/locale/sq/LC_MESSAGES/glib20.mo -share/locale/sr/LC_MESSAGES/glib20.mo -share/locale/sr@ije/LC_MESSAGES/glib20.mo -share/locale/sr@latin/LC_MESSAGES/glib20.mo -share/locale/sv/LC_MESSAGES/glib20.mo -share/locale/ta/LC_MESSAGES/glib20.mo -share/locale/te/LC_MESSAGES/glib20.mo -share/locale/th/LC_MESSAGES/glib20.mo -share/locale/tl/LC_MESSAGES/glib20.mo -share/locale/tr/LC_MESSAGES/glib20.mo -share/locale/tt/LC_MESSAGES/glib20.mo -share/locale/uk/LC_MESSAGES/glib20.mo -share/locale/vi/LC_MESSAGES/glib20.mo -share/locale/wa/LC_MESSAGES/glib20.mo -share/locale/xh/LC_MESSAGES/glib20.mo -share/locale/yi/LC_MESSAGES/glib20.mo -share/locale/zh_CN/LC_MESSAGES/glib20.mo -share/locale/zh_HK/LC_MESSAGES/glib20.mo -share/locale/zh_TW/LC_MESSAGES/glib20.mo -@dirrm share/glib-2.0/gettext/po -@dirrm share/glib-2.0/gettext -@dirrm share/glib-2.0 -@exec mkdir -p %D/lib/gio/modules -@dirrmtry lib/gio/modules -@dirrmtry lib/gio -@dirrm include/glib-2.0/gobject -@dirrm include/glib-2.0/glib -@dirrm include/glib-2.0/gio -@dirrm include/glib-2.0 -@dirrm include/gio-unix-2.0/gio -@dirrm include/gio-unix-2.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/tt/LC_MESSAGES -@dirrmtry share/locale/tt -@dirrmtry share/locale/tl/LC_MESSAGES -@dirrmtry share/locale/tl -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/sr@ije/LC_MESSAGES -@dirrmtry share/locale/sr@ije -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ps/LC_MESSAGES -@dirrmtry share/locale/ps -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/hy/LC_MESSAGES -@dirrmtry share/locale/hy -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile deleted file mode 100644 index f89503844..000000000 --- a/devel/glibmm/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: glibmm -# Date created: 04 December 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.67 2008/09/21 20:57:46 kwm Exp $ -# - -PORTNAME= glibmm -PORTVERSION= 2.18.1 -PORTREVISION?= 0 -PORTEPOCH= 1 -CATEGORIES= devel -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= C++ interfaces for glib2 - -USE_BZIP2= yes - -PLIST_SUB= VERSION="2.4" API_VERSION="2.4" - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 - -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 ltverhack -USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-static - -post-patch: -.for d in docs examples tests - @${REINPLACE_CMD} -e '/^SUBDIRS = /s/${d}//' ${WRKSRC}/Makefile.in -.endfor - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/docs/reference/beautify_docs.pl \ - ${PREFIX}/lib/glibmm-2.4/proc - -.include <bsd.port.mk> - -.endif diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo deleted file mode 100644 index 61f8ad49d..000000000 --- a/devel/glibmm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/glibmm-2.18.1.tar.bz2) = 942290a4b77dac3ea18a5b70373fe04c -SHA256 (gnome2/glibmm-2.18.1.tar.bz2) = 79641fe9ca2ad2ad4c49f2ebe15f360b16cbbff852eaa51c99b8f36b362ce649 -SIZE (gnome2/glibmm-2.18.1.tar.bz2) = 6714825 diff --git a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl b/devel/glibmm/files/patch-docs::reference::beautify_docs.pl deleted file mode 100644 index bbb320452..000000000 --- a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl +++ /dev/null @@ -1,20 +0,0 @@ ---- docs/reference/beautify_docs.pl.in.orig Thu Feb 12 02:52:02 2004 -+++ docs/reference/beautify_docs.pl.in Thu Feb 12 03:00:08 2004 -@@ -25,7 +25,7 @@ - my ($file) = @_; - my @outbuf; - -- open(FILE, '<', $file); -+ open(FILE, "<$file"); - - while(<FILE>) - { -@@ -71,7 +71,7 @@ - push(@outbuf, $_); - } - -- open(FILE, '>', $file); -+ open(FILE, ">$file"); - - # write the whole buffer back - print FILE "$_" foreach(@outbuf); diff --git a/devel/glibmm/pkg-descr b/devel/glibmm/pkg-descr deleted file mode 100644 index f689c4137..000000000 --- a/devel/glibmm/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -C++ interfaces for glib20. - -WWW: http://gtkmm.sourceforge.net/ diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist deleted file mode 100644 index c6208677d..000000000 --- a/devel/glibmm/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -include/giomm-%%API_VERSION%%/giomm.h -include/giomm-%%API_VERSION%%/giomm/appinfo.h -include/giomm-%%API_VERSION%%/giomm/asyncresult.h -include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h -include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h -include/giomm-%%API_VERSION%%/giomm/cancellable.h -include/giomm-%%API_VERSION%%/giomm/contenttype.h -include/giomm-%%API_VERSION%%/giomm/datainputstream.h -include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h -include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h -include/giomm-%%API_VERSION%%/giomm/drive.h -include/giomm-%%API_VERSION%%/giomm/enums.h -include/giomm-%%API_VERSION%%/giomm/error.h -include/giomm-%%API_VERSION%%/giomm/file.h -include/giomm-%%API_VERSION%%/giomm/fileattributeinfo.h -include/giomm-%%API_VERSION%%/giomm/fileattributeinfolist.h -include/giomm-%%API_VERSION%%/giomm/fileenumerator.h -include/giomm-%%API_VERSION%%/giomm/fileicon.h -include/giomm-%%API_VERSION%%/giomm/fileinfo.h -include/giomm-%%API_VERSION%%/giomm/fileinputstream.h -include/giomm-%%API_VERSION%%/giomm/filemonitor.h -include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h -include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h -include/giomm-%%API_VERSION%%/giomm/filterinputstream.h -include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h -include/giomm-%%API_VERSION%%/giomm/icon.h -include/giomm-%%API_VERSION%%/giomm/init.h -include/giomm-%%API_VERSION%%/giomm/inputstream.h -include/giomm-%%API_VERSION%%/giomm/loadableicon.h -include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h -include/giomm-%%API_VERSION%%/giomm/mount.h -include/giomm-%%API_VERSION%%/giomm/mountoperation.h -include/giomm-%%API_VERSION%%/giomm/outputstream.h -include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h -include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h -include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/drive_p.h -include/giomm-%%API_VERSION%%/giomm/private/enums_p.h -include/giomm-%%API_VERSION%%/giomm/private/error_p.h -include/giomm-%%API_VERSION%%/giomm/private/file_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfolist_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h -include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/icon_p.h -include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/mount_p.h -include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h -include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h -include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/volume_p.h -include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h -include/giomm-%%API_VERSION%%/giomm/seekable.h -include/giomm-%%API_VERSION%%/giomm/themedicon.h -include/giomm-%%API_VERSION%%/giomm/unixinputstream.h -include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h -include/giomm-%%API_VERSION%%/giomm/volume.h -include/giomm-%%API_VERSION%%/giomm/volumemonitor.h -include/giomm-%%API_VERSION%%/giomm/wrap_init.h -include/glibmm-%%API_VERSION%%/glibmm.h -include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h -include/glibmm-%%API_VERSION%%/glibmm/checksum.h -include/glibmm-%%API_VERSION%%/glibmm/class.h -include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h -include/glibmm-%%API_VERSION%%/glibmm/containers.h -include/glibmm-%%API_VERSION%%/glibmm/convert.h -include/glibmm-%%API_VERSION%%/glibmm/date.h -include/glibmm-%%API_VERSION%%/glibmm/debug.h -include/glibmm-%%API_VERSION%%/glibmm/dispatcher.h -include/glibmm-%%API_VERSION%%/glibmm/error.h -include/glibmm-%%API_VERSION%%/glibmm/exception.h -include/glibmm-%%API_VERSION%%/glibmm/exceptionhandler.h -include/glibmm-%%API_VERSION%%/glibmm/fileutils.h -include/glibmm-%%API_VERSION%%/glibmm/helperlist.h -include/glibmm-%%API_VERSION%%/glibmm/i18n-lib.h -include/glibmm-%%API_VERSION%%/glibmm/i18n.h -include/glibmm-%%API_VERSION%%/glibmm/init.h -include/glibmm-%%API_VERSION%%/glibmm/interface.h -include/glibmm-%%API_VERSION%%/glibmm/iochannel.h -include/glibmm-%%API_VERSION%%/glibmm/keyfile.h -include/glibmm-%%API_VERSION%%/glibmm/listhandle.h -include/glibmm-%%API_VERSION%%/glibmm/main.h -include/glibmm-%%API_VERSION%%/glibmm/markup.h -include/glibmm-%%API_VERSION%%/glibmm/miscutils.h -include/glibmm-%%API_VERSION%%/glibmm/module.h -include/glibmm-%%API_VERSION%%/glibmm/nodetree.h -include/glibmm-%%API_VERSION%%/glibmm/object.h -include/glibmm-%%API_VERSION%%/glibmm/objectbase.h -include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h -include/glibmm-%%API_VERSION%%/glibmm/optionentry.h -include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h -include/glibmm-%%API_VERSION%%/glibmm/pattern.h -include/glibmm-%%API_VERSION%%/glibmm/priorities.h -include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/nodetree_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optiongroup_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h -include/glibmm-%%API_VERSION%%/glibmm/property.h -include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h -include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h -include/glibmm-%%API_VERSION%%/glibmm/quark.h -include/glibmm-%%API_VERSION%%/glibmm/random.h -include/glibmm-%%API_VERSION%%/glibmm/refptr.h -include/glibmm-%%API_VERSION%%/glibmm/regex.h -include/glibmm-%%API_VERSION%%/glibmm/sarray.h -include/glibmm-%%API_VERSION%%/glibmm/shell.h -include/glibmm-%%API_VERSION%%/glibmm/signalproxy.h -include/glibmm-%%API_VERSION%%/glibmm/signalproxy_connectionnode.h -include/glibmm-%%API_VERSION%%/glibmm/slisthandle.h -include/glibmm-%%API_VERSION%%/glibmm/spawn.h -include/glibmm-%%API_VERSION%%/glibmm/streamiochannel.h -include/glibmm-%%API_VERSION%%/glibmm/stringutils.h -include/glibmm-%%API_VERSION%%/glibmm/thread.h -include/glibmm-%%API_VERSION%%/glibmm/threadpool.h -include/glibmm-%%API_VERSION%%/glibmm/timer.h -include/glibmm-%%API_VERSION%%/glibmm/timeval.h -include/glibmm-%%API_VERSION%%/glibmm/unicode.h -include/glibmm-%%API_VERSION%%/glibmm/uriutils.h -include/glibmm-%%API_VERSION%%/glibmm/ustring.h -include/glibmm-%%API_VERSION%%/glibmm/utility.h -include/glibmm-%%API_VERSION%%/glibmm/value.h -include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h -include/glibmm-%%API_VERSION%%/glibmm/value_custom.h -include/glibmm-%%API_VERSION%%/glibmm/wrap.h -include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h -include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h -lib/giomm-%%API_VERSION%%/include/giommconfig.h -lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h -lib/glibmm-%%API_VERSION%%/proc/beautify_docs.pl -lib/glibmm-%%API_VERSION%%/proc/generate_wrap_init.pl -lib/glibmm-%%API_VERSION%%/proc/gmmproc -lib/glibmm-%%API_VERSION%%/proc/m4/base.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype_static.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_generic.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_gobject.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_gtkobject.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_interface.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_copyable.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_refcounted.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/class_shared.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/compare.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_atk.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_base.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_gdk.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_gio.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_glib.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtk.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/convert_pango.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/ctor.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/doc.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/enum.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/gerror.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/list.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/member.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/method.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/property.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/signal.m4 -lib/glibmm-%%API_VERSION%%/proc/m4/vfunc.m4 -lib/glibmm-%%API_VERSION%%/proc/pm/DocsParser.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Enum.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Function.pm -lib/glibmm-%%API_VERSION%%/proc/pm/FunctionBase.pm -lib/glibmm-%%API_VERSION%%/proc/pm/GtkDefs.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Object.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Output.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Property.pm -lib/glibmm-%%API_VERSION%%/proc/pm/Util.pm -lib/glibmm-%%API_VERSION%%/proc/pm/WrapParser.pm -lib/libgiomm-%%VERSION%%.a -lib/libgiomm-%%VERSION%%.la -lib/libgiomm-%%VERSION%%.so -lib/libgiomm-%%VERSION%%.so.1 -lib/libglibmm-%%VERSION%%.a -lib/libglibmm-%%VERSION%%.la -lib/libglibmm-%%VERSION%%.so -lib/libglibmm-%%VERSION%%.so.1 -lib/libglibmm_generate_extra_defs-%%VERSION%%.a -lib/libglibmm_generate_extra_defs-%%VERSION%%.la -lib/libglibmm_generate_extra_defs-%%VERSION%%.so -lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1 -libdata/pkgconfig/giomm-%%API_VERSION%%.pc -libdata/pkgconfig/glibmm-%%API_VERSION%%.pc -share/aclocal/glibmm_check_perl.m4 -@dirrm lib/glibmm-%%API_VERSION%%/proc/pm -@dirrm lib/glibmm-%%API_VERSION%%/proc/m4 -@dirrm lib/glibmm-%%API_VERSION%%/proc -@dirrm lib/glibmm-%%API_VERSION%%/include -@dirrm lib/glibmm-%%API_VERSION%% -@dirrm lib/giomm-%%API_VERSION%%/include -@dirrm lib/giomm-%%API_VERSION%% -@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs -@dirrm include/glibmm-%%API_VERSION%%/glibmm/private -@dirrm include/glibmm-%%API_VERSION%%/glibmm -@dirrm include/glibmm-%%API_VERSION%% -@dirrm include/giomm-%%API_VERSION%%/giomm/private -@dirrm include/giomm-%%API_VERSION%%/giomm -@dirrm include/giomm-%%API_VERSION%% diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile deleted file mode 100644 index 64e378e74..000000000 --- a/devel/gnome-build/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: gnomebuild -# Date created: 24 July 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gnome-build/Makefile,v 1.8 2008/09/22 18:14:45 marcus Exp $ -# - -PORTNAME= gnome-build -PORTVERSION= 2.24.1 -PORTEPOCH= 1 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME Build Framework (GBF) - -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext -LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext - -USE_BZIP2= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomevfs2 -USE_GETTEXT= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_LDCONFIG= yes -USE_PERL5= yes -CONFIGURE_ARGS= --enable-compile-warnings=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lgnuregex" - -.include <bsd.port.mk> diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo deleted file mode 100644 index df535af68..000000000 --- a/devel/gnome-build/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-build-2.24.1.tar.bz2) = b35c918b6c0c70652e9eb1d2e45138f1 -SHA256 (gnome2/gnome-build-2.24.1.tar.bz2) = 35c8bf4ebbe93639400985c92322f1be80de3e193ed1d715443949bb9a5c43a0 -SIZE (gnome2/gnome-build-2.24.1.tar.bz2) = 517031 diff --git a/devel/gnome-build/pkg-descr b/devel/gnome-build/pkg-descr deleted file mode 100644 index 60385151a..000000000 --- a/devel/gnome-build/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a GNOME Build Framework (GBF). - -WWW: http://www.gnome.org/ diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist deleted file mode 100644 index 60ff88f77..000000000 --- a/devel/gnome-build/pkg-plist +++ /dev/null @@ -1,109 +0,0 @@ -bin/gbf-am-parse -bin/gbf-mkfile-parse -include/gnome-build-1.0/gbf/gbf-backend.h -include/gnome-build-1.0/gbf/gbf-project-model.h -include/gnome-build-1.0/gbf/gbf-project-util.h -include/gnome-build-1.0/gbf/gbf-project-view.h -include/gnome-build-1.0/gbf/gbf-project.h -include/gnome-build-1.0/gbf/gbf-tree-data.h -include/gnome-build-1.0/gbf/gbf-widgets.h -include/gnome-build-1.0/gbf/glue-plugin.h -lib/gnome-build-1.0/backends/gbf-am.server -lib/gnome-build-1.0/backends/gbf-mkfile.server -lib/gnome-build-1.0/backends/libgbf-am.la -lib/gnome-build-1.0/backends/libgbf-am.so -lib/gnome-build-1.0/backends/libgbf-mkfile.la -lib/gnome-build-1.0/backends/libgbf-mkfile.so -lib/libgbf-1.la -lib/libgbf-1.so -lib/libgbf-1.so.2 -lib/libgbf-widgets-1.la -lib/libgbf-widgets-1.so -lib/libgbf-widgets-1.so.2 -libdata/pkgconfig/gnome-build-1.0.pc -share/gnome-build/GBF/AmFiles.pm -share/gnome-build/GBF/General.pm -share/gnome-build/GBF/Make.pm -share/gnome-build/glade/create_dialogs.glade -share/gnome-build/glade/gbf-am-dialogs.glade -share/locale/am/LC_MESSAGES/gbf-1.mo -share/locale/ar/LC_MESSAGES/gbf-1.mo -share/locale/az/LC_MESSAGES/gbf-1.mo -share/locale/be/LC_MESSAGES/gbf-1.mo -share/locale/bg/LC_MESSAGES/gbf-1.mo -share/locale/ca/LC_MESSAGES/gbf-1.mo -share/locale/cs/LC_MESSAGES/gbf-1.mo -share/locale/da/LC_MESSAGES/gbf-1.mo -share/locale/de/LC_MESSAGES/gbf-1.mo -share/locale/dz/LC_MESSAGES/gbf-1.mo -share/locale/el/LC_MESSAGES/gbf-1.mo -share/locale/en_CA/LC_MESSAGES/gbf-1.mo -share/locale/en_GB/LC_MESSAGES/gbf-1.mo -share/locale/es/LC_MESSAGES/gbf-1.mo -share/locale/et/LC_MESSAGES/gbf-1.mo -share/locale/eu/LC_MESSAGES/gbf-1.mo -share/locale/fi/LC_MESSAGES/gbf-1.mo -share/locale/fr/LC_MESSAGES/gbf-1.mo -share/locale/gl/LC_MESSAGES/gbf-1.mo -share/locale/gu/LC_MESSAGES/gbf-1.mo -share/locale/he/LC_MESSAGES/gbf-1.mo -share/locale/hi/LC_MESSAGES/gbf-1.mo -share/locale/hr/LC_MESSAGES/gbf-1.mo -share/locale/hu/LC_MESSAGES/gbf-1.mo -share/locale/it/LC_MESSAGES/gbf-1.mo -share/locale/ja/LC_MESSAGES/gbf-1.mo -share/locale/ko/LC_MESSAGES/gbf-1.mo -share/locale/lt/LC_MESSAGES/gbf-1.mo -share/locale/lv/LC_MESSAGES/gbf-1.mo -share/locale/mk/LC_MESSAGES/gbf-1.mo -share/locale/ml/LC_MESSAGES/gbf-1.mo -share/locale/mr/LC_MESSAGES/gbf-1.mo -share/locale/ms/LC_MESSAGES/gbf-1.mo -share/locale/nb/LC_MESSAGES/gbf-1.mo -share/locale/ne/LC_MESSAGES/gbf-1.mo -share/locale/nl/LC_MESSAGES/gbf-1.mo -share/locale/nn/LC_MESSAGES/gbf-1.mo -share/locale/oc/LC_MESSAGES/gbf-1.mo -share/locale/pa/LC_MESSAGES/gbf-1.mo -share/locale/pl/LC_MESSAGES/gbf-1.mo -share/locale/pt/LC_MESSAGES/gbf-1.mo -share/locale/pt_BR/LC_MESSAGES/gbf-1.mo -share/locale/ru/LC_MESSAGES/gbf-1.mo -share/locale/rw/LC_MESSAGES/gbf-1.mo -share/locale/si/LC_MESSAGES/gbf-1.mo -share/locale/sk/LC_MESSAGES/gbf-1.mo -share/locale/sl/LC_MESSAGES/gbf-1.mo -share/locale/sq/LC_MESSAGES/gbf-1.mo -share/locale/sr/LC_MESSAGES/gbf-1.mo -share/locale/sr@latin/LC_MESSAGES/gbf-1.mo -share/locale/sv/LC_MESSAGES/gbf-1.mo -share/locale/th/LC_MESSAGES/gbf-1.mo -share/locale/tr/LC_MESSAGES/gbf-1.mo -share/locale/uk/LC_MESSAGES/gbf-1.mo -share/locale/vi/LC_MESSAGES/gbf-1.mo -share/locale/zh_CN/LC_MESSAGES/gbf-1.mo -share/locale/zh_HK/LC_MESSAGES/gbf-1.mo -share/locale/zh_TW/LC_MESSAGES/gbf-1.mo -share/pixmaps/gbf-build.png -share/pixmaps/gbf-install.png -@dirrm share/gnome-build/glade -@dirrm share/gnome-build/GBF -@dirrm share/gnome-build -@dirrm lib/gnome-build-1.0/backends -@dirrm lib/gnome-build-1.0 -@dirrm include/gnome-build-1.0/gbf -@dirrm include/gnome-build-1.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile deleted file mode 100644 index 900d3904e..000000000 --- a/devel/gnome-common/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: gnomecommon -# Date created: 04 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gnome-common/Makefile,v 1.9 2008/09/23 04:56:42 marcus Exp $ -# - -PORTNAME= gnome-common -PORTVERSION= 2.24.0 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Common automake macros for GNOME and GNOME 2 - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= pkgconfig -GNU_CONFIGURE= yes - -.include <bsd.port.mk> diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo deleted file mode 100644 index dea6ccade..000000000 --- a/devel/gnome-common/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-common-2.24.0.tar.bz2) = f72230d19ab9f2fa8923dcb078c69e9a -SHA256 (gnome2/gnome-common-2.24.0.tar.bz2) = e36fc07118e9d3cc0a4808cfbc6bfbd03ab5ba1ce0a311df9573dbbc0d189bac -SIZE (gnome2/gnome-common-2.24.0.tar.bz2) = 64560 diff --git a/devel/gnome-common/pkg-descr b/devel/gnome-common/pkg-descr deleted file mode 100644 index 4cf03f1e9..000000000 --- a/devel/gnome-common/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is a collection of automake macros used for developing new GNOME -or GNOME 2.0 applications. - -WWW: http://www.gnome.org/ diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist deleted file mode 100644 index 081a3d75e..000000000 --- a/devel/gnome-common/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/gnome-autogen.sh -bin/gnome-doc-common -share/aclocal/gnome-common.m4 -share/aclocal/gnome-compiler-flags.m4 -%%DATADIR%%/data/omf.make -%%DATADIR%%/data/xmldocs.make -@dirrm %%DATADIR%%/data -@dirrm %%DATADIR%% diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile deleted file mode 100644 index 439736cb4..000000000 --- a/devel/gnome-vfs/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -# New ports collection makefile for: gnomevfs2 -# Date created: 28th June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.184 2008/08/06 02:04:27 marcus Exp $ -# - -PORTNAME= gnome-vfs -PORTVERSION= 2.24.0 -PORTREVISION?= 0 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME Virtual File System - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal -RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info - -USE_GMAKE= yes -USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - ltverhack referencehack -USE_AUTOTOOLS= libtool:15 -USE_OPENSSL= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-openssl \ - --disable-gnutls \ - --disable-howl \ - --enable-hal \ - --with-hal-mount=/sbin/mount \ - --with-hal-umount=/sbin/umount -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB=\"${PTHREAD_LIBS}\"" -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} - -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -GCONF_SCHEMAS= desktop_default_applications.schemas \ - desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ - system_http_proxy.schemas system_smb.schemas - -OPTIONS= SAMBA "Enable SMB volume support" on \ - MDNS "Enable Bonjour/Rendezvous support" on - -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) -USE_FAM= yes -.endif - -.if exists(${LOCALBASE}/lib/libkrb5.so) -LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -.endif - -.if !defined(WITHOUT_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient -PLIST_SUB+= SAMBA="" -.else -PLIST_SUB+= SAMBA="@comment " -CONFIGURE_ARGS+=--disable-samba -.endif - -.if !defined(WITHOUT_MDNS) -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app -.else -CONFIGURE_ARGS+=--disable-avahi -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|@PTHREAD_LIB@|${PTHREAD_LIBS}|' \ - ${WRKSRC}/gnome-vfs-2.0.pc.in ${WRKSRC}/gnome-vfs-module-2.0.pc.in - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c - @${REINPLACE_CMD} -e 's|-lacl||g' \ - ${WRKSRC}/configure - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]' 2> /dev/null`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi -.if defined(WITHOUT_KERBEROS) - @${ECHO_CMD} "${PKGNAME}: KERBEROS is required." - @${FALSE} -.endif - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.post.mk> - -.endif diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo deleted file mode 100644 index 0b2dc3c17..000000000 --- a/devel/gnome-vfs/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-vfs-2.24.0.tar.bz2) = 870ee8861bfcaeb852934e95657ef83e -SHA256 (gnome2/gnome-vfs-2.24.0.tar.bz2) = b8ae3c81a2d6a3798534e72216899021013b47bc012e405fa00167d190559d94 -SIZE (gnome2/gnome-vfs-2.24.0.tar.bz2) = 1935735 diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in deleted file mode 100644 index 7213df2fa..000000000 --- a/devel/gnome-vfs/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Tue Jul 11 09:30:02 2006 -+++ Makefile.in Tue Jul 11 09:30:32 2006 -@@ -352,7 +352,6 @@ - devel-docs \ - doc \ - programs \ -- test \ - po - - EXTRA_DIST = \ diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac deleted file mode 100644 index 383987654..000000000 --- a/devel/gnome-vfs/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 -+++ modules/Makefile.in Mon Oct 3 11:55:55 2005 -@@ -465,7 +465,7 @@ - @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la - @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la - @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = --module_flags = -export_dynamic -avoid-version -module -no-undefined -+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) - modulesdir = $(libdir)/gnome-vfs-2.0/modules - modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ diff --git a/devel/gnome-vfs/files/patch-config.h.in b/devel/gnome-vfs/files/patch-config.h.in deleted file mode 100644 index 70edbcd45..000000000 --- a/devel/gnome-vfs/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig Sun May 7 00:54:09 2006 -+++ config.h.in Sun May 7 00:54:46 2006 -@@ -121,6 +121,9 @@ - /* Define to 1 if you have the <fnmatch.h> header file. */ - #undef HAVE_FNMATCH_H - -+/* Define to 1 if you have the <sys/sysmacros.h> header file. */ -+#undef HAVE_SYS_SYSMACROS_H -+ - /* Define to 1 if you have the <fstab.h> header file. */ - #undef HAVE_FSTAB_H - diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure deleted file mode 100644 index df7bc5e67..000000000 --- a/devel/gnome-vfs/files/patch-configure +++ /dev/null @@ -1,54 +0,0 @@ ---- configure.orig Mon Feb 12 14:15:37 2007 -+++ configure Mon Feb 12 14:15:37 2007 -@@ -5708,7 +5708,7 @@ fi - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h -+ inttypes.h stdint.h unistd.h sys/sysmacros.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -22101,6 +22101,8 @@ echo $ECHO_N "checking for LC_MESSAGES.. - if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22147,6 +22149,7 @@ am_cv_val_LC_MESSAGES=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 - echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 -@@ -23612,6 +23615,7 @@ if test `eval echo '${'$as_ac_var'}'` = - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+ LIBS="-lintl $LIBS" - have_ngettext=yes - else - echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -@@ -33364,7 +33368,7 @@ if test "${openssl_libs+set}" = set; the - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -33662,7 +33666,7 @@ if test "${openssl_libs+set}" = set; the - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in deleted file mode 100644 index eb0f45920..000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 -+++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system libraries - Version: @VERSION@ - Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 --Libs: -L${libdir} -lgnomevfs-2 -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ - Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in deleted file mode 100644 index 168fba882..000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 -+++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system module include info - Version: @VERSION@ - Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 --Libs: -L${libdir} -lgnomevfs-2 -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ - Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in deleted file mode 100644 index 063376961..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 -+++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 -@@ -429,7 +429,7 @@ - # CLEANFILES = $(BUILT_SOURCES) - - # Platform specific includes --libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = \ - gnome-vfs-file-size.h - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c deleted file mode 100644 index 2747466f7..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ /dev/null @@ -1,26 +0,0 @@ ---- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 -+++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 -@@ -943,6 +943,8 @@ load_application_info (void) - static void - gnome_vfs_application_registry_init (void) - { -+ gchar *tmp; -+ - if (gnome_vfs_application_registry_initialized) - return; - -@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi - "application-registry", - NULL); - gnome_registry_dir.system_dir = TRUE; -+ -+ tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); -+ if (mkdir (tmp, 0700) && -+ errno != EEXIST) { -+ g_warning("Could not create per-user GNOME configuration directory: %s", -+ tmp); -+ } -+ g_free(tmp); - - user_registry_dir.dirname = g_build_filename (g_get_home_dir(), - ".gnome", diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c deleted file mode 100644 index c7fb1cf36..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2007-09-17 14:48:45.000000000 -0400 -+++ libgnomevfs/gnome-vfs-filesystem-type.c 2007-09-17 14:50:06.000000000 -0400 -@@ -65,6 +65,8 @@ static struct FSInfo fs_data[] = { - { "msdosfs" , N_("MSDOS Volume"), 0 }, - { "nfs" , N_("NFS Network Volume"), 1 }, - { "ntfs" , N_("Windows NT Volume"), 0 }, -+ { "nullfs" , N_("BSD Loopback Volume"), 1 }, -+ { "zfs" , N_("ZFS Volume"), 1 }, - { "nwfs" , N_("Netware Volume"), 0 }, - { "proc" , N_("System Volume"), 0 }, - { "procfs" , N_("System Volume"), 0 }, diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c deleted file mode 100644 index f50e1cb81..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c +++ /dev/null @@ -1,33 +0,0 @@ ---- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006 -+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006 -@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume - "/", - "/bin", - "/boot", -+ "/compat/linux/proc", -+ "/compat/linux/sys", - "/dev", - "/etc", - "/home", - "/lib", - "/lib64", -+ "/libexec", - "/media", - "/mnt", - "/opt", -+ "/rescue", - "/root", - "/sbin", - "/srv", - "/tmp", - "/usr", -+ "/usr/local", -+ "/usr/obj", -+ "/usr/ports", -+ "/usr/src", -+ "/usr/X11R6", - "/var", -+ "/var/tmp", - "/proc", - "/sbin", - NULL diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c deleted file mode 100644 index a9879578a..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 -+++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 -@@ -234,7 +234,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%LOCALBASE%%/share/"; - - ptr = xdg_data_dirs; - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h deleted file mode 100644 index 7d987f400..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 -+++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 -@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) - #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) - #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) -+#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) - #endif - - extern XdgMimeCache **_caches; diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c deleted file mode 100644 index 7ec9a33b8..000000000 --- a/devel/gnome-vfs/files/patch-modules_file-method-acl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006 -+++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006 -@@ -45,7 +45,7 @@ - #endif - - #ifdef HAVE_POSIX_ACL --# include <acl/libacl.h> -+# include <sys/acl.h> - #define HAVE_ACL 1 - #endif - diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in deleted file mode 100644 index 51a94a1be..000000000 --- a/devel/gnome-vfs/pkg-deinstall.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.19 2008/08/06 02:04:27 marcus Exp $ -# -# Restore gconf keys of libgnome. - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas - -if [ -f ${SCHEMAS} ]; then - env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ - %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ - > /dev/null || /usr/bin/true -fi - -exit 0 diff --git a/devel/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr deleted file mode 100644 index 03cbc07f6..000000000 --- a/devel/gnome-vfs/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The GNOME Virtual File System allows applications and users to treat -any number of file system concepts as a part of the local filesystem. -With GnomeVFS, filesystems across the internet, on connected devices, -and in multiple formats are as simple to access (and write code for) -as any directory on the local machine. - -WWW: http://www.gnome.org/ diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in deleted file mode 100644 index 5e917c02d..000000000 --- a/devel/gnome-vfs/pkg-install.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.19 2008/08/06 02:04:27 marcus Exp $ -# -# Restore gconf keys of libgnome. - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas - -if [ -f ${SCHEMAS} ]; then - env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \ - %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \ - > /dev/null || /usr/bin/true -fi - -exit 0 diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist deleted file mode 100644 index 6625cbfc1..000000000 --- a/devel/gnome-vfs/pkg-plist +++ /dev/null @@ -1,231 +0,0 @@ -bin/gnomevfs-cat -bin/gnomevfs-copy -bin/gnomevfs-df -bin/gnomevfs-info -bin/gnomevfs-ls -bin/gnomevfs-mkdir -bin/gnomevfs-monitor -bin/gnomevfs-mv -bin/gnomevfs-rm -etc/gnome-vfs-2.0/modules/default-modules.conf -%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf -etc/gnome-vfs-2.0/modules/ssl-modules.conf -include/gnome-vfs-2.0/include/gnome-vfs-file-size.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-version.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h -lib/gnome-vfs-2.0/modules/libbzip2.a -lib/gnome-vfs-2.0/modules/libbzip2.la -lib/gnome-vfs-2.0/modules/libbzip2.so -lib/gnome-vfs-2.0/modules/libcomputer.a -lib/gnome-vfs-2.0/modules/libcomputer.la -lib/gnome-vfs-2.0/modules/libcomputer.so -lib/gnome-vfs-2.0/modules/libdns-sd.a -lib/gnome-vfs-2.0/modules/libdns-sd.la -lib/gnome-vfs-2.0/modules/libdns-sd.so -lib/gnome-vfs-2.0/modules/libfile.a -lib/gnome-vfs-2.0/modules/libfile.la -lib/gnome-vfs-2.0/modules/libfile.so -lib/gnome-vfs-2.0/modules/libftp.a -lib/gnome-vfs-2.0/modules/libftp.la -lib/gnome-vfs-2.0/modules/libftp.so -lib/gnome-vfs-2.0/modules/libgzip.a -lib/gnome-vfs-2.0/modules/libgzip.la -lib/gnome-vfs-2.0/modules/libgzip.so -lib/gnome-vfs-2.0/modules/libhttp.a -lib/gnome-vfs-2.0/modules/libhttp.la -lib/gnome-vfs-2.0/modules/libhttp.so -lib/gnome-vfs-2.0/modules/libnetwork.a -lib/gnome-vfs-2.0/modules/libnetwork.la -lib/gnome-vfs-2.0/modules/libnetwork.so -lib/gnome-vfs-2.0/modules/libnntp.a -lib/gnome-vfs-2.0/modules/libnntp.la -lib/gnome-vfs-2.0/modules/libnntp.so -lib/gnome-vfs-2.0/modules/libsftp.a -lib/gnome-vfs-2.0/modules/libsftp.la -lib/gnome-vfs-2.0/modules/libsftp.so -%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.a -%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.la -%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so -lib/gnome-vfs-2.0/modules/libtar.a -lib/gnome-vfs-2.0/modules/libtar.la -lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfs-test.a -lib/gnome-vfs-2.0/modules/libvfs-test.la -lib/gnome-vfs-2.0/modules/libvfs-test.so -lib/libgnomevfs-2.a -lib/libgnomevfs-2.la -lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.0 -libdata/pkgconfig/gnome-vfs-2.0.pc -libdata/pkgconfig/gnome-vfs-module-2.0.pc -libexec/gnome-vfs-daemon -share/dbus-1/services/gnome-vfs-daemon.service -share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/as/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/kn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mai/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/oc/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/rw/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@latin/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/te/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo -@dirrm include/gnome-vfs-module-2.0/libgnomevfs -@dirrm include/gnome-vfs-module-2.0 -@dirrm include/gnome-vfs-2.0/libgnomevfs -@dirrm include/gnome-vfs-2.0/include -@dirrm include/gnome-vfs-2.0 -@dirrmtry share/locale/zu/LC_MESSAGES -@dirrmtry share/locale/zu -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/sr@ije/LC_MESSAGES -@dirrmtry share/locale/sr@ije -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/nso/LC_MESSAGES -@dirrmtry share/locale/nso -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile deleted file mode 100644 index e830b04fc..000000000 --- a/devel/gnome-vfsmm/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: gnome-vfsmm -# Date created: 22 May 2003 -# Whom: Alexander Nedotsukov <bland@mail.ru> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= gnome-vfsmm -PORTVERSION= 2.24.0 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= bland@FreeBSD.org -COMMENT= C++ wrapper for gnomevfs2 library - -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack gnomevfs2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-static - -PLIST_SUB= VERSION="2.6" API_VERSION="2.6" - -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples// ; \ - /^SUBDIRS =/s/docs//' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \ - ${WRKSRC}/tools/extra_defs_gen/Makefile.in - -.include <bsd.port.mk> diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo deleted file mode 100644 index 857e752d8..000000000 --- a/devel/gnome-vfsmm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = f02257451583832c4d67f4accba7ad62 -SHA256 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = ab2fd9067d631254543f5dd33edf0649983e53073cfc697ce7de5157d4ba80ae -SIZE (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = 359035 diff --git a/devel/gnome-vfsmm/pkg-descr b/devel/gnome-vfsmm/pkg-descr deleted file mode 100644 index da03091b1..000000000 --- a/devel/gnome-vfsmm/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a set of thin C++ wrappers for GnomeVFS v2 library. - -WWW: http://gtkmm.sourceforge.net/ diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist deleted file mode 100644 index a117076e4..000000000 --- a/devel/gnome-vfsmm/pkg-plist +++ /dev/null @@ -1,62 +0,0 @@ -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-2.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle-2.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/dns-sd.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/drive.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/enums.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/exception.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/file-info.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/handle.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/init.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-action.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-application.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-handlers.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle-2_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/file-info_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress-2_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-2.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress-2.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/uri.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/utils.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/volume-monitor.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/volume.h -include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/wrap_init.h -lib/gnome-vfsmm-%%API_VERSION%%/include/libgnomevfsmmconfig.h -lib/gnome-vfsmm-%%API_VERSION%%/proc/m4/convert.m4 -lib/gnome-vfsmm-%%API_VERSION%%/proc/m4/convert_gnome_vfsmm.m4 -lib/libgnomevfsmm-%%VERSION%%.a -lib/libgnomevfsmm-%%VERSION%%.la -lib/libgnomevfsmm-%%VERSION%%.so -lib/libgnomevfsmm-%%VERSION%%.so.1 -libdata/pkgconfig/gnome-vfsmm-%%API_VERSION%%.pc -@dirrm lib/gnome-vfsmm-%%API_VERSION%%/proc/m4 -@dirrm lib/gnome-vfsmm-%%API_VERSION%%/proc -@dirrm lib/gnome-vfsmm-%%API_VERSION%%/include -@dirrm lib/gnome-vfsmm-%%API_VERSION%% -@dirrm include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private -@dirrm include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm -@dirrm include/gnome-vfsmm-%%API_VERSION%% diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile deleted file mode 100644 index affcaa73e..000000000 --- a/devel/goffice/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: goffice -# Date created: 07 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/goffice/Makefile,v 1.34 2008/09/09 00:13:46 kwm Exp $ -# - -PORTNAME= goffice -PORTVERSION= 0.7.2 -CATEGORIES= devel gnome -MASTER_SITES= GNOME - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GLib/GTK+ set of document centric objects and utilities - -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ - libgsf_gnome libgnomeui ltverhack -USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION=${PORTVERSION} \ - SHORT_VER=0.8 -# SHORT_VER=${PORTVERSION:R} - -.include <bsd.port.mk> diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo deleted file mode 100644 index 9125ce83b..000000000 --- a/devel/goffice/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (goffice-0.7.2.tar.bz2) = f393f27dbab3b9efd92fe93633ddbfd6 -SHA256 (goffice-0.7.2.tar.bz2) = b885420c0e6a297239dbdc545cb8588dde81cb58034e1fc7e455a873f1cf39e4 -SIZE (goffice-0.7.2.tar.bz2) = 2071249 diff --git a/devel/goffice/pkg-descr b/devel/goffice/pkg-descr deleted file mode 100644 index 0d48f5052..000000000 --- a/devel/goffice/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Goffice is a set of document centric components for GLib and GTK+. - -There are common operations for document centric applications that are -conceptually simple, but complex to implement fully. - - plugins - - load/save documents - - undo/redo - -Goffice provides a single library for performing such operations. - -WWW: http://live.gnome.org/libgoffice diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist deleted file mode 100644 index 3ee5d5c04..000000000 --- a/devel/goffice/pkg-plist +++ /dev/null @@ -1,523 +0,0 @@ -include/libgoffice-%%SHORT_VER%%/goffice/app/error-info.h -include/libgoffice-%%SHORT_VER%%/goffice/app/file.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-conf.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader-module.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service.h -include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin.h -include/libgoffice-%%SHORT_VER%%/goffice/app/goffice-app.h -include/libgoffice-%%SHORT_VER%%/goffice/app/io-context-priv.h -include/libgoffice-%%SHORT_VER%%/goffice/app/io-context.h -include/libgoffice-%%SHORT_VER%%/goffice/app/module-plugin-defs.h -include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h -include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h -include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-line.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-text.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-util.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas.h -include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/libfoocanvas.h -include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h -include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h -include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-anchor.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-default-attributes.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-group.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-renderer-gdk.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-view.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image-store.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-paragraph-attributes.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-property-table.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-shape.h -include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-text-model.h -include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h -include/libgoffice-%%SHORT_VER%%/goffice/goffice.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-3d-box.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map-3d.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-child-button.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-control-foocanvas.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-allocator.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-set.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-error-bar.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid-line.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-guru.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-label.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-legend.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object-xml.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-outlined-object.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-engine.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-style.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-styled-object.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-theme.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-trend-line.h -include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-view.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-3d-rotation-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-color.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-pixmaps.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-stack.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-text.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-charmap-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-group.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-palette.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-box.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-color.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-pixmaps.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-text.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-format-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-gradient-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-graph-widget.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-image-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-line-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-locale-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-marker-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pixbuf.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h -include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-fft.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-math.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix3x3.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h -include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h -include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/go-ms-parser.h -include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms-client-handler.h -include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms.h -include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-image-ms.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-geometry.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-glib-extras.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gradient.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-image.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-libxml-extras.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-line.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-locale.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-marker.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pango-extras.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h -include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so -lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.a -lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.la -lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so -lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-boxplot-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so -lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so -lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-surface-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so -lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml -lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so -lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml -lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade -lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade -lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so -lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-%%SHORT_VER%%.a -lib/libgoffice-%%SHORT_VER%%.la -lib/libgoffice-%%SHORT_VER%%.so -lib/libgoffice-%%SHORT_VER%%.so.7 -libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc -%%DOCSDIR%%-%%SHORT_VER%%/GOComboBox.html -%%DOCSDIR%%-%%SHORT_VER%%/GOComponent.html -%%DOCSDIR%%-%%SHORT_VER%%/GOOptionMenu.html -%%DOCSDIR%%-%%SHORT_VER%%/GOPalette.html -%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoader.html -%%DOCSDIR%%-%%SHORT_VER%%/GOSelector.html -%%DOCSDIR%%-%%SHORT_VER%%/GOUndoUnary.html -%%DOCSDIR%%-%%SHORT_VER%%/GogDataAllocator.html -%%DOCSDIR%%-%%SHORT_VER%%/GogDataset.html -%%DOCSDIR%%-%%SHORT_VER%%/GogObject.html -%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedView.html -%%DOCSDIR%%-%%SHORT_VER%%/GogRegCurve.html -%%DOCSDIR%%-%%SHORT_VER%%/GogSmoothedCurve.html -%%DOCSDIR%%-%%SHORT_VER%%/GogStyledObject.html -%%DOCSDIR%%-%%SHORT_VER%%/GogView.html -%%DOCSDIR%%-%%SHORT_VER%%/ch01.html -%%DOCSDIR%%-%%SHORT_VER%%/ch02.html -%%DOCSDIR%%-%%SHORT_VER%%/ch03.html -%%DOCSDIR%%-%%SHORT_VER%%/ch04.html -%%DOCSDIR%%-%%SHORT_VER%%/ch05.html -%%DOCSDIR%%-%%SHORT_VER%%/ch06.html -%%DOCSDIR%%-%%SHORT_VER%%/ch07.html -%%DOCSDIR%%-%%SHORT_VER%%/ch08.html -%%DOCSDIR%%-%%SHORT_VER%%/ch09.html -%%DOCSDIR%%-%%SHORT_VER%%/ch10.html -%%DOCSDIR%%-%%SHORT_VER%%/ch11.html -%%DOCSDIR%%-%%SHORT_VER%%/ch12.html -%%DOCSDIR%%-%%SHORT_VER%%/ch13.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp -%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp2 -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cairo.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-charmap-sel.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cmd-context.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-color.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-color.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-pixmaps.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-text.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-complex.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-component-factory.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-data.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc-control.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-fft.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-file.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font-sel.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format-sel.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-geometry.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-glib-extras.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-gradient.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-libxml-extras.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-line.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-locale-sel.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-marker.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-math.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-path.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-pattern.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-loader-module.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-service.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-regression.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-rotation-sel.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-units.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis-line.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart-map.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-control-foocanvas.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-error-bar.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-graph.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid-line.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-guru.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-label.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-legend.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot-engine.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-renderer.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series-lines.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-style.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-theme.html -%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-trend-line.html -%%DOCSDIR%%-%%SHORT_VER%%/home.png -%%DOCSDIR%%-%%SHORT_VER%%/index.html -%%DOCSDIR%%-%%SHORT_VER%%/index.sgml -%%DOCSDIR%%-%%SHORT_VER%%/left.png -%%DOCSDIR%%-%%SHORT_VER%%/pt01.html -%%DOCSDIR%%-%%SHORT_VER%%/pt02.html -%%DOCSDIR%%-%%SHORT_VER%%/pt03.html -%%DOCSDIR%%-%%SHORT_VER%%/right.png -%%DOCSDIR%%-%%SHORT_VER%%/style.css -%%DOCSDIR%%-%%SHORT_VER%%/up.png -%%DATADIR%%/%%VERSION%%/glade/go-3d-rotation-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade -%%DATADIR%%/%%VERSION%%/glade/go-image-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade -%%DATADIR%%/%%VERSION%%/glade/gog-3d-box-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade -%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade -%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade -%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml -share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/oc/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo -share/pixmaps/goffice/%%VERSION%%/area.xpm -share/pixmaps/goffice/%%VERSION%%/bar-hboth.png -share/pixmaps/goffice/%%VERSION%%/bar-hminus.png -share/pixmaps/goffice/%%VERSION%%/bar-hplus.png -share/pixmaps/goffice/%%VERSION%%/bar-none.png -share/pixmaps/goffice/%%VERSION%%/bar-vboth.png -share/pixmaps/goffice/%%VERSION%%/bar-vminus.png -share/pixmaps/goffice/%%VERSION%%/bar-vplus.png -share/pixmaps/goffice/%%VERSION%%/bar.xpm -share/pixmaps/goffice/%%VERSION%%/bubble.xpm -share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png -share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_prob_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_surface_2_2.png -share/pixmaps/goffice/%%VERSION%%/color.xpm -share/pixmaps/goffice/%%VERSION%%/column.xpm -share/pixmaps/goffice/%%VERSION%%/contour.xpm -share/pixmaps/goffice/%%VERSION%%/dist.xpm -share/pixmaps/goffice/%%VERSION%%/doughnut.xpm -share/pixmaps/goffice/%%VERSION%%/dropbar.xpm -share/pixmaps/goffice/%%VERSION%%/linegraph.xpm -share/pixmaps/goffice/%%VERSION%%/minmax.xpm -share/pixmaps/goffice/%%VERSION%%/pie.xpm -share/pixmaps/goffice/%%VERSION%%/polar.png -share/pixmaps/goffice/%%VERSION%%/radar.xpm -share/pixmaps/goffice/%%VERSION%%/scatter.xpm -share/pixmaps/goffice/%%VERSION%%/stock.xpm -share/pixmaps/goffice/%%VERSION%%/surface.xpm -@dirrm share/pixmaps/goffice/%%VERSION%% -@dirrmtry share/pixmaps/goffice -@dirrm %%DATADIR%%/%%VERSION%%/patterns -@dirrm %%DATADIR%%/%%VERSION%%/glade -@dirrm %%DATADIR%%/%%VERSION%% -@dirrmtry %%DATADIR%% -@dirrm %%DOCSDIR%%-%%SHORT_VER%% -@dirrm lib/goffice/%%VERSION%%/plugins/smoothing -@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit -@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear -@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy -@dirrm lib/goffice/%%VERSION%%/plugins/plot_surface -@dirrm lib/goffice/%%VERSION%%/plugins/plot_radar -@dirrm lib/goffice/%%VERSION%%/plugins/plot_pie -@dirrm lib/goffice/%%VERSION%%/plugins/plot_distrib -@dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol -@dirrm lib/goffice/%%VERSION%%/plugins -@dirrm lib/goffice/%%VERSION%% -@dirrmtry lib/goffice -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/utils -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/ms-compat -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/math -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/gtk -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/graph -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/drawing -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/data -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/component -@dirrm include/libgoffice-%%SHORT_VER%%/goffice/app -@dirrm include/libgoffice-%%SHORT_VER%%/goffice -@dirrm include/libgoffice-%%SHORT_VER%% -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile deleted file mode 100644 index 707144eca..000000000 --- a/devel/goffice06/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: goffice -# Date created: 07 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= goffice -PORTVERSION= 0.6.5 -CATEGORIES= devel gnome -MASTER_SITES= GNOME - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GLib/GTK+ set of document centric objects and utilities - -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre - -NO_LATEST_LINK= yes - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ - libgsf_gnome libgnomeui ltverhack -USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION=${PORTVERSION} - -.include <bsd.port.mk> diff --git a/devel/goffice06/distinfo b/devel/goffice06/distinfo deleted file mode 100644 index 9415b8d01..000000000 --- a/devel/goffice06/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (goffice-0.6.5.tar.bz2) = ab0cf11995b7750f26112669cedf6707 -SHA256 (goffice-0.6.5.tar.bz2) = 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 -SIZE (goffice-0.6.5.tar.bz2) = 1993186 diff --git a/devel/goffice06/pkg-descr b/devel/goffice06/pkg-descr deleted file mode 100644 index 0d48f5052..000000000 --- a/devel/goffice06/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Goffice is a set of document centric components for GLib and GTK+. - -There are common operations for document centric applications that are -conceptually simple, but complex to implement fully. - - plugins - - load/save documents - - undo/redo - -Goffice provides a single library for performing such operations. - -WWW: http://live.gnome.org/libgoffice diff --git a/devel/goffice06/pkg-plist b/devel/goffice06/pkg-plist deleted file mode 100644 index 271e89099..000000000 --- a/devel/goffice06/pkg-plist +++ /dev/null @@ -1,508 +0,0 @@ -include/libgoffice-0.6/goffice/app/error-info.h -include/libgoffice-0.6/goffice/app/file.h -include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h -include/libgoffice-0.6/goffice/app/go-cmd-context.h -include/libgoffice-0.6/goffice/app/go-doc-control-impl.h -include/libgoffice-0.6/goffice/app/go-doc-control.h -include/libgoffice-0.6/goffice/app/go-doc-impl.h -include/libgoffice-0.6/goffice/app/go-doc.h -include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h -include/libgoffice-0.6/goffice/app/go-plugin-loader.h -include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h -include/libgoffice-0.6/goffice/app/go-plugin-service.h -include/libgoffice-0.6/goffice/app/go-plugin.h -include/libgoffice-0.6/goffice/app/goffice-app.h -include/libgoffice-0.6/goffice/app/io-context-priv.h -include/libgoffice-0.6/goffice/app/io-context.h -include/libgoffice-0.6/goffice/app/module-plugin-defs.h -include/libgoffice-0.6/goffice/component/go-component-factory.h -include/libgoffice-0.6/goffice/component/go-component.h -include/libgoffice-0.6/goffice/component/goffice-component.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h -include/libgoffice-0.6/goffice/data/go-data-impl.h -include/libgoffice-0.6/goffice/data/go-data-simple.h -include/libgoffice-0.6/goffice/data/go-data.h -include/libgoffice-0.6/goffice/data/goffice-data.h -include/libgoffice-0.6/goffice/drawing/god-anchor.h -include/libgoffice-0.6/goffice/drawing/god-default-attributes.h -include/libgoffice-0.6/goffice/drawing/god-drawing-group.h -include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h -include/libgoffice-0.6/goffice/drawing/god-drawing-view.h -include/libgoffice-0.6/goffice/drawing/god-drawing.h -include/libgoffice-0.6/goffice/drawing/god-image-store.h -include/libgoffice-0.6/goffice/drawing/god-image.h -include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h -include/libgoffice-0.6/goffice/drawing/god-property-table.h -include/libgoffice-0.6/goffice/drawing/god-shape.h -include/libgoffice-0.6/goffice/drawing/god-text-model.h -include/libgoffice-0.6/goffice/goffice-features.h -include/libgoffice-0.6/goffice/goffice.h -include/libgoffice-0.6/goffice/graph/goffice-graph.h -include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h -include/libgoffice-0.6/goffice/graph/gog-axis-line.h -include/libgoffice-0.6/goffice/graph/gog-axis.h -include/libgoffice-0.6/goffice/graph/gog-chart-impl.h -include/libgoffice-0.6/goffice/graph/gog-chart-map.h -include/libgoffice-0.6/goffice/graph/gog-chart.h -include/libgoffice-0.6/goffice/graph/gog-child-button.h -include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h -include/libgoffice-0.6/goffice/graph/gog-data-allocator.h -include/libgoffice-0.6/goffice/graph/gog-data-set.h -include/libgoffice-0.6/goffice/graph/gog-error-bar.h -include/libgoffice-0.6/goffice/graph/gog-graph-impl.h -include/libgoffice-0.6/goffice/graph/gog-graph.h -include/libgoffice-0.6/goffice/graph/gog-grid-line.h -include/libgoffice-0.6/goffice/graph/gog-grid.h -include/libgoffice-0.6/goffice/graph/gog-guru.h -include/libgoffice-0.6/goffice/graph/gog-label.h -include/libgoffice-0.6/goffice/graph/gog-legend.h -include/libgoffice-0.6/goffice/graph/gog-object-xml.h -include/libgoffice-0.6/goffice/graph/gog-object.h -include/libgoffice-0.6/goffice/graph/gog-outlined-object.h -include/libgoffice-0.6/goffice/graph/gog-plot-engine.h -include/libgoffice-0.6/goffice/graph/gog-plot-impl.h -include/libgoffice-0.6/goffice/graph/gog-plot.h -include/libgoffice-0.6/goffice/graph/gog-reg-curve.h -include/libgoffice-0.6/goffice/graph/gog-renderer.h -include/libgoffice-0.6/goffice/graph/gog-series-impl.h -include/libgoffice-0.6/goffice/graph/gog-series-lines.h -include/libgoffice-0.6/goffice/graph/gog-series.h -include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h -include/libgoffice-0.6/goffice/graph/gog-style.h -include/libgoffice-0.6/goffice/graph/gog-styled-object.h -include/libgoffice-0.6/goffice/graph/gog-theme.h -include/libgoffice-0.6/goffice/graph/gog-trend-line.h -include/libgoffice-0.6/goffice/graph/gog-view.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h -include/libgoffice-0.6/goffice/gtk/go-color-group.h -include/libgoffice-0.6/goffice/gtk/go-color-palette.h -include/libgoffice-0.6/goffice/gtk/go-color-selector.h -include/libgoffice-0.6/goffice/gtk/go-combo-box.h -include/libgoffice-0.6/goffice/gtk/go-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-font-sel.h -include/libgoffice-0.6/goffice/gtk/go-format-sel.h -include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h -include/libgoffice-0.6/goffice/gtk/go-graph-widget.h -include/libgoffice-0.6/goffice/gtk/go-line-selector.h -include/libgoffice-0.6/goffice/gtk/go-locale-sel.h -include/libgoffice-0.6/goffice/gtk/go-marker-selector.h -include/libgoffice-0.6/goffice/gtk/go-optionmenu.h -include/libgoffice-0.6/goffice/gtk/go-palette.h -include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h -include/libgoffice-0.6/goffice/gtk/go-pixbuf.h -include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h -include/libgoffice-0.6/goffice/gtk/go-selector.h -include/libgoffice-0.6/goffice/gtk/goffice-gtk.h -include/libgoffice-0.6/goffice/math/go-complex.h -include/libgoffice-0.6/goffice/math/go-cspline.h -include/libgoffice-0.6/goffice/math/go-fft.h -include/libgoffice-0.6/goffice/math/go-math.h -include/libgoffice-0.6/goffice/math/go-rangefunc.h -include/libgoffice-0.6/goffice/math/go-regression.h -include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h -include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h -include/libgoffice-0.6/goffice/utils/datetime.h -include/libgoffice-0.6/goffice/utils/go-cairo.h -include/libgoffice-0.6/goffice/utils/go-color.h -include/libgoffice-0.6/goffice/utils/go-file.h -include/libgoffice-0.6/goffice/utils/go-font.h -include/libgoffice-0.6/goffice/utils/go-format.h -include/libgoffice-0.6/goffice/utils/go-geometry.h -include/libgoffice-0.6/goffice/utils/go-glib-extras.h -include/libgoffice-0.6/goffice/utils/go-gradient.h -include/libgoffice-0.6/goffice/utils/go-image.h -include/libgoffice-0.6/goffice/utils/go-libxml-extras.h -include/libgoffice-0.6/goffice/utils/go-line.h -include/libgoffice-0.6/goffice/utils/go-locale.h -include/libgoffice-0.6/goffice/utils/go-marker.h -include/libgoffice-0.6/goffice/utils/go-pango-extras.h -include/libgoffice-0.6/goffice/utils/go-path.h -include/libgoffice-0.6/goffice/utils/go-pattern.h -include/libgoffice-0.6/goffice/utils/go-undo.h -include/libgoffice-0.6/goffice/utils/go-units.h -include/libgoffice-0.6/goffice/utils/goffice-utils.h -include/libgoffice-0.6/goffice/utils/regutf8.h -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so -lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.a -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.la -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.so -lib/goffice/%%VERSION%%/plugins/plot_boxes/gog-boxplot-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_boxes/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so -lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so -lib/goffice/%%VERSION%%/plugins/plot_surface/gog-contour-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so -lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml -lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so -lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml -lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade -lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade -lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so -lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-0.6.a -lib/libgoffice-0.6.la -lib/libgoffice-0.6.so -lib/libgoffice-0.6.so.6 -libdata/pkgconfig/libgoffice-0.6.pc -share/doc/goffice-0.6/GOComboBox.html -share/doc/goffice-0.6/GOComponent.html -share/doc/goffice-0.6/GOOptionMenu.html -share/doc/goffice-0.6/GOPalette.html -share/doc/goffice-0.6/GOPluginLoader.html -share/doc/goffice-0.6/GOSelector.html -share/doc/goffice-0.6/GOUndoUnary.html -share/doc/goffice-0.6/GogDataAllocator.html -share/doc/goffice-0.6/GogDataset.html -share/doc/goffice-0.6/GogObject.html -share/doc/goffice-0.6/GogOutlinedView.html -share/doc/goffice-0.6/GogRegCurve.html -share/doc/goffice-0.6/GogSmoothedCurve.html -share/doc/goffice-0.6/GogStyledObject.html -share/doc/goffice-0.6/GogView.html -share/doc/goffice-0.6/ch01.html -share/doc/goffice-0.6/ch02.html -share/doc/goffice-0.6/ch03.html -share/doc/goffice-0.6/ch04.html -share/doc/goffice-0.6/ch05.html -share/doc/goffice-0.6/ch06.html -share/doc/goffice-0.6/ch07.html -share/doc/goffice-0.6/ch08.html -share/doc/goffice-0.6/ch09.html -share/doc/goffice-0.6/ch10.html -share/doc/goffice-0.6/ch11.html -share/doc/goffice-0.6/ch12.html -share/doc/goffice-0.6/ch13.html -share/doc/goffice-0.6/goffice-0.6.devhelp -share/doc/goffice-0.6/goffice-0.6.devhelp2 -share/doc/goffice-0.6/goffice-06-go-cairo.html -share/doc/goffice-0.6/goffice-06-go-charmap-sel.html -share/doc/goffice-0.6/goffice-06-go-cmd-context.html -share/doc/goffice-0.6/goffice-06-go-color.html -share/doc/goffice-0.6/goffice-06-go-combo-color.html -share/doc/goffice-0.6/goffice-06-go-combo-pixmaps.html -share/doc/goffice-0.6/goffice-06-go-combo-text.html -share/doc/goffice-0.6/goffice-06-go-complex.html -share/doc/goffice-0.6/goffice-06-go-component-factory.html -share/doc/goffice-0.6/goffice-06-go-data.html -share/doc/goffice-0.6/goffice-06-go-doc-control.html -share/doc/goffice-0.6/goffice-06-go-doc.html -share/doc/goffice-0.6/goffice-06-go-fft.html -share/doc/goffice-0.6/goffice-06-go-file.html -share/doc/goffice-0.6/goffice-06-go-font-sel.html -share/doc/goffice-0.6/goffice-06-go-font.html -share/doc/goffice-0.6/goffice-06-go-format-sel.html -share/doc/goffice-0.6/goffice-06-go-format.html -share/doc/goffice-0.6/goffice-06-go-geometry.html -share/doc/goffice-0.6/goffice-06-go-glib-extras.html -share/doc/goffice-0.6/goffice-06-go-gradient.html -share/doc/goffice-0.6/goffice-06-go-libxml-extras.html -share/doc/goffice-0.6/goffice-06-go-line.html -share/doc/goffice-0.6/goffice-06-go-locale-sel.html -share/doc/goffice-0.6/goffice-06-go-marker.html -share/doc/goffice-0.6/goffice-06-go-math.html -share/doc/goffice-0.6/goffice-06-go-path.html -share/doc/goffice-0.6/goffice-06-go-pattern.html -share/doc/goffice-0.6/goffice-06-go-plugin-loader-module.html -share/doc/goffice-0.6/goffice-06-go-plugin-service.html -share/doc/goffice-0.6/goffice-06-go-plugin.html -share/doc/goffice-0.6/goffice-06-go-regression.html -share/doc/goffice-0.6/goffice-06-go-rotation-sel.html -share/doc/goffice-0.6/goffice-06-go-units.html -share/doc/goffice-0.6/goffice-06-gog-axis-line.html -share/doc/goffice-0.6/goffice-06-gog-axis.html -share/doc/goffice-0.6/goffice-06-gog-chart-map.html -share/doc/goffice-0.6/goffice-06-gog-chart.html -share/doc/goffice-0.6/goffice-06-gog-control-foocanvas.html -share/doc/goffice-0.6/goffice-06-gog-error-bar.html -share/doc/goffice-0.6/goffice-06-gog-graph.html -share/doc/goffice-0.6/goffice-06-gog-grid-line.html -share/doc/goffice-0.6/goffice-06-gog-grid.html -share/doc/goffice-0.6/goffice-06-gog-guru.html -share/doc/goffice-0.6/goffice-06-gog-label.html -share/doc/goffice-0.6/goffice-06-gog-legend.html -share/doc/goffice-0.6/goffice-06-gog-plot-engine.html -share/doc/goffice-0.6/goffice-06-gog-plot.html -share/doc/goffice-0.6/goffice-06-gog-renderer.html -share/doc/goffice-0.6/goffice-06-gog-series-lines.html -share/doc/goffice-0.6/goffice-06-gog-series.html -share/doc/goffice-0.6/goffice-06-gog-style.html -share/doc/goffice-0.6/goffice-06-gog-theme.html -share/doc/goffice-0.6/goffice-06-gog-trend-line.html -share/doc/goffice-0.6/home.png -share/doc/goffice-0.6/index.html -share/doc/goffice-0.6/index.sgml -share/doc/goffice-0.6/left.png -share/doc/goffice-0.6/pt01.html -share/doc/goffice-0.6/pt02.html -share/doc/goffice-0.6/pt03.html -share/doc/goffice-0.6/right.png -share/doc/goffice-0.6/style.css -share/doc/goffice-0.6/up.png -%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade -%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade -%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade -%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade -%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade -%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade -%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade -%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml -share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/oc/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo -share/pixmaps/goffice/%%VERSION%%/area.xpm -share/pixmaps/goffice/%%VERSION%%/bar-hboth.png -share/pixmaps/goffice/%%VERSION%%/bar-hminus.png -share/pixmaps/goffice/%%VERSION%%/bar-hplus.png -share/pixmaps/goffice/%%VERSION%%/bar-none.png -share/pixmaps/goffice/%%VERSION%%/bar-vboth.png -share/pixmaps/goffice/%%VERSION%%/bar-vminus.png -share/pixmaps/goffice/%%VERSION%%/bar-vplus.png -share/pixmaps/goffice/%%VERSION%%/bar.xpm -share/pixmaps/goffice/%%VERSION%%/boxplot.xpm -share/pixmaps/goffice/%%VERSION%%/bubble.xpm -share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png -share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png -share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png -share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png -share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png -share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png -share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png -share/pixmaps/goffice/%%VERSION%%/color.xpm -share/pixmaps/goffice/%%VERSION%%/column.xpm -share/pixmaps/goffice/%%VERSION%%/doughnut.xpm -share/pixmaps/goffice/%%VERSION%%/dropbar.xpm -share/pixmaps/goffice/%%VERSION%%/hist.xpm -share/pixmaps/goffice/%%VERSION%%/linegraph.xpm -share/pixmaps/goffice/%%VERSION%%/minmax.xpm -share/pixmaps/goffice/%%VERSION%%/pie.xpm -share/pixmaps/goffice/%%VERSION%%/polar.png -share/pixmaps/goffice/%%VERSION%%/radar.xpm -share/pixmaps/goffice/%%VERSION%%/scatter.xpm -share/pixmaps/goffice/%%VERSION%%/stock.xpm -share/pixmaps/goffice/%%VERSION%%/surface.xpm -@dirrm share/pixmaps/goffice/%%VERSION%% -@dirrm share/pixmaps/goffice -@dirrm %%DATADIR%%/%%VERSION%%/patterns -@dirrm %%DATADIR%%/%%VERSION%%/glade -@dirrm %%DATADIR%%/%%VERSION%% -@dirrm %%DATADIR%% -@dirrm share/doc/goffice-0.6 -@dirrm lib/goffice/%%VERSION%%/plugins/smoothing -@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit -@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear -@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy -@dirrm lib/goffice/%%VERSION%%/plugins/plot_surface -@dirrm lib/goffice/%%VERSION%%/plugins/plot_radar -@dirrm lib/goffice/%%VERSION%%/plugins/plot_pie -@dirrm lib/goffice/%%VERSION%%/plugins/plot_boxes -@dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol -@dirrm lib/goffice/%%VERSION%%/plugins -@dirrm lib/goffice/%%VERSION%% -@dirrmtry lib/goffice -@dirrm include/libgoffice-0.6/goffice/utils -@dirrm include/libgoffice-0.6/goffice/ms-compat -@dirrm include/libgoffice-0.6/goffice/math -@dirrm include/libgoffice-0.6/goffice/gtk -@dirrm include/libgoffice-0.6/goffice/graph -@dirrm include/libgoffice-0.6/goffice/drawing -@dirrm include/libgoffice-0.6/goffice/data -@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas -@dirrm include/libgoffice-0.6/goffice/cut-n-paste -@dirrm include/libgoffice-0.6/goffice/component -@dirrm include/libgoffice-0.6/goffice/app -@dirrm include/libgoffice-0.6/goffice -@dirrm include/libgoffice-0.6 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile deleted file mode 100644 index e1e5da9e1..000000000 --- a/devel/gvfs/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# New ports collection makefile for: gvfs -# Date created: 2007-11-06 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.36 2008/11/24 20:11:35 mezz Exp $ -# - -PORTNAME= gvfs -PORTVERSION= 1.0.3 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME virtual file system - -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ - hal.1:${PORTSDIR}/sysutils/hal \ - soup-2.4.1:${PORTSDIR}/devel/libsoup \ - gnome-keyring:${PORTSDIR}/security/gnome-keyring \ - avahi-client.3:${PORTSDIR}/net/avahi-app -RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount - -USE_BZIP2= yes -USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2 -USE_GMAKE= yes -USE_GETTEXT= yes -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-obexftp -OPTIONS= FUSE "Enable fuse" on \ - SAMBA "Enable Samba" on \ - GPHOTO2 "Enable Gphoto 2 camera support" on \ - CDDA "Enable CDDA" on - -.include <bsd.port.pre.mk> - -.if defined(WITH_FUSE) -LIB_DEPENDS+= fuse.2:${PORTSDIR}/sysutils/fusefs-libs -RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod -PLIST_SUB+= FUSE="" -.else -CONFIGURE_ARGS+= --disable-fuse -PLIST_SUB+= FUSE="@comment " -.endif - -.if defined(WITH_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient -PLIST_SUB+= SMB="" -.else -CONFIGURE_ARGS+= --disable-samba -PLIST_SUB+= SMB="@comment " -.endif - -.if defined(WITH_CDDA) -LIB_DEPENDS+= cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio -PLIST_SUB+= CDDA="" -.else -CONFIGURE_ARGS+= --disable-cdda -PLIST_SUB+= CDDA="@comment " -.endif - -.if defined(WITH_GPHOTO2) -LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 -PLIST_SUB+= GPHOTO2="" -.else -CONFIGURE_ARGS+= --disable-gphoto2 -PLIST_SUB+= GPHOTO2="@comment " -.endif - -.if ${OSVERSION} < 602112 -CONFIGURE_ARGS+= --disable-archive -PLIST_SUB+= ARCHIVE="@comment " -.else -PLIST_SUB+= ARCHIVE="" -.endif - -.include <bsd.port.post.mk> diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo deleted file mode 100644 index a0397c2d0..000000000 --- a/devel/gvfs/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gvfs-1.0.3.tar.bz2) = a41e8b7d99e390cef8312f7ce5f312a5 -SHA256 (gnome2/gvfs-1.0.3.tar.bz2) = 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd -SIZE (gnome2/gvfs-1.0.3.tar.bz2) = 920742 diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in deleted file mode 100644 index 658cccd6a..000000000 --- a/devel/gvfs/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400 -+++ Makefile.in 2008-07-22 23:18:24.000000000 -0400 -@@ -269,7 +269,6 @@ SUBDIRS = \ - gconf \ - po \ - programs \ -- test \ - $(NULL) - - EXTRA_DIST = \ diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in deleted file mode 100644 index ffbfd5878..000000000 --- a/devel/gvfs/files/patch-client_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500 -+++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500 -@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ - FUSE_CFLAGS = @FUSE_CFLAGS@ --FUSE_LIBS = @FUSE_LIBS@ -+FUSE_LIBS = @FUSE_LIBS@ -lfuse - GCONF_CFLAGS = @GCONF_CFLAGS@ - GCONF_LIBS = @GCONF_LIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c deleted file mode 100644 index 3733aa7e3..000000000 --- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c +++ /dev/null @@ -1,12 +0,0 @@ ---- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500 -+++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500 -@@ -28,7 +28,9 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __linux__ - #include <sys/vfs.h> -+#endif - #include <sys/time.h> - #include <unistd.h> - #include <stdlib.h> diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure deleted file mode 100644 index d922ddd45..000000000 --- a/devel/gvfs/files/patch-configure +++ /dev/null @@ -1,93 +0,0 @@ ---- configure.orig 2008-03-28 17:23:44.000000000 -0400 -+++ configure 2008-03-28 17:24:02.000000000 -0400 -@@ -24617,7 +24617,7 @@ if test "x$enable_http" != "xno"; then - msg_http=yes - fi - -- if test "x$msg_http" == "xyes"; then -+ if test "x$msg_http" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for HTTP" >&5 -@@ -24885,7 +24885,7 @@ if test "x$enable_fuse" != "xno"; then - msg_fuse=yes - fi - -- if test "x$msg_fuse" == "xyes"; then -+ if test "x$msg_fuse" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for FUSE" >&5 -@@ -25036,7 +25036,7 @@ if test "x$enable_gconf" != "xno"; then - msg_gconf=yes - fi - -- if test "x$msg_gconf" == "xyes"; then -+ if test "x$msg_gconf" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for GCONF" >&5 -@@ -25189,7 +25189,7 @@ if test "x$enable_hal" != "xno"; then - msg_hal=yes - fi - -- if test "x$msg_hal" == "xyes"; then -+ if test "x$msg_hal" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for HAL" >&5 -@@ -25371,7 +25371,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de - have_hal_fast_init=yes - fi - -- if test "x$have_hal_fast_init" == "xyes"; then -+ if test "x$have_hal_fast_init" = "xyes"; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_HAL_FAST_INIT 1 -@@ -25412,7 +25412,7 @@ if test "x$enable_cdda" != "xno"; then - msg_cdda=yes - fi - -- if test "x$msg_cdda" == "xyes"; then -+ if test "x$msg_cdda" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for CDDA" >&5 -@@ -25772,7 +25772,7 @@ else - fi - - -- if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then -+ if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for OBEXFTP" >&5 -@@ -25936,13 +25936,16 @@ fi - *-linux*) - use_gphoto2=yes - ;; -+ *-freebsd*) -+ use_gphoto2=yes -+ ;; - *) - use_gphoto2=no - ;; - esac - -- if test "x$msg_gphoto2" == "xyes"; then -- if test "x$use_gphoto2" == "xyes"; then -+ if test "x$msg_gphoto2" = "xyes"; then -+ if test "x$use_gphoto2" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for GPHOTO2" >&5 -@@ -26098,7 +26101,7 @@ if test "x$enable_keyring" != "xno"; the - msg_keyring=yes - fi - -- if test "x$msg_keyring" == "xyes"; then -+ if test "x$msg_keyring" = "xyes"; then - - pkg_failed=no - { echo "$as_me:$LINENO: checking for KEYRING" >&5 diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c deleted file mode 100644 index 54c421687..000000000 --- a/devel/gvfs/files/patch-daemon_gvfswritechannel.c +++ /dev/null @@ -1,10 +0,0 @@ ---- daemon/gvfswritechannel.c.orig 2007-12-22 18:50:10.000000000 -0500 -+++ daemon/gvfswritechannel.c 2007-12-22 18:50:20.000000000 -0500 -@@ -30,6 +30,7 @@ - #include <sys/un.h> - #include <unistd.h> - #include <fcntl.h> -+#include <string.h> - - #include <glib.h> - #include <glib-object.h> diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c deleted file mode 100644 index 6686b28ae..000000000 --- a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c +++ /dev/null @@ -1,14 +0,0 @@ ---- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400 -+++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400 -@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor * - return NULL; - - /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ -+#ifdef __FreeBSD__ -+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); -+#else - device_path = hal_device_get_property_string (drive_device, "linux.device_file"); -+#endif - if (strlen (device_path) == 0) - device_path = NULL; - diff --git a/devel/gvfs/pkg-descr b/devel/gvfs/pkg-descr deleted file mode 100644 index f6ea31130..000000000 --- a/devel/gvfs/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -GVFS allows applications and users to treat any number of file system -concepts as a part of the local filesystem. With GVFS, filesystems across -the internet, on connected devices, and in multiple formats are as simple -to access (and write code for) as any directory on the local machine. - -WWW: http://www.gnome.org/ diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist deleted file mode 100644 index 8670f6588..000000000 --- a/devel/gvfs/pkg-plist +++ /dev/null @@ -1,140 +0,0 @@ -bin/gvfs-cat -bin/gvfs-copy -bin/gvfs-info -bin/gvfs-less -bin/gvfs-ls -bin/gvfs-mkdir -bin/gvfs-monitor-dir -bin/gvfs-monitor-file -bin/gvfs-mount -bin/gvfs-move -bin/gvfs-open -bin/gvfs-rename -bin/gvfs-rm -bin/gvfs-save -bin/gvfs-trash -bin/gvfs-tree -etc/profile.d/gvfs-bash-completion.sh -include/gvfs-client/gvfs/gvfsurimapper.h -include/gvfs-client/gvfs/gvfsuriutils.h -lib/gio/modules/libgiogconf.la -lib/gio/modules/libgiogconf.so -lib/gio/modules/libgioremote-volume-monitor.la -lib/gio/modules/libgioremote-volume-monitor.so -lib/gio/modules/libgvfsdbus.la -lib/gio/modules/libgvfsdbus.so -lib/libgvfscommon.la -lib/libgvfscommon.so -lib/libgvfscommon.so.0 -%%FUSE%%libexec/gvfs-fuse-daemon -%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor -libexec/gvfs-hal-volume-monitor -libexec/gvfsd -%%ARCHIVE%%libexec/gvfsd-archive -libexec/gvfsd-burn -%%CDDA%%libexec/gvfsd-cdda -libexec/gvfsd-computer -libexec/gvfsd-dav -libexec/gvfsd-dnssd -libexec/gvfsd-ftp -%%GPHOTO2%%libexec/gvfsd-gphoto2 -libexec/gvfsd-http -libexec/gvfsd-localtest -libexec/gvfsd-network -libexec/gvfsd-sftp -%%SMB%%libexec/gvfsd-smb -%%SMB%%libexec/gvfsd-smb-browse -libexec/gvfsd-trash -share/dbus-1/services/gvfs-daemon.service -%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service -share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service -%%ARCHIVE%%share/gvfs/mounts/archive.mount -share/gvfs/mounts/burn.mount -%%CDDA%%share/gvfs/mounts/cdda.mount -share/gvfs/mounts/computer.mount -share/gvfs/mounts/dav.mount -share/gvfs/mounts/dns-sd.mount -share/gvfs/mounts/ftp.mount -%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount -share/gvfs/mounts/http.mount -share/gvfs/mounts/localtest.mount -share/gvfs/mounts/network.mount -share/gvfs/mounts/sftp.mount -%%SMB%%share/gvfs/mounts/smb-browse.mount -%%SMB%%share/gvfs/mounts/smb.mount -share/gvfs/mounts/trash.mount -%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor -share/gvfs/remote-volume-monitors/hal.monitor -share/locale/ar/LC_MESSAGES/gvfs.mo -share/locale/be@latin/LC_MESSAGES/gvfs.mo -share/locale/bg/LC_MESSAGES/gvfs.mo -share/locale/bn_IN/LC_MESSAGES/gvfs.mo -share/locale/ca/LC_MESSAGES/gvfs.mo -share/locale/cs/LC_MESSAGES/gvfs.mo -share/locale/da/LC_MESSAGES/gvfs.mo -share/locale/de/LC_MESSAGES/gvfs.mo -share/locale/el/LC_MESSAGES/gvfs.mo -share/locale/en_GB/LC_MESSAGES/gvfs.mo -share/locale/es/LC_MESSAGES/gvfs.mo -share/locale/et/LC_MESSAGES/gvfs.mo -share/locale/eu/LC_MESSAGES/gvfs.mo -share/locale/fi/LC_MESSAGES/gvfs.mo -share/locale/fr/LC_MESSAGES/gvfs.mo -share/locale/ga/LC_MESSAGES/gvfs.mo -share/locale/gl/LC_MESSAGES/gvfs.mo -share/locale/gu/LC_MESSAGES/gvfs.mo -share/locale/he/LC_MESSAGES/gvfs.mo -share/locale/hi/LC_MESSAGES/gvfs.mo -share/locale/hu/LC_MESSAGES/gvfs.mo -share/locale/it/LC_MESSAGES/gvfs.mo -share/locale/ja/LC_MESSAGES/gvfs.mo -share/locale/kn/LC_MESSAGES/gvfs.mo -share/locale/ko/LC_MESSAGES/gvfs.mo -share/locale/ku/LC_MESSAGES/gvfs.mo -share/locale/lt/LC_MESSAGES/gvfs.mo -share/locale/mk/LC_MESSAGES/gvfs.mo -share/locale/ml/LC_MESSAGES/gvfs.mo -share/locale/mr/LC_MESSAGES/gvfs.mo -share/locale/nb/LC_MESSAGES/gvfs.mo -share/locale/nl/LC_MESSAGES/gvfs.mo -share/locale/nn/LC_MESSAGES/gvfs.mo -share/locale/pa/LC_MESSAGES/gvfs.mo -share/locale/pl/LC_MESSAGES/gvfs.mo -share/locale/pt/LC_MESSAGES/gvfs.mo -share/locale/pt_BR/LC_MESSAGES/gvfs.mo -share/locale/ru/LC_MESSAGES/gvfs.mo -share/locale/sk/LC_MESSAGES/gvfs.mo -share/locale/sl/LC_MESSAGES/gvfs.mo -share/locale/sq/LC_MESSAGES/gvfs.mo -share/locale/sr/LC_MESSAGES/gvfs.mo -share/locale/sr@latin/LC_MESSAGES/gvfs.mo -share/locale/sv/LC_MESSAGES/gvfs.mo -share/locale/ta/LC_MESSAGES/gvfs.mo -share/locale/te/LC_MESSAGES/gvfs.mo -share/locale/th/LC_MESSAGES/gvfs.mo -share/locale/tr/LC_MESSAGES/gvfs.mo -share/locale/uk/LC_MESSAGES/gvfs.mo -share/locale/vi/LC_MESSAGES/gvfs.mo -share/locale/zh_CN/LC_MESSAGES/gvfs.mo -share/locale/zh_HK/LC_MESSAGES/gvfs.mo -share/locale/zh_TW/LC_MESSAGES/gvfs.mo -@dirrm share/gvfs/remote-volume-monitors -@dirrm share/gvfs/mounts -@dirrm share/gvfs -@dirrm include/gvfs-client/gvfs -@dirrm include/gvfs-client -@dirrmtry etc/profile.d -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile deleted file mode 100644 index 62587d1a8..000000000 --- a/devel/libbonobo/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: libbonobo -# Date Created: 14 February 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.75 2008/08/19 11:48:34 kwm Exp $ -# - -PORTNAME= libbonobo -PORTVERSION= 2.24.0 -PORTREVISION?= 0 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A component and compound document system for GNOME2 - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib - -USE_GMAKE= yes -USE_BISON= build -USE_GETTEXT= yes -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -USE_PERL5= yes -USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale - -MAN1= bonobo-activation-server.1 - -.include <bsd.port.mk> - -.endif diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo deleted file mode 100644 index 5ab03dda7..000000000 --- a/devel/libbonobo/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libbonobo-2.24.0.tar.bz2) = b9dd7fcd377945b227db393ac4fa3c37 -SHA256 (gnome2/libbonobo-2.24.0.tar.bz2) = bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55 -SIZE (gnome2/libbonobo-2.24.0.tar.bz2) = 1455370 diff --git a/devel/libbonobo/files/patch-Makefile.in b/devel/libbonobo/files/patch-Makefile.in deleted file mode 100644 index e8a60bd28..000000000 --- a/devel/libbonobo/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed May 7 13:42:52 2003 -+++ Makefile.in Wed May 7 13:43:30 2003 -@@ -149,7 +149,7 @@ - SUBDIRS = \ - idl bonobo-activation bonobo \ - activation-server monikers \ -- utils samples tests doc po -+ utils samples doc po - - - libincludedir = $(includedir)/libbonobo-2.0 diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in deleted file mode 100644 index 45fc8fc1e..000000000 --- a/devel/libbonobo/files/patch-server::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- activation-server/Makefile.in.orig Fri Aug 19 16:24:14 2005 -+++ activation-server/Makefile.in Fri Aug 19 16:25:12 2005 -@@ -225,7 +225,7 @@ - -I$(top_builddir)/bonobo-activation \ - -I$(top_srcdir)/bonobo-activation \ - -DPREFIX=\""$(prefix)"\" \ -- -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \ -+ -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \ - -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ - $(SERVER_CFLAGS) \ - -DSERVER_CONFDIR=\"$(sysconfdir)\" \ diff --git a/devel/libbonobo/files/patch-server::activation-server-main.c b/devel/libbonobo/files/patch-server::activation-server-main.c deleted file mode 100644 index 0f7e7cd3f..000000000 --- a/devel/libbonobo/files/patch-server::activation-server-main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- activation-server/activation-server-main.c.orig Fri Apr 15 20:37:07 2005 -+++ activation-server/activation-server-main.c Fri Aug 19 16:27:59 2005 -@@ -197,7 +197,7 @@ build_src_dir (void) - g_string_append (gnome_od_source_dir, - gnome_dirs[i]); - g_string_append (gnome_od_source_dir, -- "/lib/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); -+ "/libdata/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); - } - g_strfreev (gnome_dirs); - g_string_append (real_od_source_dir, diff --git a/devel/libbonobo/files/patch-utils::bonobo-slay.in b/devel/libbonobo/files/patch-utils::bonobo-slay.in deleted file mode 100644 index 44212a041..000000000 --- a/devel/libbonobo/files/patch-utils::bonobo-slay.in +++ /dev/null @@ -1,21 +0,0 @@ ---- utils/bonobo-slay.in.orig Mon Mar 11 12:16:43 2002 -+++ utils/bonobo-slay.in Tue Apr 2 18:30:30 2002 -@@ -56,15 +56,15 @@ - - # get Bonobo files - # --@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" ); -+@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" ); - foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) { - if (-d $dir) { - push @bonobo_dirs, $dir; - } - } - foreach $dir (split(':', $ENV{'GNOME2_PATH'})) { -- if (-d "$dir/lib/bonobo/servers") { -- push @bonobo_dirs, "$dir/lib/bonobo/servers"; -+ if (-d "$dir/libdata/bonobo/servers") { -+ push @bonobo_dirs, "$dir/libdata/bonobo/servers"; - } - } - diff --git a/devel/libbonobo/pkg-descr b/devel/libbonobo/pkg-descr deleted file mode 100644 index c9890ddba..000000000 --- a/devel/libbonobo/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Bonobo is a set of language- and system-independent CORBA interfaces -for creating reusable components and controls, and for creating -compound documents. - -WWW: http://www.gnome.org/ diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist deleted file mode 100644 index 6242f7f60..000000000 --- a/devel/libbonobo/pkg-plist +++ /dev/null @@ -1,218 +0,0 @@ -bin/activation-client -bin/bonobo-slay -bin/echo-client-2 -etc/bonobo-activation/bonobo-activation-config.xml -include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h -include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h -include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-mime.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h -include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h -include/libbonobo-2.0/bonobo/Bonobo.h -include/libbonobo-2.0/bonobo/bonobo-app-client.h -include/libbonobo-2.0/bonobo/bonobo-application.h -include/libbonobo-2.0/bonobo/bonobo-arg.h -include/libbonobo-2.0/bonobo/bonobo-context.h -include/libbonobo-2.0/bonobo/bonobo-event-source.h -include/libbonobo-2.0/bonobo/bonobo-exception.h -include/libbonobo-2.0/bonobo/bonobo-foreign-object.h -include/libbonobo-2.0/bonobo/bonobo-generic-factory.h -include/libbonobo-2.0/bonobo/bonobo-i18n.h -include/libbonobo-2.0/bonobo/bonobo-item-container.h -include/libbonobo-2.0/bonobo/bonobo-item-handler.h -include/libbonobo-2.0/bonobo/bonobo-listener.h -include/libbonobo-2.0/bonobo/bonobo-macros.h -include/libbonobo-2.0/bonobo/bonobo-main.h -include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h -include/libbonobo-2.0/bonobo/bonobo-moniker-simple.h -include/libbonobo-2.0/bonobo/bonobo-moniker-util.h -include/libbonobo-2.0/bonobo/bonobo-moniker.h -include/libbonobo-2.0/bonobo/bonobo-object.h -include/libbonobo-2.0/bonobo/bonobo-persist-client.h -include/libbonobo-2.0/bonobo/bonobo-persist-file.h -include/libbonobo-2.0/bonobo/bonobo-persist-stream.h -include/libbonobo-2.0/bonobo/bonobo-persist.h -include/libbonobo-2.0/bonobo/bonobo-property-bag-client.h -include/libbonobo-2.0/bonobo/bonobo-property-bag.h -include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h -include/libbonobo-2.0/bonobo/bonobo-storage-memory.h -include/libbonobo-2.0/bonobo/bonobo-storage.h -include/libbonobo-2.0/bonobo/bonobo-stream-client.h -include/libbonobo-2.0/bonobo/bonobo-stream-memory.h -include/libbonobo-2.0/bonobo/bonobo-stream.h -include/libbonobo-2.0/bonobo/bonobo-types.h -include/libbonobo-2.0/bonobo/bonobo-xobject.h -include/libbonobo-2.0/libbonobo.h -lib/bonobo-2.0/samples/bonobo-echo-2 -lib/bonobo/monikers/libmoniker_std_2.a -lib/bonobo/monikers/libmoniker_std_2.la -lib/bonobo/monikers/libmoniker_std_2.so -lib/libbonobo-2.a -lib/libbonobo-2.la -lib/libbonobo-2.so -lib/libbonobo-2.so.0 -lib/libbonobo-activation.a -lib/libbonobo-activation.la -lib/libbonobo-activation.so -lib/libbonobo-activation.so.4 -lib/orbit-2.0/Bonobo_module.a -lib/orbit-2.0/Bonobo_module.la -lib/orbit-2.0/Bonobo_module.so -libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server -libdata/bonobo/servers/Bonobo_Moniker_std.server -libdata/bonobo/servers/Bonobo_Sample_Echo.server -libdata/pkgconfig/bonobo-activation-2.0.pc -libdata/pkgconfig/libbonobo-2.0.pc -libexec/bonobo-activation-server -sbin/bonobo-activation-sysconf -share/idl/bonobo-2.0/Bonobo.idl -share/idl/bonobo-2.0/Bonobo_Application.idl -share/idl/bonobo-2.0/Bonobo_Canvas.idl -share/idl/bonobo-2.0/Bonobo_Clipboard.idl -share/idl/bonobo-2.0/Bonobo_Context.idl -share/idl/bonobo-2.0/Bonobo_Control.idl -share/idl/bonobo-2.0/Bonobo_Embeddable.idl -share/idl/bonobo-2.0/Bonobo_Exception.idl -share/idl/bonobo-2.0/Bonobo_Gdk.idl -share/idl/bonobo-2.0/Bonobo_ItemContainer.idl -share/idl/bonobo-2.0/Bonobo_Listener.idl -share/idl/bonobo-2.0/Bonobo_Moniker.idl -share/idl/bonobo-2.0/Bonobo_Persist.idl -share/idl/bonobo-2.0/Bonobo_Print.idl -share/idl/bonobo-2.0/Bonobo_Property.idl -share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl -share/idl/bonobo-2.0/Bonobo_Storage.idl -share/idl/bonobo-2.0/Bonobo_UI.idl -share/idl/bonobo-2.0/Bonobo_Zoomable.idl -share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl -share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl -share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl -share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl -share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl -share/locale/am/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo -share/locale/as/LC_MESSAGES/libbonobo-2.0.mo -share/locale/az/LC_MESSAGES/libbonobo-2.0.mo -share/locale/be/LC_MESSAGES/libbonobo-2.0.mo -share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo -share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo -share/locale/bn_IN/LC_MESSAGES/libbonobo-2.0.mo -share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo -share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo -share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo -share/locale/da/LC_MESSAGES/libbonobo-2.0.mo -share/locale/de/LC_MESSAGES/libbonobo-2.0.mo -share/locale/dz/LC_MESSAGES/libbonobo-2.0.mo -share/locale/el/LC_MESSAGES/libbonobo-2.0.mo -share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo -share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo -share/locale/eo/LC_MESSAGES/libbonobo-2.0.mo -share/locale/es/LC_MESSAGES/libbonobo-2.0.mo -share/locale/et/LC_MESSAGES/libbonobo-2.0.mo -share/locale/eu/LC_MESSAGES/libbonobo-2.0.mo -share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo -share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo -share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ga/LC_MESSAGES/libbonobo-2.0.mo -share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo -share/locale/gu/LC_MESSAGES/libbonobo-2.0.mo -share/locale/he/LC_MESSAGES/libbonobo-2.0.mo -share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo -share/locale/hr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo -share/locale/id/LC_MESSAGES/libbonobo-2.0.mo -share/locale/is/LC_MESSAGES/libbonobo-2.0.mo -share/locale/it/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ka/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo -share/locale/li/LC_MESSAGES/libbonobo-2.0.mo -share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo -share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo -share/locale/mai/LC_MESSAGES/libbonobo-2.0.mo -share/locale/mg/LC_MESSAGES/libbonobo-2.0.mo -share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo -share/locale/mn/LC_MESSAGES/libbonobo-2.0.mo -share/locale/mr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo -share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo -share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo -share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo -share/locale/oc/LC_MESSAGES/libbonobo-2.0.mo -share/locale/or/LC_MESSAGES/libbonobo-2.0.mo -share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo -share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo -share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo -share/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ro/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo -share/locale/rw/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sr@latin/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo -share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo -share/locale/te/LC_MESSAGES/libbonobo-2.0.mo -share/locale/th/LC_MESSAGES/libbonobo-2.0.mo -share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo -share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo -share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo -share/locale/xh/LC_MESSAGES/libbonobo-2.0.mo -share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo -share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo -share/locale/zh_HK/LC_MESSAGES/libbonobo-2.0.mo -share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo -@dirrm share/idl/bonobo-activation-2.0 -@dirrm share/idl/bonobo-2.0 -@dirrm libdata/bonobo/servers -@dirrm libdata/bonobo -@dirrm lib/bonobo-2.0/samples -@dirrm lib/bonobo-2.0 -@dirrm include/libbonobo-2.0/bonobo -@dirrm include/libbonobo-2.0 -@dirrm include/bonobo-activation-2.0/bonobo-activation -@dirrm include/bonobo-activation-2.0 -@dirrm etc/bonobo-activation -@dirrmtry lib/bonobo/monikers -@dirrmtry lib/bonobo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile deleted file mode 100644 index 20dfb1d21..000000000 --- a/devel/libglademm24/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: libglademm -# Date created: 22 May 2003 -# Whom: Alexander Nedotsukov <bland@mail.ru> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= libglademm -PORTVERSION= 2.6.7 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} -DIST_SUBDIR= gnome2 - -MAINTAINER= bland@FreeBSD.org -COMMENT= C++ wrapper for libglade2 library - -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 - -LATEST_LINK= libglademm24 - -USE_BZIP2= yes -USE_XORG= x11 ice -USE_GMAKE= yes -USE_GNOME= gnomehack libglade2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-static - -PLIST_SUB= VERSION="2.4" API_VERSION="2.4" - -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ - ${WRKSRC}/Makefile.in -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)\(docs\)\(.*\)|\1\3|' ${WRKSRC}/Makefile.in -.endif - @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \ - ${WRKSRC}/tools/extra_defs_gen/Makefile.in - -.include <bsd.port.mk> diff --git a/devel/libglademm24/distinfo b/devel/libglademm24/distinfo deleted file mode 100644 index eebff7ac8..000000000 --- a/devel/libglademm24/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libglademm-2.6.7.tar.bz2) = f9ca5b67f6c551ea98790ab5f21c19d0 -SHA256 (gnome2/libglademm-2.6.7.tar.bz2) = 38543c15acf727434341cc08c2b003d24f36abc22380937707fc2c5c687a2bc3 -SIZE (gnome2/libglademm-2.6.7.tar.bz2) = 326385 diff --git a/devel/libglademm24/pkg-descr b/devel/libglademm24/pkg-descr deleted file mode 100644 index 4e71ae598..000000000 --- a/devel/libglademm24/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This is a set of thin C++ wrappers for libglade v2 library. - -WWW: http://gtkmm.sourceforge.net/ diff --git a/devel/libglademm24/pkg-plist b/devel/libglademm24/pkg-plist deleted file mode 100644 index 1976033ee..000000000 --- a/devel/libglademm24/pkg-plist +++ /dev/null @@ -1,65 +0,0 @@ -include/libglademm-%%API_VERSION%%/libglademm.h -include/libglademm-%%API_VERSION%%/libglademm/init.h -include/libglademm-%%API_VERSION%%/libglademm/private/xml_p.h -include/libglademm-%%API_VERSION%%/libglademm/variablesmap.h -include/libglademm-%%API_VERSION%%/libglademm/wrap_init.h -include/libglademm-%%API_VERSION%%/libglademm/xml.h -lib/libglademm-%%VERSION%%.a -lib/libglademm-%%VERSION%%.la -lib/libglademm-%%VERSION%%.so -lib/libglademm-%%VERSION%%.so.1 -lib/libglademm-%%API_VERSION%%/include/libglademmconfig.h -lib/libglademm-%%API_VERSION%%/proc/m4/convert.m4 -lib/libglademm-%%API_VERSION%%/proc/m4/convert_libglademm.m4 -libdata/pkgconfig/libglademm-%%API_VERSION%%.pc -%%PORTDOCS%%share/devhelp/books/libglademm-%%API_VERSION%%/libglademm-%%API_VERSION%%.devhelp -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/annotated.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception__inherit__graph.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object__inherit__graph.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap-members.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml-members.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError-members.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classes.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.css -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/files.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions_func.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions_type.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions_vars.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/hierarchy.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/index.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__0.dot -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherits.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/init_8h.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaceGlib.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaceGnome.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaceGnome_1_1Glade.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaces.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/tabs.css -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/variablesmap_8h.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/xml_8h.html -%%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html -%%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference -%%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs -%%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%% -%%PORTDOCS%%@dirrmtry share/doc/gnomemm-2.6 -%%PORTDOCS%%@dirrm share/devhelp/books/libglademm-%%API_VERSION%% -%%PORTDOCS%%@dirrmtry share/devhelp/books -%%PORTDOCS%%@dirrmtry share/devhelp -@dirrm lib/libglademm-%%API_VERSION%%/proc/m4 -@dirrm lib/libglademm-%%API_VERSION%%/proc -@dirrm lib/libglademm-%%API_VERSION%%/include -@dirrm lib/libglademm-%%API_VERSION%% -@dirrm include/libglademm-%%API_VERSION%%/libglademm/private -@dirrm include/libglademm-%%API_VERSION%%/libglademm -@dirrm include/libglademm-%%API_VERSION%% diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile deleted file mode 100644 index 3e9bb38a9..000000000 --- a/devel/libgsf-gnome/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: libgsf -# Date created: 11 September 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTREVISION= 0 -CATEGORIES= devel gnome -PKGNAMESUFFIX= -gnome - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME wrapper for libgsf - -MASTERDIR= ${.CURDIR}/../libgsf -BUILD_WRKSRC= ${WRKSRC}/gsf-gnome -INSTALL_WRKSRC= ${WRKSRC}/gsf-gnome -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ - --with-bz2 --with-gnome-vfs --with-gio -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" - -GSF_SLAVE= yes - -post-install: - @${MKDIR} ${PREFIX}/libdata/pkgconfig - @${INSTALL_DATA} ${WRKSRC}/libgsf-gnome-1.pc \ - ${PREFIX}/libdata/pkgconfig/ - -.include "${MASTERDIR}/Makefile" diff --git a/devel/libgsf-gnome/pkg-descr b/devel/libgsf-gnome/pkg-descr deleted file mode 100644 index 0252aadf0..000000000 --- a/devel/libgsf-gnome/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -The library is a bonobo and gnomevfs wrapper for libgsf, providing a high level -API for GNOME applications to access and exchange various structured file -formats. diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist deleted file mode 100644 index 4f502a67c..000000000 --- a/devel/libgsf-gnome/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -include/libgsf-1/gsf-gnome/gsf-input-bonobo.h -include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h -include/libgsf-1/gsf-gnome/gsf-output-bonobo.h -include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h -include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h -lib/libgsf-gnome-1.a -lib/libgsf-gnome-1.la -lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.114 -libdata/pkgconfig/libgsf-gnome-1.pc -@dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile deleted file mode 100644 index f80075194..000000000 --- a/devel/libgsf/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: libgsf -# Date created: 11 September 2002 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.32 2008/10/20 03:40:13 mezz Exp $ -# - -PORTNAME= libgsf -PORTVERSION= 1.14.11 -PORTREVISION?= 0 -CATEGORIES?= devel -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT?= An extensible i/o abstraction for dealing with structured file formats - -.if !exists(/usr/lib/libbz2.so) -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GETTEXT= yes -USE_LDCONFIG= yes -USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ - --without-bonobo -CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.if !defined(GSF_SLAVE) -GCONF_SCHEMAS= gsf-office-thumbnailer.schemas -MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 -.endif - -.include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo deleted file mode 100644 index d56c8857d..000000000 --- a/devel/libgsf/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libgsf-1.14.11.tar.bz2) = 86bec0012435fbafe02a6e4c88bdf9ba -SHA256 (gnome2/libgsf-1.14.11.tar.bz2) = ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf -SIZE (gnome2/libgsf-1.14.11.tar.bz2) = 637329 diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in deleted file mode 100644 index 4ef836e0b..000000000 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- gsf-gnome/Makefile.in.orig 2008-10-19 22:08:05.000000000 -0500 -+++ gsf-gnome/Makefile.in 2008-10-19 22:12:54.000000000 -0500 -@@ -66,9 +66,7 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = --@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ --@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \ --@WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1) -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = - am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ - gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ - gsf-shared-bonobo-stream.c -@@ -298,18 +296,20 @@ - top_srcdir = @top_srcdir@ - AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) - @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la --@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \ - @WITH_LIBGSF_GNOME_TRUE@ $(VERSION_INFO) $(am__append_1) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \ - @WITH_LIBGSF_GNOME_TRUE@ $(am__append_3) --libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome --libgsf_gnome_1_include_HEADERS = \ -- gsf-input-gnomevfs.h \ -- gsf-output-gnomevfs.h \ -- gsf-input-bonobo.h \ -- gsf-output-bonobo.h \ -- gsf-shared-bonobo-stream.h -+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_includedir = -+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h - - all: all-am - diff --git a/devel/libgsf/files/patch-gsf-python-Makefile.in b/devel/libgsf/files/patch-gsf-python-Makefile.in deleted file mode 100644 index 3114c2e95..000000000 --- a/devel/libgsf/files/patch-gsf-python-Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ ---- python/Makefile.in.orig 2007-09-05 10:35:23.000000000 -0500 -+++ python/Makefile.in 2007-09-05 10:38:00.000000000 -0500 -@@ -55,8 +55,7 @@ - pygsfexecLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(pygsfexec_LTLIBRARIES) - am__DEPENDENCIES_1 = --_gsfmodule_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la \ -- $(am__DEPENDENCIES_1) -+_gsfmodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am__gsfmodule_la_OBJECTS = _gsfmodule_la-gsfmodule.lo - nodist__gsfmodule_la_OBJECTS = _gsfmodule_la-gsf.lo - _gsfmodule_la_OBJECTS = $(am__gsfmodule_la_OBJECTS) \ -@@ -64,10 +63,7 @@ - _gsfmodule_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(_gsfmodule_la_CFLAGS) \ - $(CFLAGS) $(_gsfmodule_la_LDFLAGS) $(LDFLAGS) -o $@ --gnomemodule_la_DEPENDENCIES = \ -- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \ -- $(top_builddir)/gsf/libgsf-1.la $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) -+gnomemodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnomemodule.lo - nodist_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnome.lo - gnomemodule_la_OBJECTS = $(am_gnomemodule_la_OBJECTS) \ -@@ -299,8 +295,7 @@ - - gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome - gnomemodule_la_LIBADD = \ -- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \ -- $(top_builddir)/gsf/libgsf-1.la \ -+ -lgsf-1 -lgsf-gnome-1 \ - $(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS) - - gnomemodule_la_SOURCES = gsfgnomemodule.c -@@ -310,7 +305,7 @@ - $(LIBGSF_CFLAGS) - - _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf --_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) -+_gsfmodule_la_LIBADD = $(LIBGSF_LIBS) - _gsfmodule_la_SOURCES = gsfmodule.c - nodist__gsfmodule_la_SOURCES = gsf.c - all: all-am diff --git a/devel/libgsf/files/patch-gsf_gsf-shared-memory.c b/devel/libgsf/files/patch-gsf_gsf-shared-memory.c deleted file mode 100644 index 03f4e6379..000000000 --- a/devel/libgsf/files/patch-gsf_gsf-shared-memory.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gsf/gsf-shared-memory.c.orig Wed Sep 11 23:58:35 2002 -+++ gsf/gsf-shared-memory.c Wed Sep 11 23:58:46 2002 -@@ -21,6 +21,7 @@ - #include <gsf-config.h> - #include <gsf/gsf-shared-memory.h> - #include <gsf/gsf-impl-utils.h> -+#include <sys/types.h> - - #ifdef HAVE_MMAP - #include <sys/mman.h> diff --git a/devel/libgsf/pkg-descr b/devel/libgsf/pkg-descr deleted file mode 100644 index 258f82307..000000000 --- a/devel/libgsf/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -The library aims to provide an efficient extensible i/o abstraction for -dealing with different structured file formats. diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist deleted file mode 100644 index 99a0e886b..000000000 --- a/devel/libgsf/pkg-plist +++ /dev/null @@ -1,108 +0,0 @@ -bin/gsf -bin/gsf-office-thumbnailer -bin/gsf-vba-dump -include/libgsf-1/gsf/gsf-blob.h -include/libgsf-1/gsf/gsf-clip-data.h -include/libgsf-1/gsf/gsf-doc-meta-data.h -include/libgsf-1/gsf/gsf-docprop-vector.h -include/libgsf-1/gsf/gsf-impl-utils.h -include/libgsf-1/gsf/gsf-infile-impl.h -include/libgsf-1/gsf/gsf-infile-msole.h -include/libgsf-1/gsf/gsf-infile-msvba.h -include/libgsf-1/gsf/gsf-infile-stdio.h -include/libgsf-1/gsf/gsf-infile-tar.h -include/libgsf-1/gsf/gsf-infile-zip.h -include/libgsf-1/gsf/gsf-infile.h -include/libgsf-1/gsf/gsf-input-bzip.h -include/libgsf-1/gsf/gsf-input-gio.h -include/libgsf-1/gsf/gsf-input-gzip.h -include/libgsf-1/gsf/gsf-input-http.h -include/libgsf-1/gsf/gsf-input-impl.h -include/libgsf-1/gsf/gsf-input-iochannel.h -include/libgsf-1/gsf/gsf-input-memory.h -include/libgsf-1/gsf/gsf-input-proxy.h -include/libgsf-1/gsf/gsf-input-stdio.h -include/libgsf-1/gsf/gsf-input-textline.h -include/libgsf-1/gsf/gsf-input.h -include/libgsf-1/gsf/gsf-libxml.h -include/libgsf-1/gsf/gsf-meta-names.h -include/libgsf-1/gsf/gsf-msole-utils.h -include/libgsf-1/gsf/gsf-open-pkg-utils.h -include/libgsf-1/gsf/gsf-opendoc-utils.h -include/libgsf-1/gsf/gsf-outfile-impl.h -include/libgsf-1/gsf/gsf-outfile-msole.h -include/libgsf-1/gsf/gsf-outfile-stdio.h -include/libgsf-1/gsf/gsf-outfile-zip.h -include/libgsf-1/gsf/gsf-outfile.h -include/libgsf-1/gsf/gsf-output-bzip.h -include/libgsf-1/gsf/gsf-output-csv.h -include/libgsf-1/gsf/gsf-output-gio.h -include/libgsf-1/gsf/gsf-output-gzip.h -include/libgsf-1/gsf/gsf-output-iconv.h -include/libgsf-1/gsf/gsf-output-impl.h -include/libgsf-1/gsf/gsf-output-iochannel.h -include/libgsf-1/gsf/gsf-output-memory.h -include/libgsf-1/gsf/gsf-output-stdio.h -include/libgsf-1/gsf/gsf-output.h -include/libgsf-1/gsf/gsf-shared-memory.h -include/libgsf-1/gsf/gsf-structured-blob.h -include/libgsf-1/gsf/gsf-timestamp.h -include/libgsf-1/gsf/gsf-utils.h -include/libgsf-1/gsf/gsf.h -lib/libgsf-1.a -lib/libgsf-1.la -lib/libgsf-1.so -lib/libgsf-1.so.114 -libdata/pkgconfig/libgsf-1.pc -share/doc/gsf/GsfClipData.html -share/doc/gsf/api.html -share/doc/gsf/dependencies.html -share/doc/gsf/gsf-Bononbo.html -share/doc/gsf/gsf-Compression.html -share/doc/gsf/gsf-GIO.html -share/doc/gsf/gsf-GIOChannel.html -share/doc/gsf/gsf-GnomeVFS.html -share/doc/gsf/gsf-Infile-reading-structed-files.html -share/doc/gsf/gsf-Input-from-unstructured-files.html -share/doc/gsf/gsf-MS-OLE2.html -share/doc/gsf/gsf-OASIS-Open-Document.html -share/doc/gsf/gsf-Outfile-writing-structed-files.html -share/doc/gsf/gsf-Output-to-unstructured-files.html -share/doc/gsf/gsf-Reading-and-Writing-from-local-files-and-directories.html -share/doc/gsf/gsf-Text.html -share/doc/gsf/gsf-XML-and-libxml.html -share/doc/gsf/gsf-Zip.html -share/doc/gsf/gsf-blobs.html -share/doc/gsf/gsf-index.html -share/doc/gsf/gsf-memory.html -share/doc/gsf/gsf-metadata.html -share/doc/gsf/gsf-users.html -share/doc/gsf/gsf-utils.html -share/doc/gsf/gsf.devhelp -share/doc/gsf/gsf.devhelp2 -share/doc/gsf/history.html -share/doc/gsf/home.png -share/doc/gsf/index.html -share/doc/gsf/index.sgml -share/doc/gsf/intro.html -share/doc/gsf/io.html -share/doc/gsf/left.png -share/doc/gsf/misc.html -share/doc/gsf/parsers.html -share/doc/gsf/right.png -share/doc/gsf/sources.html -share/doc/gsf/style.css -share/doc/gsf/up.png -share/locale/es/LC_MESSAGES/libgsf.mo -share/locale/nb/LC_MESSAGES/libgsf.mo -share/locale/oc/LC_MESSAGES/libgsf.mo -share/locale/sv/LC_MESSAGES/libgsf.mo -share/locale/zh_HK/LC_MESSAGES/libgsf.mo -share/locale/zh_TW/LC_MESSAGES/libgsf.mo -@dirrm share/doc/gsf -@dirrm include/libgsf-1/gsf -@dirrm include/libgsf-1 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile deleted file mode 100644 index 5687b6298..000000000 --- a/devel/libgtop/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: libgtop2 -# Date Created: 29 April 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.44 2008/12/07 05:29:10 marcus Exp $ -# - -PORTNAME= libgtop -PORTVERSION= 2.24.0 -PORTREVISION= 3 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME 2 top library - -USE_BZIP2= yes -USE_PERL5_BUILD=yes -USE_GETTEXT= yes -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 ltverhack intlhack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --disable-gtk-doc \ - --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -INFO= libgtop2 - -PKGMESSAGE= ${FILESDIR}/pkg-message - -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \ - ${OSVERSION} < 700104 -RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof -.endif - -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f - -post-install: - @${CHGRP} kmem ${PREFIX}/bin/libgtop_server2 - @${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2 - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo deleted file mode 100644 index baa6eea84..000000000 --- a/devel/libgtop/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libgtop-2.24.0.tar.bz2) = f0e3584b9157d3425184a9e21e3ac482 -SHA256 (gnome2/libgtop-2.24.0.tar.bz2) = af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18 -SIZE (gnome2/libgtop-2.24.0.tar.bz2) = 775351 diff --git a/devel/libgtop/files/patch-config.h.in b/devel/libgtop/files/patch-config.h.in deleted file mode 100644 index 8fc4a10b1..000000000 --- a/devel/libgtop/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2008-12-06 16:05:23.000000000 -0500 -+++ config.h.in 2008-12-06 16:05:27.000000000 -0500 -@@ -115,6 +115,9 @@ - /* defined if you have linux/isdn.h */ - #undef HAVE_ISDN_H - -+/* Define if you have the kinfo_getfile function */ -+#undef HAVE_KINFO_GETFILE -+ - /* Define to 1 if you have the `lchown' function. */ - #undef HAVE_LCHOWN - diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure deleted file mode 100644 index 6f9d64a4b..000000000 --- a/devel/libgtop/files/patch-configure +++ /dev/null @@ -1,18629 +0,0 @@ ---- configure.orig 2008-12-07 00:14:33.000000000 -0500 -+++ configure 2008-12-07 00:14:54.000000000 -0500 -@@ -1,11 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61 for libgtop 2.24.0. -+# Generated by GNU Autoconf 2.62 for libgtop 2.24.0. - # - # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+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 -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -65,8 +93,6 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -102,17 +128,10 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -160,7 +179,7 @@ else - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -242,7 +261,7 @@ IFS=$as_save_IFS - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -263,7 +282,7 @@ _ASEOF - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -343,10 +362,10 @@ fi - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -415,9 +434,10 @@ fi - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell autoconf@gnu.org about your system, -- echo including any error possibly output before this -- echo message -+ echo Please tell bug-autoconf@gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. - } - - -@@ -453,7 +473,7 @@ test \$exitcode = 0") || { - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -481,7 +501,6 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -494,19 +513,22 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -531,10 +553,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -980,6 +1002,25 @@ GTK_DOC_USE_LIBTOOL_TRUE - GTK_DOC_USE_LIBTOOL_FALSE - LTLIBOBJS' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_dependency_tracking -+enable_shared -+enable_static -+enable_fast_install -+with_gnu_ld -+enable_libtool_lock -+with_pic -+with_tags -+with_libgtop_examples -+enable_hacker_mode -+with_libgtop_smp -+with_x -+enable_debug -+enable_fatal_warnings -+with_html_dir -+enable_gtk_doc -+' - ac_precious_vars='build_alias - host_alias - target_alias -@@ -1004,6 +1045,8 @@ XMKMF' - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -1102,13 +1145,21 @@ do - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -1121,13 +1172,21 @@ do - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1318,22 +1377,38 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -1353,7 +1428,7 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -1362,16 +1437,16 @@ Try \`$0 --help' for more information." - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1380,22 +1455,38 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute directory names. -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; -+ *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1410,7 +1501,7 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1426,10 +1517,10 @@ test "$silent" = yes && exec 6>/dev/null - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { $as_echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1437,12 +1528,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$0" || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X"$0" | -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1469,12 +1560,12 @@ else - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1523,9 +1614,9 @@ Configuration: - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1535,25 +1626,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/libgtop] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/libgtop] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1581,6 +1672,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build -@@ -1637,15 +1729,17 @@ fi - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1681,7 +1775,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1691,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - libgtop configure 2.24.0 --generated by GNU Autoconf 2.61 -+generated by GNU Autoconf 2.62 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1705,7 +1799,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by libgtop $as_me 2.24.0, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.62. Invocation command line was - - $ $0 $@ - -@@ -1741,7 +1835,7 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" -+ $as_echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -1776,7 +1870,7 @@ do - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -1828,11 +1922,12 @@ _ASBOX - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -1862,9 +1957,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -1879,9 +1974,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1897,8 +1992,8 @@ _ASBOX - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -1940,21 +2035,24 @@ _ACEOF - - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- set x "$CONFIG_SITE" -+ ac_site_file1=$CONFIG_SITE - elif test "x$prefix" != xNONE; then -- set x "$prefix/share/config.site" "$prefix/etc/config.site" -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site - else -- set x "$ac_default_prefix/share/config.site" \ -- "$ac_default_prefix/etc/config.site" -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --shift --for ac_site_file -+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 -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:$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" - fi -@@ -1964,16 +2062,16 @@ 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 -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -1987,29 +2085,38 @@ for ac_var in $ac_precious_vars; do - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ 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 -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -2019,10 +2126,10 @@ echo "$as_me: current value: $ac_new_v - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2078,8 +2185,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2094,34 +2201,34 @@ ac_configure="$SHELL $ac_aux_dir/configu - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 --echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --{ echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } - if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 --echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 --echo "$as_me: error: invalid value of canonical build" >&2;} -+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; - esac - build=$ac_cv_build -@@ -2138,27 +2245,27 @@ IFS=$ac_save_IFS - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } - if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 --echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } - fi - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 --echo "$as_me: error: invalid value of canonical host" >&2;} -+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; - esac - host=$ac_cv_host -@@ -2175,27 +2282,27 @@ IFS=$ac_save_IFS - case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - --{ echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking target system type" >&5 -+$as_echo_n "checking target system type... " >&6; } - if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host - else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 --echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } - fi - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -+$as_echo "$ac_cv_target" >&6; } - case $ac_cv_target in - *-*-*) ;; --*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 --echo "$as_me: error: invalid value of canonical target" >&2;} -+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -+$as_echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; - esac - target=$ac_cv_target -@@ -2233,11 +2340,12 @@ am__api_version="1.9" - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -2266,17 +2374,29 @@ case $as_dir/ in - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac -+ - done - IFS=$as_save_IFS - -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -2289,8 +2409,8 @@ fi - INSTALL=$ac_install_sh - fi - fi --{ echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2300,8 +2420,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+$as_echo_n "checking whether build environment is sane... " >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -2324,9 +2444,9 @@ if ( - # 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". -- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 --echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -2337,26 +2457,23 @@ then - # Ok. - : - else -- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 --echo "$as_me: error: newly created file is older than distributed files! -+$as_echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" --# Double any \ or $. echo might interpret backslashes. -+# Double any \ or $. - # By default was `s,x,x', remove it if useless. --cat <<\_ACEOF >conftest.sed --s/[\\$]/&&/g;s/;s,x,x,$// --_ACEOF --program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm -f conftest.sed -+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2367,8 +2484,8 @@ if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " - else - am_missing_run= -- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -@@ -2408,10 +2525,10 @@ for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2424,7 +2541,7 @@ 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_AWK="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2435,22 +2552,23 @@ fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -+$as_echo "$AWK" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - test -n "$AWK" && break - done - --{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } --set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` - if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -2467,12 +2585,12 @@ esac - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -2488,8 +2606,8 @@ rmdir .tst 2>/dev/null - # test to see if srcdir already configured - if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2543,10 +2661,10 @@ if test "$cross_compiling" != no; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2559,7 +2677,7 @@ 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_STRIP="${ac_tool_prefix}strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2570,11 +2688,11 @@ fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2583,10 +2701,10 @@ if test -z "$ac_cv_prog_STRIP"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2599,7 +2717,7 @@ 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_STRIP="strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2610,11 +2728,11 @@ fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -2622,10 +2740,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -2685,8 +2803,8 @@ am__doit: - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+$as_echo_n "checking for style of include used by $am_make... " >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -2713,8 +2831,8 @@ if test "$am__include" = "#"; then - fi - - --{ echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 -+$as_echo "$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. -@@ -2746,10 +2864,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2762,7 +2880,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2773,11 +2891,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2786,10 +2904,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2802,7 +2920,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2813,11 +2931,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -2825,10 +2943,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -2843,10 +2961,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2859,7 +2977,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2870,11 +2988,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2883,10 +3001,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2904,7 +3022,7 @@ do - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2927,11 +3045,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2942,10 +3060,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2958,7 +3076,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2969,11 +3087,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -2986,10 +3104,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3002,7 +3120,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3013,11 +3131,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3029,10 +3147,10 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -3044,44 +3162,48 @@ fi - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -3100,27 +3222,22 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.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. --{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --# --# List of possible output files, starting from the most likely. --# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) --# only as a last resort. b.out is created by i960 compilers. --ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' --# --# The IRIX 6 linker writes into existing files which may not be --# executable, retaining their permissions. Remove them first so a --# subsequent execution test works. -+{ $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; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -3131,10 +3248,11 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; 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' -@@ -3145,7 +3263,7 @@ for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -3172,15 +3290,15 @@ else - ac_file='' - fi - --{ echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables -+$as_echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - fi -@@ -3189,8 +3307,8 @@ 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. --{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -+{ $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 -@@ -3199,49 +3317,51 @@ if test "$cross_compiling" != yes; then - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { $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 --echo "$as_me: error: cannot run C compiled programs. -+$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 --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+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. --{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6; } -+{ $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; } - --{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3250,31 +3370,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+$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; }; } - fi - - rm -f conftest$ac_cv_exeext --{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3297,40 +3417,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile -+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3356,20 +3477,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -3379,15 +3501,19 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$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 -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -3414,20 +3540,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -3452,20 +3579,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3491,20 +3619,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3519,8 +3648,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+{ $as_echo "$as_me:$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 - elif test $ac_cv_prog_cc_g = yes; then -@@ -3536,10 +3665,10 @@ else - CFLAGS= - fi - fi --{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -3610,20 +3739,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_c89=$ac_arg - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3639,15 +3769,15 @@ fi - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; - xno) -- { echo "$as_me:$LINENO: result: unsupported" >&5 --echo "${ECHO_T}unsupported" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -3659,10 +3789,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= - --{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -3749,8 +3879,8 @@ else - fi - - fi --{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+{ $as_echo "$as_me:$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 - - -@@ -3767,10 +3897,10 @@ fi - - - --{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 --echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -+{ $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -3808,26 +3938,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_search_strerror=$ac_res - else -- echo "$as_me: failed program was:" >&5 -+ $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 -@@ -3842,8 +3976,8 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -+{ $as_echo "$as_me:$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 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -3858,10 +3992,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3874,7 +4008,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3885,11 +4019,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3898,10 +4032,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3914,7 +4048,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3925,11 +4059,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -3937,10 +4071,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -3955,10 +4089,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3971,7 +4105,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3982,11 +4116,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -3995,10 +4129,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -4016,7 +4150,7 @@ do - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4039,11 +4173,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -4054,10 +4188,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -4070,7 +4204,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4081,11 +4215,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -4098,10 +4232,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -4114,7 +4248,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4125,11 +4259,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -4141,10 +4275,10 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -4156,50 +4290,54 @@ fi - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4225,20 +4363,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -4248,15 +4387,19 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$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 -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -4283,20 +4426,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -4321,20 +4465,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -4360,20 +4505,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -4388,8 +4534,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+{ $as_echo "$as_me:$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 - elif test $ac_cv_prog_cc_g = yes; then -@@ -4405,10 +4551,10 @@ else - CFLAGS= - fi - fi --{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -4479,20 +4625,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_prog_cc_c89=$ac_arg - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -4508,15 +4655,15 @@ fi - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; - xno) -- { echo "$as_me:$LINENO: result: unsupported" >&5 --echo "${ECHO_T}unsupported" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -4528,10 +4675,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - depcc="$CC" am_compiler_list= - --{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -4618,8 +4765,8 @@ else - fi - - fi --{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+{ $as_echo "$as_me:$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 - - -@@ -4640,15 +4787,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -4680,20 +4827,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -4717,13 +4865,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -4731,7 +4880,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -4756,8 +4905,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --{ echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -4785,20 +4934,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -4822,13 +4972,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -4836,7 +4987,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -4852,9 +5003,9 @@ rm -f conftest.err conftest.$ac_ext - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi -@@ -4866,42 +5017,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 --echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } - if test "${ac_cv_path_GREP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # Extract the first word of "grep ggrep" to use in msg output --if test -z "$GREP"; then --set dummy grep ggrep; ac_prog_name=$2 --if test "${ac_cv_path_GREP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else -+ if test -z "$GREP"; then - ac_path_GREP_found=false --# Loop through the user's path and test for each of PROGNAME-LIST --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -- # Check for GNU ac_path_GREP and select it if it is found. -+ 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 -+# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in - *GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; - *) - ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" -- echo 'GREP' >> "conftest.nl" -+ $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 - ac_count=`expr $ac_count + 1` -@@ -4916,74 +5062,60 @@ case `"$ac_path_GREP" --version 2>&1` in - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - -- -- $ac_path_GREP_found && break 3 -+ $ac_path_GREP_found && break 3 -+ done - done - done -- --done - IFS=$as_save_IFS -- -- --fi -- --GREP="$ac_cv_path_GREP" --if test -z "$GREP"; then -- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ if test -z "$ac_cv_path_GREP"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } --fi -- -+ fi - else - ac_cv_path_GREP=$GREP - fi - -- - fi --{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 --echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - --{ echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } - if test "${ac_cv_path_EGREP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else -- # Extract the first word of "egrep" to use in msg output --if test -z "$EGREP"; then --set dummy egrep; ac_prog_name=$2 --if test "${ac_cv_path_EGREP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -+ if test -z "$EGREP"; then - ac_path_EGREP_found=false --# Loop through the user's path and test for each of PROGNAME-LIST --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -- # Check for GNU ac_path_EGREP and select it if it is found. -+ 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 -+# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in - *GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; - *) - ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" -- echo 'EGREP' >> "conftest.nl" -+ $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 - ac_count=`expr $ac_count + 1` -@@ -4998,40 +5130,31 @@ case `"$ac_path_EGREP" --version 2>&1` i - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - -- -- $ac_path_EGREP_found && break 3 -+ $ac_path_EGREP_found && break 3 -+ done - done - done -- --done - IFS=$as_save_IFS -- -- --fi -- --EGREP="$ac_cv_path_EGREP" --if test -z "$EGREP"; then -- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ if test -z "$ac_cv_path_EGREP"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } --fi -- -+ fi - else - ac_cv_path_EGREP=$EGREP - fi - -- - fi - fi --{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 --echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - --{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } - if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -5058,20 +5181,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -@@ -5163,37 +5287,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_header_stdc=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -5210,10 +5337,10 @@ for ac_prog in gawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -5226,7 +5353,7 @@ 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_AWK="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5237,29 +5364,29 @@ fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -+$as_echo "$AWK" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - test -n "$AWK" && break - done - --test -z "$AWK" && { { echo "$as_me:$LINENO: error: Sorry, you need a working awk interpreter." >&5 --echo "$as_me: error: Sorry, you need a working awk interpreter." >&2;} -+test -z "$AWK" && { { $as_echo "$as_me:$LINENO: error: Sorry, you need a working awk interpreter." >&5 -+$as_echo "$as_me: error: Sorry, you need a working awk interpreter." >&2;} - { (exit 1); exit 1; }; } - - for ac_prog in perl5 perl - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_PERL+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$PERL"; then - ac_cv_prog_PERL="$PERL" # Let the user override the test. -@@ -5272,7 +5399,7 @@ 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_PERL="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5283,28 +5410,28 @@ fi - fi - PERL=$ac_cv_prog_PERL - if test -n "$PERL"; then -- { echo "$as_me:$LINENO: result: $PERL" >&5 --echo "${ECHO_T}$PERL" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -+$as_echo "$PERL" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - test -n "$PERL" && break - done - --test -z "$PERL" && { { echo "$as_me:$LINENO: error: You need to have a working perl interpreter." >&5 --echo "$as_me: error: You need to have a working perl interpreter." >&2;} -+test -z "$PERL" && { { $as_echo "$as_me:$LINENO: error: You need to have a working perl interpreter." >&5 -+$as_echo "$as_me: error: You need to have a working perl interpreter." >&2;} - { (exit 1); exit 1; }; } - - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -5317,7 +5444,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5328,11 +5455,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -5341,10 +5468,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -5357,7 +5484,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5368,11 +5495,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -5380,10 +5507,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -5397,10 +5524,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -5413,7 +5540,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5424,11 +5551,11 @@ fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- { echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -5437,10 +5564,10 @@ if test -z "$ac_cv_prog_RANLIB"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -5453,7 +5580,7 @@ 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_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5464,11 +5591,11 @@ fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_RANLIB" = x; then -@@ -5476,10 +5603,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -5493,10 +5620,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AS+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -@@ -5509,7 +5636,7 @@ 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_AS="${ac_tool_prefix}as" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5520,11 +5647,11 @@ fi - fi - AS=$ac_cv_prog_AS - if test -n "$AS"; then -- { echo "$as_me:$LINENO: result: $AS" >&5 --echo "${ECHO_T}$AS" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AS" >&5 -+$as_echo "$AS" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -5533,10 +5660,10 @@ if test -z "$ac_cv_prog_AS"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -@@ -5549,7 +5676,7 @@ 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_AS="as" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5560,11 +5687,11 @@ fi - fi - ac_ct_AS=$ac_cv_prog_ac_ct_AS - if test -n "$ac_ct_AS"; then -- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 --echo "${ECHO_T}$ac_ct_AS" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -+$as_echo "$ac_ct_AS" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_AS" = x; then -@@ -5572,10 +5699,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -5589,10 +5716,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -5605,7 +5732,7 @@ 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_AR="${ac_tool_prefix}ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5616,11 +5743,11 @@ fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- { echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AR" >&5 -+$as_echo "$AR" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -5629,10 +5756,10 @@ if test -z "$ac_cv_prog_AR"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -5645,7 +5772,7 @@ 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_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5656,11 +5783,11 @@ fi - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+$as_echo "$ac_ct_AR" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_AR" = x; then -@@ -5668,10 +5795,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -5698,11 +5825,12 @@ export CC CXX RANLIB LD AS AR - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5731,17 +5859,29 @@ case $as_dir/ in - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac -+ - done - IFS=$as_save_IFS - -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -5754,8 +5894,8 @@ fi - INSTALL=$ac_install_sh - fi - fi --{ echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -5765,22 +5905,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 --echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+$as_echo_n "checking whether ln -s works... " >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 --echo "${ECHO_T}no, using $LN_S" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+$as_echo "no, using $LN_S" >&6; } - fi - --{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } --set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` - if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -5797,12 +5938,12 @@ esac - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -5881,10 +6022,10 @@ else - fi - - --{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 --echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+$as_echo_n "checking for a sed that does not truncate output... " >&6; } - if test "${lt_cv_path_SED+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. -@@ -5937,8 +6078,8 @@ fi - - SED=$lt_cv_path_SED - --{ echo "$as_me:$LINENO: result: $SED" >&5 --echo "${ECHO_T}$SED" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $SED" >&5 -+$as_echo "$SED" >&6; } - - - # Check whether --with-gnu-ld was given. -@@ -5951,8 +6092,8 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -5981,14 +6122,14 @@ echo $ECHO_N "checking for ld used by $C - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { echo "$as_me:$LINENO: checking for GNU ld" >&5 --echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -+$as_echo_n "checking for GNU ld... " >&6; } - else -- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+$as_echo_n "checking for non-GNU ld... " >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -6018,19 +6159,19 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { echo "$as_me:$LINENO: result: $LD" >&5 --echo "${ECHO_T}$LD" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $LD" >&5 -+$as_echo "$LD" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi --test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in -@@ -6042,20 +6183,20 @@ case `$LD -v 2>&1 </dev/null` in - ;; - esac - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+$as_echo "$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - --{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 --echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+$as_echo_n "checking for $LD option to reload object files... " >&6; } - if test "${lt_cv_ld_reload_flag+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_ld_reload_flag='-r' - fi --{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 --echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+$as_echo "$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag - case $reload_flag in - "" | " "*) ;; -@@ -6072,10 +6213,10 @@ case $host_os in - ;; - esac - --{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 --echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -+$as_echo_n "checking for BSD-compatible nm... " >&6; } - if test "${lt_cv_path_NM+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$NM"; then - # Let the user override the test. -@@ -6121,14 +6262,14 @@ else - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm - fi - fi --{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 --echo "${ECHO_T}$lt_cv_path_NM" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+$as_echo "$lt_cv_path_NM" >&6; } - NM="$lt_cv_path_NM" - --{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 --echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+$as_echo_n "checking how to recognize dependent libraries... " >&6; } - if test "${lt_cv_deplibs_check_method+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_file_magic_cmd='$MAGIC_CMD' - lt_cv_file_magic_test_file= -@@ -6311,8 +6452,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* - esac - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 --echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+$as_echo "$lt_cv_deplibs_check_method" >&6; } - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6345,7 +6486,7 @@ ia64-*-hpux*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) -@@ -6360,11 +6501,11 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6363 "configure"' > conftest.$ac_ext -+ echo '#line 6504 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in -@@ -6402,7 +6543,7 @@ s390*-*linux*|sparc*-*linux*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) -@@ -6452,10 +6593,10 @@ s390*-*linux*|sparc*-*linux*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" -- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 --echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+$as_echo_n "checking whether the C compiler needs -belf... " >&6; } - if test "${lt_cv_cc_needs_belf+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -6484,26 +6625,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - lt_cv_cc_needs_belf=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -@@ -6513,8 +6658,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 --echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+$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 - CFLAGS="$SAVE_CFLAGS" -@@ -6526,7 +6671,7 @@ sparc*-*solaris*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) -@@ -6563,11 +6708,11 @@ need_locks="$enable_libtool_lock" - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6585,20 +6730,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - eval "$as_ac_Header=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -@@ -6606,12 +6752,14 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -6622,20 +6770,21 @@ done - - for ac_header in dlfcn.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6651,32 +6800,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6690,51 +6840,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -6743,21 +6894,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -6778,10 +6931,10 @@ if test -z "$CXX"; 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -6794,7 +6947,7 @@ 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_CXX="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6805,11 +6958,11 @@ fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -6822,10 +6975,10 @@ if test -z "$CXX"; 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -6838,7 +6991,7 @@ 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_CXX="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6849,11 +7002,11 @@ fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -6865,10 +7018,10 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -6880,43 +7033,47 @@ fi - fi - fi - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C++ compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$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_cxx_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6942,20 +7099,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -6965,15 +7123,19 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } --GXX=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes -+else -+ GXX= -+fi - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } - if test "${ac_cv_prog_cxx_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes -@@ -7000,20 +7162,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" -@@ -7038,20 +7201,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -7077,20 +7241,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -7105,8 +7270,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS - elif test $ac_cv_prog_cxx_g = yes; then -@@ -7130,10 +7295,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - depcc="$CXX" am_compiler_list= - --{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+$as_echo_n "checking dependency style of $depcc... " >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -7220,8 +7385,8 @@ else - fi - - fi --{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -@@ -7247,11 +7412,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+$as_echo_n "checking how to run the C++ preprocessor... " >&6; } - if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" -@@ -7283,20 +7448,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -7320,13 +7486,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err -@@ -7334,7 +7501,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -7359,8 +7526,8 @@ fi - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 --echo "${ECHO_T}$CXXCPP" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+$as_echo "$CXXCPP" >&6; } - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes - do -@@ -7388,20 +7555,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -7425,13 +7593,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err -@@ -7439,7 +7608,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -7455,9 +7624,9 @@ rm -f conftest.err conftest.$ac_ext - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+ { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check - See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7480,10 +7649,10 @@ if test -n "$ac_tool_prefix"; 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_F77+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -@@ -7496,7 +7665,7 @@ 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_F77="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7507,11 +7676,11 @@ fi - fi - F77=$ac_cv_prog_F77 - if test -n "$F77"; then -- { echo "$as_me:$LINENO: result: $F77" >&5 --echo "${ECHO_T}$F77" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $F77" >&5 -+$as_echo "$F77" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -7524,10 +7693,10 @@ if test -z "$F77"; 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_F77+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -@@ -7540,7 +7709,7 @@ 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_F77="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7551,11 +7720,11 @@ fi - fi - ac_ct_F77=$ac_cv_prog_ac_ct_F77 - if test -n "$ac_ct_F77"; then -- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 --echo "${ECHO_T}$ac_ct_F77" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+$as_echo "$ac_ct_F77" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -7567,10 +7736,10 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -7581,37 +7750,41 @@ fi - - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$LINENO: checking for Fortran 77 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - rm -f a.out - -@@ -7619,10 +7792,10 @@ rm -f a.out - # input file. (Note that this only needs to work for GNU compilers.) - ac_save_ext=$ac_ext - ac_ext=F --{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } - if test "${ac_cv_f77_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - program main -@@ -7638,20 +7811,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -7661,16 +7835,16 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_f77_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+$as_echo "$ac_cv_f77_compiler_gnu" >&6; } - ac_ext=$ac_save_ext - ac_test_FFLAGS=${FFLAGS+set} - ac_save_FFLAGS=$FFLAGS - FFLAGS= --{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 --echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+$as_echo_n "checking whether $F77 accepts -g... " >&6; } - if test "${ac_cv_prog_f77_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - FFLAGS=-g - cat >conftest.$ac_ext <<_ACEOF -@@ -7684,20 +7858,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_f77_g=no -@@ -7706,8 +7881,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 --echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+$as_echo "$ac_cv_prog_f77_g" >&6; } - if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS - elif test $ac_cv_prog_f77_g = yes; then -@@ -7724,7 +7899,11 @@ else - fi - fi - --G77=`test $ac_compiler_gnu = yes && echo yes` -+if test $ac_compiler_gnu = yes; then -+ G77=yes -+else -+ G77= -+fi - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7735,10 +7914,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments --{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 --echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+$as_echo_n "checking the maximum length of command line arguments... " >&6; } - if test "${lt_cv_sys_max_cmd_len+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - i=0 - teststring="ABCD" -@@ -7847,11 +8026,11 @@ else - fi - - if test -n $lt_cv_sys_max_cmd_len ; then -- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 --echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+$as_echo "$lt_cv_sys_max_cmd_len" >&6; } - else -- { echo "$as_me:$LINENO: result: none" >&5 --echo "${ECHO_T}none" >&6; } -+ { $as_echo "$as_me:$LINENO: result: none" >&5 -+$as_echo "none" >&6; } - fi - - -@@ -7859,10 +8038,10 @@ fi - - - # Check for command to grab the raw symbol name followed by C symbol from nm. --{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 --echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } - if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - - # These are sane defaults that work on at least a few old systems. -@@ -7967,14 +8146,14 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then -@@ -8029,7 +8208,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -@@ -8064,17 +8243,17 @@ if test -z "$lt_cv_sys_global_symbol_pip - 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 -- { echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6; } -+ { $as_echo "$as_me:$LINENO: result: failed" >&5 -+$as_echo "failed" >&6; } - else -- { echo "$as_me:$LINENO: result: ok" >&5 --echo "${ECHO_T}ok" >&6; } -+ { $as_echo "$as_me:$LINENO: result: ok" >&5 -+$as_echo "ok" >&6; } - fi - --{ echo "$as_me:$LINENO: checking for objdir" >&5 --echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -+$as_echo_n "checking for objdir... " >&6; } - if test "${lt_cv_objdir+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null -@@ -8086,8 +8265,8 @@ else - fi - rmdir .libs 2>/dev/null - fi --{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 --echo "${ECHO_T}$lt_cv_objdir" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+$as_echo "$lt_cv_objdir" >&6; } - objdir=$lt_cv_objdir - - -@@ -8138,10 +8317,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -8154,7 +8333,7 @@ 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_AR="${ac_tool_prefix}ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8165,11 +8344,11 @@ fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- { echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $AR" >&5 -+$as_echo "$AR" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -8178,10 +8357,10 @@ if test -z "$ac_cv_prog_AR"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -8194,7 +8373,7 @@ 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_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8205,11 +8384,11 @@ fi - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+$as_echo "$ac_ct_AR" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_AR" = x; then -@@ -8217,10 +8396,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -8234,10 +8413,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -8250,7 +8429,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8261,11 +8440,11 @@ fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- { echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -8274,10 +8453,10 @@ if test -z "$ac_cv_prog_RANLIB"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -8290,7 +8469,7 @@ 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_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8301,11 +8480,11 @@ fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_RANLIB" = x; then -@@ -8313,10 +8492,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -8330,10 +8509,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -8346,7 +8525,7 @@ 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_STRIP="${ac_tool_prefix}strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8357,11 +8536,11 @@ fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -8370,10 +8549,10 @@ if test -z "$ac_cv_prog_STRIP"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -8386,7 +8565,7 @@ 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_STRIP="strip" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8397,11 +8576,11 @@ fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -8409,10 +8588,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -8477,10 +8656,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 --echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -@@ -8530,19 +8709,19 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+$as_echo "$MAGIC_CMD" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- { echo "$as_me:$LINENO: checking for file" >&5 --echo $ECHO_N "checking for file... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for file" >&5 -+$as_echo_n "checking for file... " >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -@@ -8592,11 +8771,11 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+$as_echo "$MAGIC_CMD" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - else -@@ -8614,10 +8793,10 @@ esac - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -@@ -8630,7 +8809,7 @@ 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_DSYMUTIL="${ac_tool_prefix}dsymutil" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8641,11 +8820,11 @@ fi - fi - DSYMUTIL=$ac_cv_prog_DSYMUTIL - if test -n "$DSYMUTIL"; then -- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 --echo "${ECHO_T}$DSYMUTIL" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+$as_echo "$DSYMUTIL" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -8654,10 +8833,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -@@ -8670,7 +8849,7 @@ 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_DSYMUTIL="dsymutil" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8681,11 +8860,11 @@ fi - fi - ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL - if test -n "$ac_ct_DSYMUTIL"; then -- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 --echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+$as_echo "$ac_ct_DSYMUTIL" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_DSYMUTIL" = x; then -@@ -8693,10 +8872,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -8710,10 +8889,10 @@ fi - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_NMEDIT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -@@ -8726,7 +8905,7 @@ 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_NMEDIT="${ac_tool_prefix}nmedit" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8737,11 +8916,11 @@ fi - fi - NMEDIT=$ac_cv_prog_NMEDIT - if test -n "$NMEDIT"; then -- { echo "$as_me:$LINENO: result: $NMEDIT" >&5 --echo "${ECHO_T}$NMEDIT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+$as_echo "$NMEDIT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -8750,10 +8929,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -@@ -8766,7 +8945,7 @@ 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_NMEDIT="nmedit" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8777,11 +8956,11 @@ fi - fi - ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT - if test -n "$ac_ct_NMEDIT"; then -- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 --echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+$as_echo "$ac_ct_NMEDIT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_NMEDIT" = x; then -@@ -8789,10 +8968,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -8804,10 +8983,10 @@ else - fi - - -- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 --echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+$as_echo_n "checking for -single_module linker flag... " >&6; } - if test "${lt_cv_apple_cc_single_mod+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then -@@ -8825,12 +9004,12 @@ else - rm conftest.c - fi - fi --{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 --echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 --echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+$as_echo "$lt_cv_apple_cc_single_mod" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } - if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS -@@ -8857,33 +9036,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - lt_cv_ld_exported_symbols_list=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 --echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[0123]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -8995,10 +9178,10 @@ if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - --{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -@@ -9013,11 +9196,11 @@ else - -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:9016: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9199: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9020: \$? = $ac_status" >&5 -+ echo "$as_me:9203: \$? = $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. -@@ -9030,8 +9213,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -9045,8 +9228,8 @@ lt_prog_compiler_wl= - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9277,18 +9460,18 @@ echo $ECHO_N "checking for $compiler opt - esac - fi - --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+$as_echo "$lt_prog_compiler_pic" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic"; then - --{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } - if test "${lt_cv_prog_compiler_pic_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -@@ -9303,11 +9486,11 @@ else - -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:9306: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9489: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9310: \$? = $ac_status" >&5 -+ echo "$as_me:9493: \$? = $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. -@@ -9320,8 +9503,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in -@@ -9348,10 +9531,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" --{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } - if test "${lt_cv_prog_compiler_static_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" -@@ -9376,8 +9559,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - - if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -@@ -9386,10 +9569,10 @@ else - fi - - --{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } - if test "${lt_cv_prog_compiler_c_o+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null -@@ -9407,11 +9590,11 @@ else - -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:9410: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9593: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9414: \$? = $ac_status" >&5 -+ echo "$as_me:9597: \$? = $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 -@@ -9433,34 +9616,34 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - 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 -- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= -@@ -9891,18 +10074,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9917,12 +10103,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -9957,18 +10144,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9983,12 +10173,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -10440,8 +10631,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 --echo "${ECHO_T}$ld_shlibs" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+$as_echo "$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no - - # -@@ -10461,15 +10652,15 @@ x|xyes) - # 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. -- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -10487,7 +10678,7 @@ echo $ECHO_N "checking whether -lc shoul - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no -@@ -10499,16 +10690,16 @@ echo $ECHO_N "checking whether -lc shoul - cat conftest.err 1>&5 - fi - $rm conftest* -- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 --echo "${ECHO_T}$archive_cmds_need_lc" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+$as_echo "$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; - esac - --{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+$as_echo_n "checking dynamic linker characteristics... " >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -11121,19 +11312,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -11145,8 +11336,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ -@@ -11170,8 +11361,8 @@ else - # directories. - hardcode_action=unsupported - fi --{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 --echo "${ECHO_T}$hardcode_action" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+$as_echo "$hardcode_action" >&6; } - - if test "$hardcode_action" = relink; then - # Fast installation is not supported -@@ -11184,13 +11375,13 @@ fi - - striplib= - old_striplib= --{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+$as_echo_n "checking whether stripping libraries is possible... " >&6; } - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in -@@ -11198,16 +11389,16 @@ else - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - ;; - *) -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - ;; - esac - fi -@@ -11239,10 +11430,10 @@ else - - darwin*) - # if libdl is installed we need to link against it -- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" -@@ -11274,32 +11465,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dl_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -@@ -11313,10 +11508,10 @@ fi - ;; - - *) -- { echo "$as_me:$LINENO: checking for shl_load" >&5 --echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -11369,38 +11564,42 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_shl_load=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 --echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+$as_echo "$ac_cv_func_shl_load" >&6; } - if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" - else -- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" -@@ -11432,39 +11631,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dld_shl_load=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else -- { echo "$as_me:$LINENO: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -11517,38 +11720,42 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_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 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+$as_echo "$ac_cv_func_dlopen" >&6; } - if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" - else -- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" -@@ -11580,39 +11787,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dl_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+$as_echo_n "checking for dlopen in -lsvld... " >&6; } - if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsvld $LIBS" -@@ -11644,39 +11855,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_svld_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+$as_echo "$ac_cv_lib_svld_dlopen" >&6; } - if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else -- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+$as_echo_n "checking for dld_link in -ldld... " >&6; } - if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" -@@ -11708,32 +11923,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dld_dld_link=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+$as_echo "$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi -@@ -11773,10 +11992,10 @@ fi - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - -- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 --echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+$as_echo_n "checking whether a program can dlopen itself... " >&6; } - if test "${lt_cv_dlopen_self+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -@@ -11784,7 +12003,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11787 "configure" -+#line 12006 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11850,7 +12069,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? -@@ -11868,15 +12087,15 @@ rm -fr conftest* - - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } - if test "${lt_cv_dlopen_self_static+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -@@ -11884,7 +12103,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11887 "configure" -+#line 12106 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11950,7 +12169,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? -@@ -11968,8 +12187,8 @@ rm -fr conftest* - - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" -@@ -11991,13 +12210,13 @@ fi - - - # Report which library types will actually be built --{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+$as_echo_n "checking if libtool supports shared libraries... " >&6; } -+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+$as_echo "$can_build_shared" >&6; } - --{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -12017,15 +12236,15 @@ aix[4-9]*) - fi - ;; - esac --{ echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -+$as_echo "$enable_shared" >&6; } - --{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --{ echo "$as_me:$LINENO: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -+$as_echo "$enable_static" >&6; } - - # The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -12118,8 +12337,8 @@ if test -f "$ltmain"; then - cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" -- { echo "$as_me:$LINENO: creating $ofile" >&5 --echo "$as_me: creating $ofile" >&6;} -+ { $as_echo "$as_me:$LINENO: creating $ofile" >&5 -+$as_echo "$as_me: creating $ofile" >&6;} - - cat <<__EOF__ >> "$cfgfile" - #! $SHELL -@@ -12531,18 +12750,18 @@ fi - - if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then -- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 --echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then -- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 --echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else -- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 --echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then -@@ -12559,16 +12778,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTC - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; -- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 --echo "$as_me: error: invalid tag name: $tagname" >&2;} -+ *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then -- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 --echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -12711,8 +12930,8 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -12741,14 +12960,14 @@ echo $ECHO_N "checking for ld used by $C - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { echo "$as_me:$LINENO: checking for GNU ld" >&5 --echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -+$as_echo_n "checking for GNU ld... " >&6; } - else -- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+$as_echo_n "checking for non-GNU ld... " >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -12778,19 +12997,19 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { echo "$as_me:$LINENO: result: $LD" >&5 --echo "${ECHO_T}$LD" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $LD" >&5 -+$as_echo "$LD" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi --test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in -@@ -12802,8 +13021,8 @@ case `$LD -v 2>&1 </dev/null` in - ;; - esac - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+$as_echo "$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - -@@ -12853,8 +13072,8 @@ else - fi - - # PORTME: fill in a description of your system's C++ link characteristics --{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) -@@ -12971,18 +13190,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -12997,12 +13219,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -13038,18 +13261,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -13064,12 +13290,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -13799,8 +14026,8 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs_CXX=no - ;; - esac --{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" -@@ -13819,7 +14046,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. -@@ -13975,8 +14202,8 @@ lt_prog_compiler_wl_CXX= - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -14259,18 +14486,18 @@ echo $ECHO_N "checking for $compiler opt - esac - fi - --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_CXX"; then - --{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } - if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -@@ -14285,11 +14512,11 @@ else - -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:14288: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14515: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14292: \$? = $ac_status" >&5 -+ echo "$as_me:14519: \$? = $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. -@@ -14302,8 +14529,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in -@@ -14330,10 +14557,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" --{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } - if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" -@@ -14358,8 +14585,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -@@ -14368,10 +14595,10 @@ else - fi - - --{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } - if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null -@@ -14389,11 +14616,11 @@ else - -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:14392: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14619: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14396: \$? = $ac_status" >&5 -+ echo "$as_me:14623: \$? = $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 -@@ -14415,34 +14642,34 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -14470,8 +14697,8 @@ echo $ECHO_N "checking whether the $comp - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - --{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - # -@@ -14491,15 +14718,15 @@ x|xyes) - # 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. -- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -14517,7 +14744,7 @@ echo $ECHO_N "checking whether -lc shoul - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no -@@ -14529,16 +14756,16 @@ echo $ECHO_N "checking whether -lc shoul - cat conftest.err 1>&5 - fi - $rm conftest* -- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+$as_echo "$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; - esac - --{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+$as_echo_n "checking dynamic linker characteristics... " >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -15099,19 +15326,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -15123,8 +15350,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action_CXX= - if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ -@@ -15148,8 +15375,8 @@ else - # directories. - hardcode_action_CXX=unsupported - fi --{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 --echo "${ECHO_T}$hardcode_action_CXX" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+$as_echo "$hardcode_action_CXX" >&6; } - - if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported -@@ -15687,13 +15914,13 @@ done - cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - --{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+$as_echo_n "checking if libtool supports shared libraries... " >&6; } -+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+$as_echo "$can_build_shared" >&6; } - --{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -15712,15 +15939,15 @@ aix[4-9]*) - fi - ;; - esac --{ echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -+$as_echo "$enable_shared" >&6; } - --{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --{ echo "$as_me:$LINENO: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -+$as_echo "$enable_static" >&6; } - - GCC_F77="$G77" - LD_F77="$LD" -@@ -15729,8 +15956,8 @@ lt_prog_compiler_wl_F77= - lt_prog_compiler_pic_F77= - lt_prog_compiler_static_F77= - --{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' -@@ -15961,18 +16188,18 @@ echo $ECHO_N "checking for $compiler opt - esac - fi - --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+$as_echo "$lt_prog_compiler_pic_F77" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_F77"; then - --{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } - if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -@@ -15987,11 +16214,11 @@ else - -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:15990: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16217: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15994: \$? = $ac_status" >&5 -+ echo "$as_me:16221: \$? = $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. -@@ -16004,8 +16231,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in -@@ -16032,10 +16259,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" --{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } - if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" -@@ -16060,8 +16287,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : -@@ -16070,10 +16297,10 @@ else - fi - - --{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } - if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null -@@ -16091,11 +16318,11 @@ else - -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:16094: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16321: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16098: \$? = $ac_status" >&5 -+ echo "$as_me:16325: \$? = $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 -@@ -16117,34 +16344,34 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag_F77= -@@ -16565,18 +16792,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -16591,12 +16821,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -16621,18 +16852,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -16647,12 +16881,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -17104,8 +17339,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 --echo "${ECHO_T}$ld_shlibs_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+$as_echo "$ld_shlibs_F77" >&6; } - test "$ld_shlibs_F77" = no && can_build_shared=no - - # -@@ -17125,15 +17360,15 @@ x|xyes) - # 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. -- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -17151,7 +17386,7 @@ echo $ECHO_N "checking whether -lc shoul - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no -@@ -17163,16 +17398,16 @@ echo $ECHO_N "checking whether -lc shoul - cat conftest.err 1>&5 - fi - $rm conftest* -- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+$as_echo "$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; - esac - --{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+$as_echo_n "checking dynamic linker characteristics... " >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -17733,19 +17968,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -17757,8 +17992,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action_F77= - if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ -@@ -17782,8 +18017,8 @@ else - # directories. - hardcode_action_F77=unsupported - fi --{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 --echo "${ECHO_T}$hardcode_action_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+$as_echo "$hardcode_action_F77" >&6; } - - if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported -@@ -18293,10 +18528,10 @@ if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - --{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -@@ -18311,11 +18546,11 @@ else - -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:18314: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18549: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18318: \$? = $ac_status" >&5 -+ echo "$as_me:18553: \$? = $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. -@@ -18328,8 +18563,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -18343,8 +18578,8 @@ lt_prog_compiler_wl_GCJ= - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_static_GCJ= - --{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' -@@ -18575,18 +18810,18 @@ echo $ECHO_N "checking for $compiler opt - esac - fi - --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_GCJ"; then - --{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } - if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -@@ -18601,11 +18836,11 @@ else - -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:18604: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18839: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18608: \$? = $ac_status" >&5 -+ echo "$as_me:18843: \$? = $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. -@@ -18618,8 +18853,8 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in -@@ -18646,10 +18881,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" --{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } - if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" -@@ -18674,8 +18909,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : -@@ -18684,10 +18919,10 @@ else - fi - - --{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } - if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null -@@ -18705,11 +18940,11 @@ else - -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:18708: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18943: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18712: \$? = $ac_status" >&5 -+ echo "$as_me:18947: \$? = $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 -@@ -18731,34 +18966,34 @@ else - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then -- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag_GCJ= -@@ -19189,18 +19424,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -19215,12 +19453,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -19255,18 +19494,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -19281,12 +19523,13 @@ if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi - else -- echo "$as_me: failed program was:" >&5 -+ $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 conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -19738,8 +19981,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 --echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+$as_echo "$ld_shlibs_GCJ" >&6; } - test "$ld_shlibs_GCJ" = no && can_build_shared=no - - # -@@ -19759,15 +20002,15 @@ x|xyes) - # 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. -- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -19785,7 +20028,7 @@ echo $ECHO_N "checking whether -lc shoul - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no -@@ -19797,16 +20040,16 @@ echo $ECHO_N "checking whether -lc shoul - cat conftest.err 1>&5 - fi - $rm conftest* -- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+$as_echo "$archive_cmds_need_lc_GCJ" >&6; } - ;; - esac - fi - ;; - esac - --{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+$as_echo_n "checking dynamic linker characteristics... " >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -20367,19 +20610,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -20391,8 +20634,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action_GCJ= - if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ -@@ -20416,8 +20659,8 @@ else - # directories. - hardcode_action_GCJ=unsupported - fi --{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 --echo "${ECHO_T}$hardcode_action_GCJ" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -+$as_echo "$hardcode_action_GCJ" >&6; } - - if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported -@@ -21340,8 +21583,8 @@ CC="$lt_save_CC" - ;; - - *) -- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 --echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -@@ -21360,8 +21603,8 @@ echo "$as_me: error: Unsupported tag nam - chmod +x "$ofile" - else - rm -f "${ofile}T" -- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 --echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi - fi -@@ -21465,8 +21708,8 @@ fi - - - if test $libgtop_smp = auto ; then -- { echo "$as_me:$LINENO: checking whether to enable SMP support" >&5 --echo $ECHO_N "checking whether to enable SMP support... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether to enable SMP support" >&5 -+$as_echo_n "checking whether to enable SMP support... " >&6; } - case "$host_os" in - linux*) - libgtop_smp=yes -@@ -21478,8 +21721,8 @@ echo $ECHO_N "checking whether to enable - libgtop_smp=no - ;; - esac -- { echo "$as_me:$LINENO: result: $libgtop_smp" >&5 --echo "${ECHO_T}$libgtop_smp" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $libgtop_smp" >&5 -+$as_echo "$libgtop_smp" >&6; } - fi - - if test $libgtop_smp = yes ; then -@@ -21501,8 +21744,8 @@ else - fi - - -- { echo "$as_me:$LINENO: checking for libgtop sysdeps directory" >&5 --echo $ECHO_N "checking for libgtop sysdeps directory... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for libgtop sysdeps directory" >&5 -+$as_echo_n "checking for libgtop sysdeps directory... " >&6; } - - case "$host_os" in - linux*) -@@ -21578,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde - - test -z "$libgtop_postinstall" && libgtop_postinstall=: - -- { echo "$as_me:$LINENO: result: $libgtop_sysdeps_dir" >&5 --echo "${ECHO_T}$libgtop_sysdeps_dir" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $libgtop_sysdeps_dir" >&5 -+$as_echo "$libgtop_sysdeps_dir" >&6; } - - - -@@ -21589,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 - *bsd*) - case "$host_os" in - *kfreebsd*) -- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 --echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 -+$as_echo_n "checking for kvm_open in -lkvm... " >&6; } - if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lkvm -lfreebsd -lbsd $LIBS" -@@ -21624,32 +21867,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_kvm_kvm_open=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_kvm_kvm_open=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 --echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 -+$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } - if test $ac_cv_lib_kvm_kvm_open = yes; then - KVM_LIBS="-lkvm -lfreebsd -lbsd" - else -@@ -21657,10 +21904,10 @@ else - fi - ;; - *) -- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 --echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 -+$as_echo_n "checking for kvm_open in -lkvm... " >&6; } - if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lkvm $LIBS" -@@ -21692,32 +21939,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_kvm_kvm_open=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_kvm_kvm_open=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 --echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 -+$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } - if test $ac_cv_lib_kvm_kvm_open = yes; then - KVM_LIBS=-lkvm - else -@@ -21737,6 +21988,82 @@ fi - if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then - EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" - fi -+ { $as_echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5 -+$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; } -+if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lutil $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char kinfo_getfile (); -+int -+main () -+{ -+return kinfo_getfile (); -+ ; -+ 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_util_kinfo_getfile=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_util_kinfo_getfile=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_util_kinfo_getfile" >&5 -+$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; } -+if test $ac_cv_lib_util_kinfo_getfile = yes; then -+ EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil" -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_KINFO_GETFILE 1 -+_ACEOF -+ -+else -+ : -+fi -+ - ;; - esac - -@@ -21745,20 +22072,21 @@ fi - - for ac_header in net/if_var.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21774,32 +22102,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21813,51 +22142,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -21866,29 +22196,31 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- { echo "$as_me:$LINENO: checking for I4B" >&5 --echo $ECHO_N "checking for I4B... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for I4B" >&5 -+$as_echo_n "checking for I4B... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21931,36 +22263,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - have_i4b=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - have_i4b=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- { echo "$as_me:$LINENO: result: $have_i4b" >&5 --echo "${ECHO_T}$have_i4b" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $have_i4b" >&5 -+$as_echo "$have_i4b" >&6; } - if test x$have_i4b = xyes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_I4B 1 - _ACEOF - -- { echo "$as_me:$LINENO: checking for I4B accounting" >&5 --echo $ECHO_N "checking for I4B accounting... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for I4B accounting" >&5 -+$as_echo_n "checking for I4B accounting... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22005,28 +22338,29 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - have_i4b_acct=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - have_i4b_acct=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- { echo "$as_me:$LINENO: result: $have_i4b_acct" >&5 --echo "${ECHO_T}$have_i4b_acct" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $have_i4b_acct" >&5 -+$as_echo "$have_i4b_acct" >&6; } - if test x$have_i4b_acct = xyes ; then - - cat >>confdefs.h <<\_ACEOF -@@ -22034,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - else -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:$LINENO: WARNING: - *** I4B accounting disabled - you won't get any PPP statistics. - *** Read \"misc/i4b_acct.txt\" in the LibGTop source directory - *** to see how to enable it." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - *** I4B accounting disabled - you won't get any PPP statistics. - *** Read \"misc/i4b_acct.txt\" in the LibGTop source directory - *** to see how to enable it." >&2;} - fi - fi - -- { echo "$as_me:$LINENO: checking what we need to define to get struct msginfo" >&5 --echo $ECHO_N "checking what we need to define to get struct msginfo... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking what we need to define to get struct msginfo" >&5 -+$as_echo_n "checking what we need to define to get struct msginfo... " >&6; } - if test "${msginfo_needs+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - msginfo_needs= - for def in nothing KERNEL _KERNEL; do -@@ -22073,13 +22407,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -@@ -22102,7 +22437,7 @@ _ACEOF - - - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -22114,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj - - fi - -- { echo "$as_me:$LINENO: result: $msginfo_needs" >&5 --echo "${ECHO_T}$msginfo_needs" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $msginfo_needs" >&5 -+$as_echo "$msginfo_needs" >&6; } - if test -z "${msginfo_needs}"; then -- { { echo "$as_me:$LINENO: error: Could not find the definition of 'struct msginfo'" >&5 --echo "$as_me: error: Could not find the definition of 'struct msginfo'" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: Could not find the definition of 'struct msginfo'" >&5 -+$as_echo "$as_me: error: Could not find the definition of 'struct msginfo'" >&2;} - { (exit 1); exit 1; }; } - fi - ;; -@@ -22134,20 +22469,21 @@ echo "$as_me: error: Could not find the - - for ac_header in linux/version.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22163,32 +22499,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22202,51 +22539,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22255,21 +22593,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - have_linux_version_h=yes - else -@@ -22288,15 +22628,15 @@ done - os_version_code=`echo "$os_version_expr" | dc` - fi - -- { echo "$as_me:$LINENO: checking for Linux kernel version code" >&5 --echo $ECHO_N "checking for Linux kernel version code... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for Linux kernel version code" >&5 -+$as_echo_n "checking for Linux kernel version code... " >&6; } - - cat >>confdefs.h <<_ACEOF - #define GLIBTOP_LINUX_VERSION_CODE $os_version_code - _ACEOF - -- { echo "$as_me:$LINENO: result: $os_version_code" >&5 --echo "${ECHO_T}$os_version_code" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $os_version_code" >&5 -+$as_echo "$os_version_code" >&6; } - ;; - solaris*) - os_major_version=`uname -r | sed 's/\([0-9]*\).\([0-9]*\)\.*\([0-9]*\)/\1/'` -@@ -22306,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; } - os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q" - os_version_code=`echo "$os_version_expr" | dc` - -- { echo "$as_me:$LINENO: checking for Solaris release code" >&5 --echo $ECHO_N "checking for Solaris release code... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for Solaris release code" >&5 -+$as_echo_n "checking for Solaris release code... " >&6; } - - cat >>confdefs.h <<_ACEOF - #define GLIBTOP_SOLARIS_RELEASE $os_version_code - _ACEOF - -- { echo "$as_me:$LINENO: result: $os_version_code" >&5 --echo "${ECHO_T}$os_version_code" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $os_version_code" >&5 -+$as_echo "$os_version_code" >&6; } - ;; - esac - -- { echo "$as_me:$LINENO: checking for machine.h in libgtop sysdeps dir" >&5 --echo $ECHO_N "checking for machine.h in libgtop sysdeps dir... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $libgtop_use_machine_h" >&5 --echo "${ECHO_T}$libgtop_use_machine_h" >&6; } -- -- { echo "$as_me:$LINENO: checking whether we need libgtop" >&5 --echo $ECHO_N "checking whether we need libgtop... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $libgtop_need_server" >&5 --echo "${ECHO_T}$libgtop_need_server" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for machine.h in libgtop sysdeps dir" >&5 -+$as_echo_n "checking for machine.h in libgtop sysdeps dir... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $libgtop_use_machine_h" >&5 -+$as_echo "$libgtop_use_machine_h" >&6; } -+ -+ { $as_echo "$as_me:$LINENO: checking whether we need libgtop" >&5 -+$as_echo_n "checking whether we need libgtop... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $libgtop_need_server" >&5 -+$as_echo "$libgtop_need_server" >&6; } - - if test x$libgtop_need_server = xyes ; then - -@@ -22379,20 +22719,21 @@ fi - - for ac_header in sys/bitypes.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22408,32 +22749,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22447,51 +22789,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22500,21 +22843,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -22531,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -22549,7 +22894,7 @@ 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -22561,11 +22906,11 @@ esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then -- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --echo "${ECHO_T}$PKG_CONFIG" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+$as_echo "$PKG_CONFIG" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -22574,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the - 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -22592,7 +22937,7 @@ 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -22604,11 +22949,11 @@ esac - fi - ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then -- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+$as_echo "$ac_pt_PKG_CONFIG" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22616,10 +22961,10 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; -@@ -22633,32 +22978,32 @@ fi - fi - if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 -- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - PKG_CONFIG="" - fi - - fi - - pkg_failed=no --{ echo "$as_me:$LINENO: checking for GLIB" >&5 --echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 -+$as_echo_n "checking for GLIB... " >&6; } - - if test -n "$PKG_CONFIG"; then - if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` - else -@@ -22673,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` - else -@@ -22704,7 +23049,7 @@ fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - -- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met: - - $GLIB_PKG_ERRORS - -@@ -22715,7 +23060,7 @@ Alternatively, you may set the environme - and GLIB_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met: -+$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED) were not met: - - $GLIB_PKG_ERRORS - -@@ -22728,7 +23073,7 @@ See the pkg-config man page for more det - " >&2;} - { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+ { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - -@@ -22738,7 +23083,7 @@ See the pkg-config man page for more det - - To get pkg-config, see <http://pkg-config.freedesktop.org/>. - See \`config.log' for more details." >&5 --echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+$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. - -@@ -22752,25 +23097,25 @@ See \`config.log' for more details." >&2 - else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - : - fi - - - - if test "${ac_cv_header_ifaddrs_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 --echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 -+$as_echo_n "checking for ifaddrs.h... " >&6; } - if test "${ac_cv_header_ifaddrs_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 --echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 -+$as_echo "$ac_cv_header_ifaddrs_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5 --echo $ECHO_N "checking ifaddrs.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5 -+$as_echo_n "checking ifaddrs.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22786,32 +23131,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5 --echo $ECHO_N "checking ifaddrs.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5 -+$as_echo_n "checking ifaddrs.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22825,51 +23171,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22878,15 +23225,15 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 --echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for ifaddrs.h" >&5 -+$as_echo_n "checking for ifaddrs.h... " >&6; } - if test "${ac_cv_header_ifaddrs_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_ifaddrs_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 --echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5 -+$as_echo "$ac_cv_header_ifaddrs_h" >&6; } - - fi - if test $ac_cv_header_ifaddrs_h = yes; then -@@ -22904,10 +23251,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 --echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+$as_echo_n "checking for an ANSI C-conforming const... " >&6; } - if test "${ac_cv_c_const+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -22979,20 +23326,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_c_const=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -@@ -23000,20 +23348,20 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 --echo "${ECHO_T}$ac_cv_c_const" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+$as_echo "$ac_cv_c_const" >&6; } - if test $ac_cv_c_const = no; then - - cat >>confdefs.h <<\_ACEOF --#define const -+#define const /**/ - _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for inline" >&5 --echo $ECHO_N "checking for inline... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for inline" >&5 -+$as_echo_n "checking for inline... " >&6; } - if test "${ac_cv_c_inline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do -@@ -23036,20 +23384,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_c_inline=$ac_kw - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -23060,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj - done - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 --echo "${ECHO_T}$ac_cv_c_inline" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+$as_echo "$ac_cv_c_inline" >&6; } - - - case $ac_cv_c_inline in -@@ -23079,26 +23428,58 @@ _ACEOF - ;; - esac - --{ echo "$as_me:$LINENO: checking for off_t" >&5 --echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5 -+$as_echo_n "checking for off_t... " >&6; } - if test "${ac_cv_type_off_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_type_off_t=no -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --typedef off_t ac__type_new_; - int - main () - { --if ((ac__type_new_ *) 0) -- return 0; --if (sizeof (ac__type_new_)) -+if (sizeof (off_t)) -+ return 0; -+ ; - return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval 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 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if (sizeof ((off_t))) -+ return 0; - ; - return 0; - } -@@ -23109,29 +23490,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- ac_cv_type_off_t=yes -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_off_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type_off_t=no -+ - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 --echo "${ECHO_T}$ac_cv_type_off_t" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -+$as_echo "$ac_cv_type_off_t" >&6; } - if test $ac_cv_type_off_t = yes; then - : - else -@@ -23142,26 +23532,58 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for pid_t" >&5 --echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5 -+$as_echo_n "checking for pid_t... " >&6; } - if test "${ac_cv_type_pid_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_type_pid_t=no -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --typedef pid_t ac__type_new_; - int - main () - { --if ((ac__type_new_ *) 0) -- return 0; --if (sizeof (ac__type_new_)) -+if (sizeof (pid_t)) -+ return 0; -+ ; - return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval 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 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if (sizeof ((pid_t))) -+ return 0; - ; - return 0; - } -@@ -23172,29 +23594,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- ac_cv_type_pid_t=yes -+ : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type_pid_t=no -+ ac_cv_type_pid_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+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 --{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 --echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -+$as_echo "$ac_cv_type_pid_t" >&6; } - if test $ac_cv_type_pid_t = yes; then - : - else -@@ -23205,26 +23636,58 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -+$as_echo_n "checking for size_t... " >&6; } - if test "${ac_cv_type_size_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_type_size_t=no -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --typedef size_t ac__type_new_; - int - main () - { --if ((ac__type_new_ *) 0) -- return 0; --if (sizeof (ac__type_new_)) -+if (sizeof (size_t)) -+ return 0; -+ ; - return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval 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 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if (sizeof ((size_t))) -+ return 0; - ; - return 0; - } -@@ -23235,29 +23698,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- ac_cv_type_size_t=yes -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_size_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type_size_t=no -+ - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+$as_echo "$ac_cv_type_size_t" >&6; } - if test $ac_cv_type_size_t = yes; then - : - else -@@ -23268,10 +23740,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 --echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 -+$as_echo_n "checking for struct stat.st_rdev... " >&6; } - if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23296,20 +23768,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_member_struct_stat_st_rdev=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -@@ -23335,20 +23808,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_member_struct_stat_st_rdev=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_stat_st_rdev=no -@@ -23359,8 +23833,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 --echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 -+$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; } - if test $ac_cv_member_struct_stat_st_rdev = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -23375,10 +23849,10 @@ _ACEOF - fi - - --{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 --echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } - if test "${ac_cv_header_time+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23405,20 +23879,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_header_time=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_time=no -@@ -23426,8 +23901,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 --echo "${ECHO_T}$ac_cv_header_time" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -+$as_echo "$ac_cv_header_time" >&6; } - if test $ac_cv_header_time = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -23436,10 +23911,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 --echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } - if test "${ac_cv_struct_tm+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23455,7 +23930,7 @@ main () - { - struct tm tm; - int *p = &tm.tm_sec; -- return !p; -+ return !p; - ; - return 0; - } -@@ -23466,20 +23941,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_struct_tm=time.h - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h -@@ -23487,8 +23963,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 --echo "${ECHO_T}$ac_cv_struct_tm" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -+$as_echo "$ac_cv_struct_tm" >&6; } - if test $ac_cv_struct_tm = sys/time.h; then - - cat >>confdefs.h <<\_ACEOF -@@ -23497,10 +23973,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 --echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -+$as_echo_n "checking for uid_t in sys/types.h... " >&6; } - if test "${ac_cv_type_uid_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23520,8 +23996,8 @@ fi - rm -f conftest* - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 --echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -+$as_echo "$ac_cv_type_uid_t" >&6; } - if test $ac_cv_type_uid_t = no; then - - cat >>confdefs.h <<\_ACEOF -@@ -23536,26 +24012,58 @@ _ACEOF - fi - - --{ echo "$as_me:$LINENO: checking for ssize_t" >&5 --echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5 -+$as_echo_n "checking for ssize_t... " >&6; } - if test "${ac_cv_type_ssize_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_type_ssize_t=no -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --typedef ssize_t ac__type_new_; - int - main () - { --if ((ac__type_new_ *) 0) -- return 0; --if (sizeof (ac__type_new_)) -+if (sizeof (ssize_t)) -+ return 0; -+ ; - return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval 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 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if (sizeof ((ssize_t))) -+ return 0; - ; - return 0; - } -@@ -23566,29 +24074,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 -- ac_cv_type_ssize_t=yes -+ : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type_ssize_t=no -+ ac_cv_type_ssize_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+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 --{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 --echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -+$as_echo "$ac_cv_type_ssize_t" >&6; } - if test $ac_cv_type_ssize_t = yes; then - : - else -@@ -23602,20 +24119,21 @@ fi - - for ac_header in memory.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23631,32 +24149,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23670,51 +24189,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23723,21 +24243,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -23748,20 +24270,21 @@ done - - for ac_header in string.h strings.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23777,32 +24300,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23816,51 +24340,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23869,21 +24394,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - break - fi -@@ -23893,11 +24420,11 @@ done - - for ac_func in strerror - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23950,35 +24477,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - else -@@ -23997,11 +24530,11 @@ DL_LIB= - - for ac_func in dlopen - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24054,43 +24587,49 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - else - -- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" -@@ -24122,40 +24661,44 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dl_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - DL_LIB="-ldl" - else - -- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" -@@ -24187,32 +24730,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dld_shl_load=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then - DL_LIB="-ldld" - else -@@ -24220,11 +24767,11 @@ else - - for ac_func in dlopen - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24277,35 +24824,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - DL_LIB="" - else -@@ -24328,11 +24881,11 @@ LIBS="$LIBS $DL_LIB" - - for ac_func in dlerror - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24385,35 +24938,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -24423,17 +24982,17 @@ LIBS="$oLIBS" - - - if test "${ac_cv_header_linux_isdn_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for linux/isdn.h" >&5 --echo $ECHO_N "checking for linux/isdn.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for linux/isdn.h" >&5 -+$as_echo_n "checking for linux/isdn.h... " >&6; } - if test "${ac_cv_header_linux_isdn_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5 --echo "${ECHO_T}$ac_cv_header_linux_isdn_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5 -+$as_echo "$ac_cv_header_linux_isdn_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking linux/isdn.h usability" >&5 --echo $ECHO_N "checking linux/isdn.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking linux/isdn.h usability" >&5 -+$as_echo_n "checking linux/isdn.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24449,32 +25008,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking linux/isdn.h presence" >&5 --echo $ECHO_N "checking linux/isdn.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking linux/isdn.h presence" >&5 -+$as_echo_n "checking linux/isdn.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24488,51 +25048,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: linux/isdn.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: linux/isdn.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: linux/isdn.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: linux/isdn.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24541,15 +25102,15 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for linux/isdn.h" >&5 --echo $ECHO_N "checking for linux/isdn.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for linux/isdn.h" >&5 -+$as_echo_n "checking for linux/isdn.h... " >&6; } - if test "${ac_cv_header_linux_isdn_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_linux_isdn_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5 --echo "${ECHO_T}$ac_cv_header_linux_isdn_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_isdn_h" >&5 -+$as_echo "$ac_cv_header_linux_isdn_h" >&6; } - - fi - if test $ac_cv_header_linux_isdn_h = yes; then -@@ -24567,10 +25128,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for vmgetinfo in -lperfstat" >&5 --echo $ECHO_N "checking for vmgetinfo in -lperfstat... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for vmgetinfo in -lperfstat" >&5 -+$as_echo_n "checking for vmgetinfo in -lperfstat... " >&6; } - if test "${ac_cv_lib_perfstat_vmgetinfo+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lperfstat $LIBS" -@@ -24602,32 +25163,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_perfstat_vmgetinfo=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_perfstat_vmgetinfo=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_perfstat_vmgetinfo" >&5 --echo "${ECHO_T}$ac_cv_lib_perfstat_vmgetinfo" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_perfstat_vmgetinfo" >&5 -+$as_echo "$ac_cv_lib_perfstat_vmgetinfo" >&6; } - if test $ac_cv_lib_perfstat_vmgetinfo = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -24640,10 +25205,10 @@ fi - case "$host_os" in - solaris*) - --{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 --echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 -+$as_echo_n "checking for kstat_open in -lkstat... " >&6; } - if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lkstat $LIBS" -@@ -24675,32 +25240,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_kstat_kstat_open=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_kstat_kstat_open=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 --echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 -+$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } - if test $ac_cv_lib_kstat_kstat_open = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBKSTAT 1 -@@ -24714,11 +25283,11 @@ fi - - for ac_func in getloadavg swapctl - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24771,35 +25340,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -24809,20 +25384,21 @@ done - - for ac_header in procfs.h sys/procfs.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24838,32 +25414,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24877,51 +25454,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24930,21 +25508,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - break - fi -@@ -24955,10 +25535,10 @@ done - - case $host_os in - solaris[8-9] | solaris2.[0-9].*) -- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 --echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 -+$as_echo_n "checking for kvm_open in -lkvm... " >&6; } - if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lkvm $LIBS" -@@ -24990,41 +25570,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_kvm_kvm_open=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_kvm_kvm_open=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 --echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 -+$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } - if test $ac_cv_lib_kvm_kvm_open = yes; then - - LIBS="-lkvm $LIBS" - - else -- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm with -lelf" >&5 --echo $ECHO_N "checking for kvm_open in -lkvm with -lelf... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for kvm_open in -lkvm with -lelf" >&5 -+$as_echo_n "checking for kvm_open in -lkvm with -lelf... " >&6; } - if test "${ac_cv_lib_kvm_with_elf+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_LIBS="$LIBS" - LIBS="-lkvm -lelf $LIBS" -@@ -25049,26 +25633,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_kvm_with_elf=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_kvm_with_elf=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_save_LIBS" -@@ -25076,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "$ac_cv_lib_kvm_with_elf" = "yes"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - LIBS="-lkvm -lelf $LIBS" - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - fi -@@ -25092,10 +25680,10 @@ fi - esac - - --{ echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 --echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 -+$as_echo_n "checking for vm_statistics in -lmach... " >&6; } - if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmach $LIBS" -@@ -25127,32 +25715,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_mach_vm_statistics=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mach_vm_statistics=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5 --echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5 -+$as_echo "$ac_cv_lib_mach_vm_statistics" >&6; } - if test $ac_cv_lib_mach_vm_statistics = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBMACH 1 -@@ -25165,10 +25757,10 @@ fi - - saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -D_GNU_SOURCE" --{ echo "$as_me:$LINENO: checking whether program_invocation_name must be declared" >&5 --echo $ECHO_N "checking whether program_invocation_name must be declared... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether program_invocation_name must be declared" >&5 -+$as_echo_n "checking whether program_invocation_name must be declared... " >&6; } - if test "${gcc_cv_decl_needed_program_invocation_name+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25211,20 +25803,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - eval "gcc_cv_decl_needed_program_invocation_name=no" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "gcc_cv_decl_needed_program_invocation_name=yes" -@@ -25234,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - gcc_need_declarations="$gcc_need_declarations program_invocation_name" - gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - -@@ -25244,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - CFLAGS=$saved_CFLAGS - --{ echo "$as_me:$LINENO: checking for socket" >&5 --echo $ECHO_N "checking for socket... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for socket" >&5 -+$as_echo_n "checking for socket... " >&6; } - if test "${ac_cv_func_socket+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25307,44 +25900,48 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_socket=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_socket=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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 --echo "${ECHO_T}$ac_cv_func_socket" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 -+$as_echo "$ac_cv_func_socket" >&6; } - if test $ac_cv_func_socket = yes; then - if test "${ac_cv_header_netinet_in_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for netinet/in.h" >&5 --echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -+$as_echo_n "checking for netinet/in.h... " >&6; } - if test "${ac_cv_header_netinet_in_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 --echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -+$as_echo "$ac_cv_header_netinet_in_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 --echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 -+$as_echo_n "checking netinet/in.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25360,32 +25957,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 --echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 -+$as_echo_n "checking netinet/in.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25399,51 +25997,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25452,30 +26051,30 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for netinet/in.h" >&5 --echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -+$as_echo_n "checking for netinet/in.h... " >&6; } - if test "${ac_cv_header_netinet_in_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_netinet_in_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 --echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -+$as_echo "$ac_cv_header_netinet_in_h" >&6; } - - fi - if test $ac_cv_header_netinet_in_h = yes; then - if test "${ac_cv_header_arpa_inet_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 --echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -+$as_echo_n "checking for arpa/inet.h... " >&6; } - if test "${ac_cv_header_arpa_inet_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 --echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -+$as_echo "$ac_cv_header_arpa_inet_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 --echo $ECHO_N "checking arpa/inet.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 -+$as_echo_n "checking arpa/inet.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25491,32 +26090,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 --echo $ECHO_N "checking arpa/inet.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 -+$as_echo_n "checking arpa/inet.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25530,51 +26130,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25583,15 +26184,15 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 --echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -+$as_echo_n "checking for arpa/inet.h... " >&6; } - if test "${ac_cv_header_arpa_inet_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_arpa_inet_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 --echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -+$as_echo "$ac_cv_header_arpa_inet_h" >&6; } - - fi - if test $ac_cv_header_arpa_inet_h = yes; then -@@ -25601,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_SOCKETS 1 - _ACEOF - -- { echo "$as_me:$LINENO: checking \"for sun_len member in struct sockaddr_un\"" >&5 --echo $ECHO_N "checking \"for sun_len member in struct sockaddr_un\"... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking \"for sun_len member in struct sockaddr_un\"" >&5 -+$as_echo_n "checking \"for sun_len member in struct sockaddr_un\"... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25628,32 +26229,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; }; -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; }; - cat >>confdefs.h <<\_ACEOF - #define HAVE_SOCKADDR_SUN_LEN 1 - _ACEOF - - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi -@@ -25667,10 +26272,10 @@ fi - - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! --{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 --echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 -+$as_echo_n "checking for working alloca.h... " >&6; } - if test "${ac_cv_working_alloca_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25694,31 +26299,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_working_alloca_h=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_working_alloca_h=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 --{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 --echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -+$as_echo "$ac_cv_working_alloca_h" >&6; } - if test $ac_cv_working_alloca_h = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -25727,10 +26336,10 @@ _ACEOF - - fi - --{ echo "$as_me:$LINENO: checking for alloca" >&5 --echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 -+$as_echo_n "checking for alloca... " >&6; } - if test "${ac_cv_func_alloca_works+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25774,31 +26383,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_alloca_works=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 --echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -+$as_echo "$ac_cv_func_alloca_works" >&6; } - - if test $ac_cv_func_alloca_works = yes; then - -@@ -25819,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - --{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 --echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } - if test "${ac_cv_os_cray+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25846,15 +26459,15 @@ fi - rm -f conftest* - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 --echo "${ECHO_T}$ac_cv_os_cray" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -+$as_echo "$ac_cv_os_cray" >&6; } - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do -- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25907,33 +26520,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - - cat >>confdefs.h <<_ACEOF - #define CRAY_STACKSEG_END $ac_func -@@ -25945,10 +26564,10 @@ fi - done - fi - --{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 --echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -+$as_echo_n "checking stack direction for C alloca... " >&6; } - if test "${ac_cv_c_stack_direction+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -@@ -25986,36 +26605,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_stack_direction=1 - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_c_stack_direction=-1 - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 --echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -+$as_echo "$ac_cv_c_stack_direction" >&6; } - - cat >>confdefs.h <<_ACEOF - #define STACK_DIRECTION $ac_cv_c_stack_direction -@@ -26028,20 +26650,21 @@ fi - - for ac_header in stdlib.h unistd.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26057,32 +26680,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26096,51 +26720,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -26149,21 +26774,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -26173,11 +26800,11 @@ done - - for ac_func in getpagesize - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26230,44 +26857,50 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - --{ echo "$as_me:$LINENO: checking for working mmap" >&5 --echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 -+$as_echo_n "checking for working mmap... " >&6; } - if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -@@ -26411,36 +27044,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_func_mmap_fixed_mapped=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } - if test $ac_cv_func_mmap_fixed_mapped = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -26450,10 +27086,10 @@ _ACEOF - fi - rm -f conftest.mmap - --{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } - if test "${ac_cv_type_signal+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26478,20 +27114,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_cv_type_signal=int - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -@@ -26499,8 +27136,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --echo "${ECHO_T}$ac_cv_type_signal" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -26510,11 +27147,11 @@ _ACEOF - - for ac_func in strftime - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26567,43 +27204,49 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - else - # strftime is in -lintl on SCO UNIX. --{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 --echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -+$as_echo_n "checking for strftime in -lintl... " >&6; } - if test "${ac_cv_lib_intl_strftime+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -26635,32 +27278,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_strftime=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_strftime=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -+$as_echo "$ac_cv_lib_intl_strftime" >&6; } - if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_STRFTIME 1 -@@ -26681,11 +27328,11 @@ done - - for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26738,35 +27385,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -26776,8 +27429,8 @@ done - - case "$am__api_version" in - 1.01234) -- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 --echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} -+ { { $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; }; } - ;; - *) -@@ -26785,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new - esac - - if test -n "0.35.0"; then -- { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 --echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 -+$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.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; }'` - -- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 --echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } -+ { $as_echo "$as_me:$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" || -- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 --echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 -+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} - { (exit 1); exit 1; }; } - fi - - # Extract the first word of "intltool-update", so it can be a program name with args. - set dummy intltool-update; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $INTLTOOL_UPDATE in - [\\/]* | ?:[\\/]*) -@@ -26820,7 +27473,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -26832,20 +27485,20 @@ esac - fi - INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE - if test -n "$INTLTOOL_UPDATE"; then -- { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 --echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 -+$as_echo "$INTLTOOL_UPDATE" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $INTLTOOL_MERGE in - [\\/]* | ?:[\\/]*) -@@ -26860,7 +27513,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -26872,20 +27525,20 @@ esac - fi - INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE - if test -n "$INTLTOOL_MERGE"; then -- { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 --echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 -+$as_echo "$INTLTOOL_MERGE" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $INTLTOOL_EXTRACT in - [\\/]* | ?:[\\/]*) -@@ -26900,7 +27553,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -26912,17 +27565,17 @@ esac - fi - INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT - if test -n "$INTLTOOL_EXTRACT"; then -- { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 --echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 -+$as_echo "$INTLTOOL_EXTRACT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then -- { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 --echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} -+ { { $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; }; } - fi - -@@ -26969,10 +27622,10 @@ 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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) -@@ -26987,7 +27640,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -26999,20 +27652,20 @@ esac - fi - XGETTEXT=$ac_cv_path_XGETTEXT - if test -n "$XGETTEXT"; then -- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+$as_echo "$XGETTEXT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_MSGMERGE+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) -@@ -27027,7 +27680,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -27039,20 +27692,20 @@ esac - fi - MSGMERGE=$ac_cv_path_MSGMERGE - if test -n "$MSGMERGE"; then -- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 --echo "${ECHO_T}$MSGMERGE" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -+$as_echo "$MSGMERGE" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$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 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $MSGFMT in - [\\/]* | ?:[\\/]*) -@@ -27067,7 +27720,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -27079,34 +27732,34 @@ esac - fi - MSGFMT=$ac_cv_path_MSGFMT - if test -n "$MSGFMT"; then -- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+$as_echo "$MSGFMT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 --echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} -+ { { $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; }; } - fi - xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" - mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" - mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" - if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 --echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} -+ { { $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; }; } - fi - - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $INTLTOOL_PERL in - [\\/]* | ?:[\\/]*) -@@ -27121,7 +27774,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -27133,33 +27786,33 @@ esac - fi - INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL - if test -n "$INTLTOOL_PERL"; then -- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 --echo "${ECHO_T}$INTLTOOL_PERL" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -+$as_echo "$INTLTOOL_PERL" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - if test -z "$INTLTOOL_PERL"; then -- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 --echo "$as_me: error: perl not found; required for intltool" >&2;} -+ { { $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; }; } - fi - if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 --echo "$as_me: error: perl 5.x required for intltool" >&2;} -+ { { $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; }; } - fi - if test "x" != "xno-xml"; then -- { echo "$as_me:$LINENO: checking for XML::Parser" >&5 --echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- { echo "$as_me:$LINENO: result: ok" >&5 --echo "${ECHO_T}ok" >&6; } -+ { $as_echo "$as_me:$LINENO: result: ok" >&5 -+$as_echo "ok" >&6; } - else -- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 --echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} -+ { { $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; }; } - fi - fi -@@ -27192,29 +27845,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - DATADIRNAME=share - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) -- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27267,44 +27923,49 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_bind_textdomain_codeset=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 --echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } - if test $ac_cv_func_bind_textdomain_codeset = yes; then - DATADIRNAME=share - else -- DATADIRNAME=share -+ DATADIRNAME=lib - fi - - ;; - *) -- DATADIRNAME=share -+ 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 -@@ -27326,20 +27987,21 @@ _ACEOF - - for ac_header in locale.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27355,32 +28017,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27394,51 +28057,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27447,21 +28111,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -27469,10 +28135,10 @@ fi - done - - if test $ac_cv_header_locale_h = yes; then -- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 --echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+$as_echo_n "checking for LC_MESSAGES... " >&6; } - if test "${am_cv_val_LC_MESSAGES+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27495,31 +28161,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - am_cv_val_LC_MESSAGES=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=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 --{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 --echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -27538,17 +28208,17 @@ _ACEOF - INTLLIBS= - - if test "${ac_cv_header_libintl_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -+$as_echo_n "checking for libintl.h... " >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+$as_echo "$ac_cv_header_libintl_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 --echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+$as_echo_n "checking libintl.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27564,32 +28234,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 --echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+$as_echo_n "checking libintl.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27603,51 +28274,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27656,15 +28328,15 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -+$as_echo_n "checking for libintl.h... " >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_libintl_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+$as_echo "$ac_cv_header_libintl_h" >&6; } - - fi - if test $ac_cv_header_libintl_h = yes; then -@@ -27674,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t - # - # First check in libc - # -- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 --echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -+$as_echo_n "checking for ngettext in libc... " >&6; } - if test "${gt_cv_func_ngettext_libc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27702,38 +28374,42 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - gt_cv_func_ngettext_libc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=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 --{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 --echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -+$as_echo "$gt_cv_func_ngettext_libc" >&6; } - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 --echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -+$as_echo_n "checking for dgettext in libc... " >&6; } - if test "${gt_cv_func_dgettext_libc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27758,43 +28434,47 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - gt_cv_func_dgettext_libc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=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 --{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 --echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -+$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27847,35 +28527,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -27890,10 +28576,10 @@ done - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - -- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 --echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } - if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -27925,37 +28611,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_bindtextdomain=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } - if test $ac_cv_lib_intl_bindtextdomain = yes; then -- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+$as_echo_n "checking for ngettext in -lintl... " >&6; } - if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -27987,37 +28677,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_ngettext=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+$as_echo "$ac_cv_lib_intl_ngettext" >&6; } - if test $ac_cv_lib_intl_ngettext = yes; then -- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 --echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -+$as_echo_n "checking for dgettext in -lintl... " >&6; } - if test "${ac_cv_lib_intl_dgettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -28049,32 +28743,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_dgettext=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -+$as_echo "$ac_cv_lib_intl_dgettext" >&6; } - if test $ac_cv_lib_intl_dgettext = yes; then - gt_cv_func_dgettext_libintl=yes - fi -@@ -28085,14 +28783,14 @@ fi - - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 --echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: " >&5 --echo "${ECHO_T}" >&6; } -- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: " >&5 -+$as_echo "" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+$as_echo_n "checking for ngettext in -lintl... " >&6; } - if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl -liconv $LIBS" -@@ -28124,37 +28822,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_ngettext=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+$as_echo "$ac_cv_lib_intl_ngettext" >&6; } - if test $ac_cv_lib_intl_ngettext = yes; then -- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 --echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -+$as_echo_n "checking for dcgettext in -lintl... " >&6; } - if test "${ac_cv_lib_intl_dcgettext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl -liconv $LIBS" -@@ -28186,32 +28888,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_intl_dcgettext=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 --echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } - if test $ac_cv_lib_intl_dcgettext = yes; then - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -@@ -28237,11 +28943,11 @@ fi - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -28294,35 +29000,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -28358,10 +29070,10 @@ _ACEOF - - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case "$MSGFMT" in - /*) -@@ -28385,11 +29097,11 @@ esac - fi - MSGFMT="$ac_cv_path_MSGFMT" - if test "$MSGFMT" != "no"; then -- { echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+$as_echo "$MSGFMT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" -@@ -28397,11 +29109,11 @@ fi - - for ac_func in dcgettext - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -28454,43 +29166,49 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - - MSGFMT_OPTS= -- { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 --echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -+$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF - - msgid "" -@@ -28504,25 +29222,25 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - - _ACEOF --if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 -+if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } --else { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+else { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - echo "$as_me: failed input was:" >&5 - sed 's/^/| /' conftest.foo >&5 - fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_GMSGFMT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) -@@ -28537,7 +29255,7 @@ 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" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -28550,20 +29268,20 @@ esac - fi - GMSGFMT=$ac_cv_path_GMSGFMT - if test -n "$GMSGFMT"; then -- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --echo "${ECHO_T}$GMSGFMT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+$as_echo "$GMSGFMT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case "$XGETTEXT" in - /*) -@@ -28587,11 +29305,11 @@ esac - fi - XGETTEXT="$ac_cv_path_XGETTEXT" - if test "$XGETTEXT" != ":"; then -- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+$as_echo "$XGETTEXT" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - cat >conftest.$ac_ext <<_ACEOF -@@ -28616,30 +29334,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - CATOBJEXT=.gmo - DATADIRNAME=share - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) -- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -28692,47 +29413,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_bind_textdomain_codeset=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 --echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } - if test $ac_cv_func_bind_textdomain_codeset = yes; then - CATOBJEXT=.gmo - DATADIRNAME=share - else - CATOBJEXT=.mo -- DATADIRNAME=share -+ DATADIRNAME=lib - fi - - ;; - *) - CATOBJEXT=.mo -- DATADIRNAME=share -+ 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 - LIBS="$glib_save_LIBS" -@@ -28758,8 +29484,8 @@ _ACEOF - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else -- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 --echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } -+ { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi -@@ -28791,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else -- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no -@@ -28816,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b - fi - done - LINGUAS=$NEW_LINGUAS -- { echo "$as_me:$LINENO: result: $LINGUAS" >&5 --echo "${ECHO_T}$LINGUAS" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+$as_echo "$LINGUAS" >&6; } - fi - - if test -n "$LINGUAS"; then -@@ -28855,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de - test "x$exec_prefix" = xNONE && exec_prefix=$prefix - datarootdir=`eval echo "${datarootdir}"` - if test "x$CATOBJEXT" = "x.mo" ; then -- localedir=`eval echo "${prefix}/share/locale"` -+ localedir=`eval echo "${libdir}/locale"` - else - localedir=`eval echo "${datadir}/locale"` - fi -@@ -28869,8 +29595,8 @@ _ACEOF - - - --{ echo "$as_me:$LINENO: checking for X" >&5 --echo $ECHO_N "checking for X... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for X" >&5 -+$as_echo_n "checking for X... " >&6; } - - - # Check whether --with-x was given. -@@ -28884,11 +29610,11 @@ if test "x$with_x" = xno; then - have_x=disabled - else - case $x_includes,$x_libraries in #( -- *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 --echo "$as_me: error: Cannot use X directory names containing '" >&2;} -+ *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -+$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - # One or both of the vars are not set, and there is no cached value. - ac_x_includes=no ac_x_libraries=no -@@ -28909,7 +29635,7 @@ _ACEOF - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl; do -+ for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break -@@ -28984,13 +29710,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -28998,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - # We can compile using X headers with no special include directory. - ac_x_includes= - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do -@@ -29039,30 +29766,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries= - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS --for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+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! -- for ac_extension in a so sl; do -+ for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 -@@ -29071,6 +29801,7 @@ do - done - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi # $ac_x_libraries = no -@@ -29093,8 +29824,8 @@ fi - fi # $with_x != no - - if test "$have_x" != yes; then -- { echo "$as_me:$LINENO: result: $have_x" >&5 --echo "${ECHO_T}$have_x" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $have_x" >&5 -+$as_echo "$have_x" >&6; } - no_x=yes - else - # If each of the values was on the command line, it overrides each guess. -@@ -29104,8 +29835,8 @@ else - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" -- { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -+$as_echo "libraries $x_libraries, headers $x_includes" >&6; } - fi - - if test "$no_x" = yes; then -@@ -29126,8 +29857,8 @@ 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 . . . . -- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 --echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -@@ -29152,23 +29883,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -29193,33 +29927,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { echo "$as_me:$LINENO: result: neither works" >&5 --echo "${ECHO_T}neither works" >&6; } -+ { $as_echo "$as_me:$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 - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag -@@ -29265,27 +30004,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet $LIBS" -@@ -29317,41 +30059,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dnet_dnet_ntoa=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet_stub $LIBS" -@@ -29383,32 +30129,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" - fi -@@ -29416,6 +30166,7 @@ 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 - LIBS="$ac_xsave_LIBS" -@@ -29428,10 +30179,10 @@ 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. -- { echo "$as_me:$LINENO: checking for gethostbyname" >&5 --echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29484,37 +30235,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } -+{ $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 -- { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" -@@ -29546,41 +30301,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_nsl_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } - if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" - fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then -- { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 --echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" -@@ -29612,32 +30371,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_bsd_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } - if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" - fi -@@ -29652,10 +30415,10 @@ 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. -- { echo "$as_me:$LINENO: checking for connect" >&5 --echo $ECHO_N "checking for connect... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29708,37 +30471,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_connect=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_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 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --echo "${ECHO_T}$ac_cv_func_connect" >&6; } -+{ $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 -- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -29770,32 +30537,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_socket_connect=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -+$as_echo "$ac_cv_lib_socket_connect" >&6; } - if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi -@@ -29803,10 +30574,10 @@ fi - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. -- { echo "$as_me:$LINENO: checking for remove" >&5 --echo $ECHO_N "checking for remove... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29859,37 +30630,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_remove=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 --echo "${ECHO_T}$ac_cv_func_remove" >&6; } -+{ $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 -- { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 --echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix $LIBS" -@@ -29921,32 +30696,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_posix_remove=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -+$as_echo "$ac_cv_lib_posix_remove" >&6; } - if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi -@@ -29954,10 +30733,10 @@ fi - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- { echo "$as_me:$LINENO: checking for shmat" >&5 --echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -30010,37 +30789,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_shmat=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 --echo "${ECHO_T}$ac_cv_func_shmat" >&6; } -+{ $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 -- { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 --echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lipc $LIBS" -@@ -30072,32 +30855,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_ipc_shmat=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -+$as_echo "$ac_cv_lib_ipc_shmat" >&6; } - if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi -@@ -30114,10 +30901,10 @@ 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 -- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 --echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } -+ { $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -30149,32 +30936,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_ICE_IceConnectionNumber=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } - if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi -@@ -30184,10 +30975,10 @@ fi - fi - - --{ echo "$as_me:$LINENO: checking for gethostbyname" >&5 --echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } -+{ $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -30240,39 +31031,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -+$as_echo "$ac_cv_func_gethostbyname" >&6; } - if test $ac_cv_func_gethostbyname = yes; then - : - else - --{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -+{ $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" -@@ -30304,32 +31099,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_nsl_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } - if test $ac_cv_lib_nsl_gethostbyname = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBNSL 1 -@@ -30341,10 +31140,10 @@ fi - - fi - --{ echo "$as_me:$LINENO: checking for connect" >&5 --echo $ECHO_N "checking for connect... $ECHO_C" >&6; } -+{ $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -30397,39 +31196,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_connect=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_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 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --echo "${ECHO_T}$ac_cv_func_connect" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -+$as_echo "$ac_cv_func_connect" >&6; } - if test $ac_cv_func_connect = yes; then - : - else - --{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -+{ $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 -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" -@@ -30461,32 +31264,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_socket_connect=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - 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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -+$as_echo "$ac_cv_lib_socket_connect" >&6; } - if test $ac_cv_lib_socket_connect = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBSOCKET 1 -@@ -30498,10 +31305,10 @@ fi - - fi - --{ echo "$as_me:$LINENO: checking for inet_aton" >&5 --echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for inet_aton" >&5 -+$as_echo_n "checking for inet_aton... " >&6; } - if test "${ac_cv_func_inet_aton+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -30554,39 +31361,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_inet_aton=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_inet_aton=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 --{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5 --echo "${ECHO_T}$ac_cv_func_inet_aton" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5 -+$as_echo "$ac_cv_func_inet_aton" >&6; } - if test $ac_cv_func_inet_aton = yes; then - : - else - --{ echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 --echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 -+$as_echo_n "checking for inet_aton in -lresolv... " >&6; } - if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lresolv $LIBS" -@@ -30618,32 +31429,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_resolv_inet_aton=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv_inet_aton=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5 --echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5 -+$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } - if test $ac_cv_lib_resolv_inet_aton = yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBRESOLV 1 -@@ -30660,17 +31475,17 @@ fi - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5 --echo $ECHO_N "checking for X11/Xauth.h... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5 -+$as_echo_n "checking for X11/Xauth.h... " >&6; } - if test "${ac_cv_header_X11_Xauth_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_Xauth_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5 -+$as_echo "$ac_cv_header_X11_Xauth_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking X11/Xauth.h usability" >&5 --echo $ECHO_N "checking X11/Xauth.h usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking X11/Xauth.h usability" >&5 -+$as_echo_n "checking X11/Xauth.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -30686,32 +31501,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking X11/Xauth.h presence" >&5 --echo $ECHO_N "checking X11/Xauth.h presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking X11/Xauth.h presence" >&5 -+$as_echo_n "checking X11/Xauth.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -30725,51 +31541,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: X11/Xauth.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: X11/Xauth.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -30778,15 +31595,15 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5 --echo $ECHO_N "checking for X11/Xauth.h... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5 -+$as_echo_n "checking for X11/Xauth.h... " >&6; } - if test "${ac_cv_header_X11_Xauth_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_header_X11_Xauth_h=$ac_header_preproc - fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5 --echo "${ECHO_T}$ac_cv_header_X11_Xauth_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5 -+$as_echo "$ac_cv_header_X11_Xauth_h" >&6; } - - fi - if test $ac_cv_header_X11_Xauth_h = yes; then -@@ -30796,10 +31613,10 @@ else - fi - - } --test -z "$with_xauth" && { { echo "$as_me:$LINENO: checking for XauGetAuthByAddr in -lXau" >&5 --echo $ECHO_N "checking for XauGetAuthByAddr in -lXau... $ECHO_C" >&6; } -+test -z "$with_xauth" && { { $as_echo "$as_me:$LINENO: checking for XauGetAuthByAddr in -lXau" >&5 -+$as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; } - if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXau $X_LIBS $LIBS" -@@ -30831,32 +31648,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_Xau_XauGetAuthByAddr=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xau_XauGetAuthByAddr=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 --{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5 --echo "${ECHO_T}$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5 -+$as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; } - if test $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then - : - else -@@ -30896,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys - mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \ - sys/filsys.h sys/fs_types.h sys/fs/s5param.h - do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -30925,32 +31747,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -30964,51 +31787,52 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes - else -- echo "$as_me: failed program was:" >&5 -+ $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 --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } -+{ $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: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## ---------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -31017,21 +31841,23 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval echo '${'$as_ac_Header'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - - fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -31061,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f - getcwd getmntinfo gettimeofday isascii lchown \ - listmntent memcpy mkfifo strchr strerror strrchr vprintf - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31118,35 +31944,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=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 --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+if test `eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -31179,10 +32011,10 @@ list_mounted_fs= - # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). - # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, - # -lseq on Dynix/PTX, -lgen on Unixware. --{ echo "$as_me:$LINENO: checking for library containing getmntent" >&5 --echo $ECHO_N "checking for library containing getmntent... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for library containing getmntent" >&5 -+$as_echo_n "checking for library containing getmntent... " >&6; } - if test "${ac_cv_search_getmntent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -31220,26 +32052,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_search_getmntent=$ac_res - else -- echo "$as_me: failed program was:" >&5 -+ $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_getmntent+set}" = set; then -@@ -31254,8 +32090,8 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_search_getmntent" >&5 --echo "${ECHO_T}$ac_cv_search_getmntent" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getmntent" >&5 -+$as_echo "$ac_cv_search_getmntent" >&6; } - ac_res=$ac_cv_search_getmntent - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -31282,10 +32118,10 @@ fi - - if test -z "$list_mounted_fs"; then - # Cray UNICOS 9 --{ echo "$as_me:$LINENO: checking for listmntent of Cray/Unicos-9" >&5 --echo $ECHO_N "checking for listmntent of Cray/Unicos-9... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for listmntent of Cray/Unicos-9" >&5 -+$as_echo_n "checking for listmntent of Cray/Unicos-9... " >&6; } - if test "${fu_cv_sys_mounted_cray_listmntent+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - fu_cv_sys_mounted_cray_listmntent=no - cat >conftest.$ac_ext <<_ACEOF -@@ -31311,8 +32147,8 @@ rm -f conftest* - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_cray_listmntent" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_cray_listmntent" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_cray_listmntent" >&5 -+$as_echo "$fu_cv_sys_mounted_cray_listmntent" >&6; } - if test $fu_cv_sys_mounted_cray_listmntent = yes; then - list_mounted_fs=found - -@@ -31330,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the - - if test -z "$list_mounted_fs"; then - # 4.3BSD, SunOS, HP-UX, Dynix, Irix --{ echo "$as_me:$LINENO: checking for one-argument getmntent function" >&5 --echo $ECHO_N "checking for one-argument getmntent function... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for one-argument getmntent function" >&5 -+$as_echo_n "checking for one-argument getmntent function... " >&6; } - if test "${fu_cv_sys_mounted_getmntent1+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - test $ac_cv_header_mntent_h = yes \ - && fu_cv_sys_mounted_getmntent1=yes \ - || fu_cv_sys_mounted_getmntent1=no - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent1" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_getmntent1" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent1" >&5 -+$as_echo "$fu_cv_sys_mounted_getmntent1" >&6; } - if test $fu_cv_sys_mounted_getmntent1 = yes; then - list_mounted_fs=found - -@@ -31354,10 +32190,10 @@ fi - - if test -z "$list_mounted_fs"; then - # SVR4 --{ echo "$as_me:$LINENO: checking for two-argument getmntent function" >&5 --echo $ECHO_N "checking for two-argument getmntent function... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for two-argument getmntent function" >&5 -+$as_echo_n "checking for two-argument getmntent function... " >&6; } - if test "${fu_cv_sys_mounted_getmntent2+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31378,8 +32214,8 @@ rm -f conftest* - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent2" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_getmntent2" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntent2" >&5 -+$as_echo "$fu_cv_sys_mounted_getmntent2" >&6; } - if test $fu_cv_sys_mounted_getmntent2 = yes; then - list_mounted_fs=found - -@@ -31391,8 +32227,8 @@ fi - fi - - if test -z "$list_mounted_fs"; then --{ { echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5 --echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5 -+$as_echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -31400,10 +32236,10 @@ fi - - if test -z "$list_mounted_fs"; then - # DEC Alpha running OSF/1. --{ echo "$as_me:$LINENO: checking for getfsstat function" >&5 --echo $ECHO_N "checking for getfsstat function... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for getfsstat function" >&5 -+$as_echo_n "checking for getfsstat function... " >&6; } - if test "${fu_cv_sys_mounted_getsstat+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31430,32 +32266,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - fu_cv_sys_mounted_getsstat=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_mounted_getsstat=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 - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getsstat" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_getsstat" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getsstat" >&5 -+$as_echo "$fu_cv_sys_mounted_getsstat" >&6; } - if test $fu_cv_sys_mounted_getsstat = yes; then - list_mounted_fs=found - -@@ -31468,10 +32308,10 @@ fi - - if test -z "$list_mounted_fs"; then - # AIX. --{ echo "$as_me:$LINENO: checking for mntctl function and struct vmount" >&5 --echo $ECHO_N "checking for mntctl function and struct vmount... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for mntctl function and struct vmount" >&5 -+$as_echo_n "checking for mntctl function and struct vmount... " >&6; } - if test "${fu_cv_sys_mounted_vmount+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31486,20 +32326,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - fu_cv_sys_mounted_vmount=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_mounted_vmount=no -@@ -31508,8 +32349,8 @@ fi - rm -f conftest.err conftest.$ac_ext - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_vmount" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_vmount" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_vmount" >&5 -+$as_echo "$fu_cv_sys_mounted_vmount" >&6; } - if test $fu_cv_sys_mounted_vmount = yes; then - list_mounted_fs=found - -@@ -31522,10 +32363,10 @@ fi - - if test -z "$list_mounted_fs"; then - # SVR3 --{ echo "$as_me:$LINENO: checking for FIXME existence of three headers" >&5 --echo $ECHO_N "checking for FIXME existence of three headers... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for FIXME existence of three headers" >&5 -+$as_echo_n "checking for FIXME existence of three headers... " >&6; } - if test "${fu_cv_sys_mounted_fread_fstyp+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31543,20 +32384,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - fu_cv_sys_mounted_fread_fstyp=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_mounted_fread_fstyp=no -@@ -31565,8 +32407,8 @@ fi - rm -f conftest.err conftest.$ac_ext - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread_fstyp" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_fread_fstyp" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread_fstyp" >&5 -+$as_echo "$fu_cv_sys_mounted_fread_fstyp" >&6; } - if test $fu_cv_sys_mounted_fread_fstyp = yes; then - list_mounted_fs=found - -@@ -31579,10 +32421,10 @@ fi - - if test -z "$list_mounted_fs"; then - # 4.4BSD and DEC OSF/1. --{ echo "$as_me:$LINENO: checking for getmntinfo function" >&5 --echo $ECHO_N "checking for getmntinfo function... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for getmntinfo function" >&5 -+$as_echo_n "checking for getmntinfo function... " >&6; } - if test "${fu_cv_sys_mounted_getmntinfo+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - - ok= -@@ -31609,8 +32451,8 @@ test -n "$ok" \ - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo" >&5 -+$as_echo "$fu_cv_sys_mounted_getmntinfo" >&6; } - if test $fu_cv_sys_mounted_getmntinfo = yes; then - list_mounted_fs=found - -@@ -31625,10 +32467,10 @@ fi - - if test -z "$list_mounted_fs"; then - # Ultrix --{ echo "$as_me:$LINENO: checking for getmnt function" >&5 --echo $ECHO_N "checking for getmnt function... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for getmnt function" >&5 -+$as_echo_n "checking for getmnt function... " >&6; } - if test "${fu_cv_sys_mounted_getmnt+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31645,20 +32487,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - fu_cv_sys_mounted_getmnt=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_mounted_getmnt=no -@@ -31667,8 +32510,8 @@ fi - rm -f conftest.err conftest.$ac_ext - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmnt" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_getmnt" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmnt" >&5 -+$as_echo "$fu_cv_sys_mounted_getmnt" >&6; } - if test $fu_cv_sys_mounted_getmnt = yes; then - list_mounted_fs=found - -@@ -31681,10 +32524,10 @@ fi - - if test -z "$list_mounted_fs"; then - # SVR2 --{ echo "$as_me:$LINENO: checking whether it is possible to resort to fread on /etc/mnttab" >&5 --echo $ECHO_N "checking whether it is possible to resort to fread on /etc/mnttab... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether it is possible to resort to fread on /etc/mnttab" >&5 -+$as_echo_n "checking whether it is possible to resort to fread on /etc/mnttab... " >&6; } - if test "${fu_cv_sys_mounted_fread+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31699,20 +32542,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - fu_cv_sys_mounted_fread=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_mounted_fread=no -@@ -31721,8 +32565,8 @@ fi - rm -f conftest.err conftest.$ac_ext - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread" >&5 --echo "${ECHO_T}$fu_cv_sys_mounted_fread" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_fread" >&5 -+$as_echo "$fu_cv_sys_mounted_fread" >&6; } - if test $fu_cv_sys_mounted_fread = yes; then - list_mounted_fs=found - -@@ -31734,15 +32578,15 @@ fi - fi - - if test -z "$list_mounted_fs"; then --{ { echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5 --echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: could not determine how to read list of mounted filesystems" >&5 -+$as_echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;} - { (exit 1); exit 1; }; } - # FIXME -- no need to abort building the whole package - # Cannot build mountlist.c or anything that needs its functions - fi - --{ echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5 --echo "$as_me: checking how to get filesystem space usage..." >&6;} -+{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5 -+$as_echo "$as_me: checking how to get filesystem space usage..." >&6;} - space=no - - # Perform only the link test since it seems there are no variants of the -@@ -31753,10 +32597,10 @@ space=no - # is what it gets when this test fails. - if test $space = no; then - # SVR4 --{ echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5 --echo $ECHO_N "checking statvfs function (SVR4)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5 -+$as_echo_n "checking statvfs function (SVR4)... " >&6; } - if test "${fu_cv_sys_stat_statvfs+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31780,31 +32624,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - fu_cv_sys_stat_statvfs=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_stat_statvfs=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 --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5 -+$as_echo "$fu_cv_sys_stat_statvfs" >&6; } - if test $fu_cv_sys_stat_statvfs = yes; then - space=yes - -@@ -31817,10 +32665,10 @@ fi - - if test $space = no; then - # DEC Alpha running OSF/1 --{ echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5 --echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5 -+$as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; } - if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - fu_cv_sys_stat_statfs3_osf1=no -@@ -31848,37 +32696,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fu_cv_sys_stat_statfs3_osf1=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - fu_cv_sys_stat_statfs3_osf1=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5 -+$as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; } - if test $fu_cv_sys_stat_statfs3_osf1 = yes; then - space=yes - -@@ -31891,10 +32742,10 @@ fi - - if test $space = no; then - # AIX --{ echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 --echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 -+$as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; } - if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - fu_cv_sys_stat_statfs2_bsize=no -@@ -31928,37 +32779,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fu_cv_sys_stat_statfs2_bsize=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - fu_cv_sys_stat_statfs2_bsize=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5 -+$as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; } - if test $fu_cv_sys_stat_statfs2_bsize = yes; then - space=yes - -@@ -31971,10 +32825,10 @@ fi - - if test $space = no; then - # SVR3 --{ echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 --echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 -+$as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; } - if test "${fu_cv_sys_stat_statfs4+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - fu_cv_sys_stat_statfs4=no -@@ -31999,37 +32853,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fu_cv_sys_stat_statfs4=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - fu_cv_sys_stat_statfs4=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5 -+$as_echo "$fu_cv_sys_stat_statfs4" >&6; } - if test $fu_cv_sys_stat_statfs4 = yes; then - space=yes - -@@ -32042,10 +32899,10 @@ fi - - if test $space = no; then - # 4.4BSD and NetBSD --{ echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 --echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 -+$as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; } - if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - fu_cv_sys_stat_statfs2_fsize=no -@@ -32076,37 +32933,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fu_cv_sys_stat_statfs2_fsize=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - fu_cv_sys_stat_statfs2_fsize=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5 -+$as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; } - if test $fu_cv_sys_stat_statfs2_fsize = yes; then - space=yes - -@@ -32119,10 +32979,10 @@ fi - - if test $space = no; then - # Ultrix --{ echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 --echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 -+$as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; } - if test "${fu_cv_sys_stat_fs_data+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then - fu_cv_sys_stat_fs_data=no -@@ -32157,37 +33017,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fu_cv_sys_stat_fs_data=yes - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - fu_cv_sys_stat_fs_data=no - fi -+rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - --{ echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5 --echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5 -+$as_echo "$fu_cv_sys_stat_fs_data" >&6; } - if test $fu_cv_sys_stat_fs_data = yes; then - space=yes - -@@ -32213,13 +33076,14 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -32231,7 +33095,7 @@ _ACEOF - - space=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -32249,10 +33113,10 @@ fi - # Check for SunOS statfs brokenness wrt partitions 2GB and larger. - # If <sys/vfs.h> exists and struct statfs has a member named f_spare, - # enable the work-around code in fsusage.c. --{ echo "$as_me:$LINENO: checking for statfs that truncates block counts" >&5 --echo $ECHO_N "checking for statfs that truncates block counts... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for statfs that truncates block counts" >&5 -+$as_echo_n "checking for statfs that truncates block counts... " >&6; } - if test "${fu_cv_sys_truncating_statfs+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32280,20 +33144,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+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 -- echo "$as_me:$LINENO: \$? = $ac_status" >&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 - fu_cv_sys_truncating_statfs=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fu_cv_sys_truncating_statfs=no -@@ -32309,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi --{ echo "$as_me:$LINENO: result: $fu_cv_sys_truncating_statfs" >&5 --echo "${ECHO_T}$fu_cv_sys_truncating_statfs" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_truncating_statfs" >&5 -+$as_echo "$fu_cv_sys_truncating_statfs" >&6; } - --{ echo "$as_me:$LINENO: checking for AFS..." >&5 --echo "$as_me: checking for AFS..." >&6;} -+{ $as_echo "$as_me:$LINENO: checking for AFS..." >&5 -+$as_echo "$as_me: checking for AFS..." >&6;} - test -d /afs && - cat >>confdefs.h <<\_ACEOF - #define AFS 1 -@@ -32468,32 +33333,32 @@ fi - - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - : - else -- { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&5 --echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&5 -+$as_echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build gtk-doc" >&2;} - { (exit 1); exit 1; }; } - fi - fi - -- { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 --echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 --echo "${ECHO_T}$enable_gtk_doc" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 -+$as_echo "$enable_gtk_doc" >&6; } - - for ac_prog in gtkdoc-check - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - case $GTKDOC_CHECK in - [\\/]* | ?:[\\/]*) -@@ -32508,7 +33373,7 @@ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -32520,11 +33385,11 @@ esac - fi - GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK - if test -n "$GTKDOC_CHECK"; then -- { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 --echo "${ECHO_T}$GTKDOC_CHECK" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 -+$as_echo "$GTKDOC_CHECK" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -32584,11 +33449,12 @@ _ACEOF - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -32621,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && -- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 --echo "$as_me: updating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 --echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -32642,7 +33508,7 @@ ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -- ac_i=`echo "$ac_i" | sed "$ac_script"` -+ 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. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -32654,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs - - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"AMDEP\" was never defined. -+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. -+$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${EXAMPLES_TRUE}" && test -z "${EXAMPLES_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"EXAMPLES\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"EXAMPLES\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"EXAMPLES\" was never defined. -+$as_echo "$as_me: error: conditional \"EXAMPLES\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HACKER_MODE_TRUE}" && test -z "${HACKER_MODE_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"HACKER_MODE\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HACKER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"HACKER_MODE\" was never defined. -+$as_echo "$as_me: error: conditional \"HACKER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${LIBGTOP_SMP_TRUE}" && test -z "${LIBGTOP_SMP_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SMP\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"LIBGTOP_SMP\" was never defined. -+$as_echo "$as_me: error: conditional \"LIBGTOP_SMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${NEED_LIBGTOP_TRUE}" && test -z "${NEED_LIBGTOP_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"NEED_LIBGTOP\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_LIBGTOP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"NEED_LIBGTOP\" was never defined. -+$as_echo "$as_me: error: conditional \"NEED_LIBGTOP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE}" && test -z "${LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined. -+$as_echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE}" && test -z "${LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined. -+$as_echo "$as_me: error: conditional \"LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -@@ -32735,26 +33601,27 @@ fi - - - if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then -- { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+ { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -32767,7 +33634,7 @@ ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -32777,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -32799,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+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 -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -32825,8 +33720,6 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -32849,7 +33742,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -32862,17 +33755,10 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -32894,7 +33780,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -32945,7 +33831,7 @@ $as_unset CDPATH - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -32973,7 +33859,6 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -32986,19 +33871,22 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -33023,10 +33911,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -33049,7 +33937,7 @@ exec 6>&1 - # values after options handling. - ac_log=" - This file was extended by libgtop $as_me 2.24.0, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.62. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -33062,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null | - - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. - config_files="$ac_config_files" - config_headers="$ac_config_headers" -@@ -33070,7 +33958,7 @@ config_commands="$ac_config_commands" - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -33083,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]... - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -33099,24 +33987,25 @@ $config_commands - Report bugs to <bug-autoconf@gnu.org>." - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - libgtop config.status 2.24.0 --configured by $0, generated by GNU Autoconf 2.61, -- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.62, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2006 Free Software Foundation, Inc. -+Copyright (C) 2008 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - - ac_pwd='$ac_pwd' - srcdir='$srcdir' - INSTALL='$INSTALL' -+AWK='$AWK' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do -@@ -33138,30 +34027,36 @@ do - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -- echo "$ac_cs_version"; exit ;; -+ $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- { echo "$as_me: error: ambiguous option: $1 -+ { $as_echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) -- echo "$ac_cs_usage"; exit ;; -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { echo "$as_me: error: unrecognized option: $1 -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -@@ -33180,27 +34075,29 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- CONFIG_SHELL=$SHELL -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' - export CONFIG_SHELL -- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ exec "\$@" - fi - - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - exec 5>>config.log - { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX - ## Running $as_me. ## - _ASBOX -- echo "$ac_log" -+ $as_echo "$ac_log" - } >&5 - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # - # INIT-COMMANDS - # -@@ -33209,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - - # Handling of arguments. - for ac_config_target in $ac_config_targets -@@ -33247,8 +34144,8 @@ do - "libgtopconfig.h") CONFIG_FILES="$CONFIG_FILES libgtopconfig.h" ;; - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done -@@ -33289,357 +34186,143 @@ $debug || - (umask 077 && mkdir "$tmp") - } || - { -- echo "$me: cannot create a temporary directory in ." >&2 -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --# --# Set up the sed scripts for CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. - if test -n "$CONFIG_FILES"; then - --_ACEOF -- - -- --ac_delim='%!_!# ' --for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --SHELL!$SHELL$ac_delim --PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim --PACKAGE_NAME!$PACKAGE_NAME$ac_delim --PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim --PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim --PACKAGE_STRING!$PACKAGE_STRING$ac_delim --PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim --exec_prefix!$exec_prefix$ac_delim --prefix!$prefix$ac_delim --program_transform_name!$program_transform_name$ac_delim --bindir!$bindir$ac_delim --sbindir!$sbindir$ac_delim --libexecdir!$libexecdir$ac_delim --datarootdir!$datarootdir$ac_delim --datadir!$datadir$ac_delim --sysconfdir!$sysconfdir$ac_delim --sharedstatedir!$sharedstatedir$ac_delim --localstatedir!$localstatedir$ac_delim --includedir!$includedir$ac_delim --oldincludedir!$oldincludedir$ac_delim --docdir!$docdir$ac_delim --infodir!$infodir$ac_delim --htmldir!$htmldir$ac_delim --dvidir!$dvidir$ac_delim --pdfdir!$pdfdir$ac_delim --psdir!$psdir$ac_delim --libdir!$libdir$ac_delim --localedir!$localedir$ac_delim --mandir!$mandir$ac_delim --DEFS!$DEFS$ac_delim --ECHO_C!$ECHO_C$ac_delim --ECHO_N!$ECHO_N$ac_delim --ECHO_T!$ECHO_T$ac_delim --LIBS!$LIBS$ac_delim --build_alias!$build_alias$ac_delim --host_alias!$host_alias$ac_delim --target_alias!$target_alias$ac_delim --build!$build$ac_delim --build_cpu!$build_cpu$ac_delim --build_vendor!$build_vendor$ac_delim --build_os!$build_os$ac_delim --host!$host$ac_delim --host_cpu!$host_cpu$ac_delim --host_vendor!$host_vendor$ac_delim --host_os!$host_os$ac_delim --target!$target$ac_delim --target_cpu!$target_cpu$ac_delim --target_vendor!$target_vendor$ac_delim --target_os!$target_os$ac_delim --INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim --INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim --INSTALL_DATA!$INSTALL_DATA$ac_delim --CYGPATH_W!$CYGPATH_W$ac_delim --PACKAGE!$PACKAGE$ac_delim --VERSION!$VERSION$ac_delim --ACLOCAL!$ACLOCAL$ac_delim --AUTOCONF!$AUTOCONF$ac_delim --AUTOMAKE!$AUTOMAKE$ac_delim --AUTOHEADER!$AUTOHEADER$ac_delim --MAKEINFO!$MAKEINFO$ac_delim --install_sh!$install_sh$ac_delim --STRIP!$STRIP$ac_delim --INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim --mkdir_p!$mkdir_p$ac_delim --AWK!$AWK$ac_delim --SET_MAKE!$SET_MAKE$ac_delim --am__leading_dot!$am__leading_dot$ac_delim --AMTAR!$AMTAR$ac_delim --am__tar!$am__tar$ac_delim --am__untar!$am__untar$ac_delim --ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim --LIBGTOP_MAJOR_VERSION!$LIBGTOP_MAJOR_VERSION$ac_delim --LIBGTOP_MINOR_VERSION!$LIBGTOP_MINOR_VERSION$ac_delim --LIBGTOP_MICRO_VERSION!$LIBGTOP_MICRO_VERSION$ac_delim --LIBGTOP_SERVER_VERSION!$LIBGTOP_SERVER_VERSION$ac_delim --LIBGTOP_VERSION!$LIBGTOP_VERSION$ac_delim --LIBGTOP_VERSION_CODE!$LIBGTOP_VERSION_CODE$ac_delim --LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim --CC!$CC$ac_delim --CFLAGS!$CFLAGS$ac_delim --LDFLAGS!$LDFLAGS$ac_delim --CPPFLAGS!$CPPFLAGS$ac_delim --ac_ct_CC!$ac_ct_CC$ac_delim --EXEEXT!$EXEEXT$ac_delim --OBJEXT!$OBJEXT$ac_delim --DEPDIR!$DEPDIR$ac_delim --am__include!$am__include$ac_delim --am__quote!$am__quote$ac_delim --AMDEP_TRUE!$AMDEP_TRUE$ac_delim --AMDEP_FALSE!$AMDEP_FALSE$ac_delim --AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim --CCDEPMODE!$CCDEPMODE$ac_delim --am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim --am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim --CPP!$CPP$ac_delim --GREP!$GREP$ac_delim --EGREP!$EGREP$ac_delim --_ACEOF -- -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -- break -- elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -- else -- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -- fi --done -- --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` -+ac_cr='
' -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr - fi - --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS <conf$$subs.sed --rm -f conf$$subs.sed --cat >>$CONFIG_STATUS <<_ACEOF --CEOF$ac_eof -+echo 'BEGIN {' >"$tmp/subs1.awk" && - _ACEOF - - -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --libgtop_top_builddir!$libgtop_top_builddir$ac_delim --PERL!$PERL$ac_delim --RANLIB!$RANLIB$ac_delim --AS!$AS$ac_delim --AR!$AR$ac_delim --LN_S!$LN_S$ac_delim --SED!$SED$ac_delim --ECHO!$ECHO$ac_delim --DSYMUTIL!$DSYMUTIL$ac_delim --NMEDIT!$NMEDIT$ac_delim --CXX!$CXX$ac_delim --CXXFLAGS!$CXXFLAGS$ac_delim --ac_ct_CXX!$ac_ct_CXX$ac_delim --CXXDEPMODE!$CXXDEPMODE$ac_delim --am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim --am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim --CXXCPP!$CXXCPP$ac_delim --F77!$F77$ac_delim --FFLAGS!$FFLAGS$ac_delim --ac_ct_F77!$ac_ct_F77$ac_delim --LIBTOOL!$LIBTOOL$ac_delim --CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim --CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim --libgtop_sysdeps_dir!$libgtop_sysdeps_dir$ac_delim --libgtop_use_machine_h!$libgtop_use_machine_h$ac_delim --libgtop_need_server!$libgtop_need_server$ac_delim --EXAMPLES_TRUE!$EXAMPLES_TRUE$ac_delim --EXAMPLES_FALSE!$EXAMPLES_FALSE$ac_delim --HACKER_MODE_TRUE!$HACKER_MODE_TRUE$ac_delim --HACKER_MODE_FALSE!$HACKER_MODE_FALSE$ac_delim --LIBGTOP_SMP_TRUE!$LIBGTOP_SMP_TRUE$ac_delim --LIBGTOP_SMP_FALSE!$LIBGTOP_SMP_FALSE$ac_delim --libgtop_postinstall!$libgtop_postinstall$ac_delim --libgtop_have_sysinfo!$libgtop_have_sysinfo$ac_delim --KVM_LIBS!$KVM_LIBS$ac_delim --EXTRA_SYSDEPS_LIBS!$EXTRA_SYSDEPS_LIBS$ac_delim --NEED_LIBGTOP_TRUE!$NEED_LIBGTOP_TRUE$ac_delim --NEED_LIBGTOP_FALSE!$NEED_LIBGTOP_FALSE$ac_delim --LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE!$LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_TRUE$ac_delim --LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE!$LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST_FALSE$ac_delim --LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE!$LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_TRUE$ac_delim --LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE!$LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE_FALSE$ac_delim --PKG_CONFIG!$PKG_CONFIG$ac_delim --GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim --GLIB_LIBS!$GLIB_LIBS$ac_delim --LIBOBJS!$LIBOBJS$ac_delim --DL_LIB!$DL_LIB$ac_delim --ALLOCA!$ALLOCA$ac_delim --INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim --INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim --INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim --INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim --INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim --INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim --INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim --INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim --INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim --INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim --INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim --INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim --INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim --INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim --INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim --INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim --INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim --INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim --INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim --INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim --INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim --INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim --XGETTEXT!$XGETTEXT$ac_delim --MSGMERGE!$MSGMERGE$ac_delim --MSGFMT!$MSGFMT$ac_delim --INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim --ALL_LINGUAS!$ALL_LINGUAS$ac_delim --DATADIRNAME!$DATADIRNAME$ac_delim --GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim --USE_NLS!$USE_NLS$ac_delim --MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim --GMSGFMT!$GMSGFMT$ac_delim --CATALOGS!$CATALOGS$ac_delim --CATOBJEXT!$CATOBJEXT$ac_delim --GMOFILES!$GMOFILES$ac_delim --INSTOBJEXT!$INSTOBJEXT$ac_delim --INTLLIBS!$INTLLIBS$ac_delim --PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim --PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim --POFILES!$POFILES$ac_delim --POSUB!$POSUB$ac_delim --MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim --XMKMF!$XMKMF$ac_delim --X_CFLAGS!$X_CFLAGS$ac_delim --X_PRE_LIBS!$X_PRE_LIBS$ac_delim --X_LIBS!$X_LIBS$ac_delim --X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim --libs_xauth!$libs_xauth$ac_delim --sysdeps_dir!$sysdeps_dir$ac_delim --_ACEOF -+ . ./conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then - break - elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi - done -+rm -f conf$$subs.sh - --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` --fi -- --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS <conf$$subs.sed --rm -f conf$$subs.sed --cat >>$CONFIG_STATUS <<_ACEOF --CEOF$ac_eof -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && - _ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' <conf$$subs.awk | sed ' -+/^[^""]/{ -+ N -+ s/\n// -+} -+' >>$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } - --ac_delim='%!_!# ' --for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --machine_incs!$machine_incs$ac_delim --INCLUDES!$INCLUDES$ac_delim --LIBGTOP_EXTRA_LIBS!$LIBGTOP_EXTRA_LIBS$ac_delim --LIBGTOP_LIBS!$LIBGTOP_LIBS$ac_delim --LIBGTOP_INCS!$LIBGTOP_INCS$ac_delim --LIBGTOP_BINDIR!$LIBGTOP_BINDIR$ac_delim --LIBGTOP_SERVER!$LIBGTOP_SERVER$ac_delim --sysdeps_suid_lib!$sysdeps_suid_lib$ac_delim --server_programs!$server_programs$ac_delim --HTML_DIR!$HTML_DIR$ac_delim --GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim --ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim --ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim --GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim --GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim --LTLIBOBJS!$LTLIBOBJS$ac_delim --_ACEOF -+ print line -+} - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then -- break -- elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } -- else -- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -- fi --done -- --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` --fi -- --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS <conf$$subs.sed --rm -f conf$$subs.sed --cat >>$CONFIG_STATUS <<_ACEOF --:end --s/|#_!!_#|//g --CEOF$ac_eof - _ACEOF - -- - # VPATH may cause trouble with some makes, so we remove $(srcdir), - # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and - # trailing colons and then remove the whole line if VPATH becomes empty -@@ -33655,19 +34338,133 @@ s/^[^=]*=[ ]*$// - }' - fi - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - fi # test -n "$CONFIG_FILES" - -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then -+ break -+ elif $ac_last_try; then -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' <confdefs.h | sed ' -+s/'"$ac_delim"'/"\\\ -+"/g' >>$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", line, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -+$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -+ { (exit 1); exit 1; }; } -+fi # test -n "$CONFIG_HEADERS" -+ - --for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -+shift -+for ac_tag - do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 --echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -33696,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac -- ac_file_inputs="$ac_file_inputs $ac_f" -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ ac_file_inputs="$ac_file_inputs '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -- configure_input="Generated from "`IFS=: -- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin";; -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; - esac - ;; - esac -@@ -33725,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --echo X"$ac_file" | -+$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -33751,7 +34560,7 @@ echo X"$ac_file" | - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -33760,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --echo X"$as_dir" | -+$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -33781,17 +34590,17 @@ echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -33831,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - esac - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # 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= - --case `sed -n '/datarootdir/ { -+ac_sed_dataroot=' -+/datarootdir/ { - p - q - } -@@ -33845,13 +34655,14 @@ case `sed -n '/datarootdir/ { - /@infodir@/p - /@localedir@/p - /@mandir@/p --' $ac_file_inputs` in -+' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 --echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g -@@ -33865,15 +34676,16 @@ _ACEOF - # Neutralize VPATH when `$srcdir' = `.'. - # Shell code in configure.ac might set extrasub. - # FIXME: do we really want to maintain this feature? --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s&@configure_input@&$configure_input&;t t -+s|@configure_input@|$ac_sed_conf_input|;t t - s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t - s&@srcdir@&$ac_srcdir&;t t - s&@abs_srcdir@&$ac_abs_srcdir&;t t - s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -33883,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - s&@INSTALL@&$ac_INSTALL&;t t - $ac_datarootdir_hack --" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 --echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+$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;} - - rm -f "$tmp/stdin" - case $ac_file in -- -) cat "$tmp/out"; rm -f "$tmp/out";; -- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; -- esac -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - ;; - :H) - # - # CONFIG_HEADER - # --_ACEOF -- --# Transform confdefs.h into a sed script `conftest.defines', that --# substitutes the proper values into config.h.in to produce config.h. --rm -f conftest.defines conftest.tail --# First, append a space to every undef/define line, to ease matching. --echo 's/$/ /' >conftest.defines --# Then, protect against being on the right side of a sed subst, or in --# an unquoted here document, in config.status. If some macros were --# called several times there might be several #defines for the same --# symbol, which is useless. But do not sort them, since the last --# AC_DEFINE must be honored. --ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* --# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where --# NAME is the cpp macro being defined, VALUE is the value it is being given. --# PARAMS is the parameter list in the macro definition--in most cases, it's --# just an empty string. --ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' --ac_dB='\\)[ (].*,\\1define\\2' --ac_dC=' ' --ac_dD=' ,' -- --uniq confdefs.h | -- sed -n ' -- t rset -- :rset -- s/^[ ]*#[ ]*define[ ][ ]*// -- t ok -- d -- :ok -- s/[\\&,]/\\&/g -- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -- ' >>conftest.defines -- --# Remove the space that was appended to ease matching. --# Then replace #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --# (The regexp can be short, since the line contains either #define or #undef.) --echo 's/ $// --s,^[ #]*u.*,/* & */,' >>conftest.defines -- --# Break up conftest.defines: --ac_max_sed_lines=50 -- --# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" --# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" --# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" --# et cetera. --ac_in='$ac_file_inputs' --ac_out='"$tmp/out1"' --ac_nxt='"$tmp/out2"' -- --while : --do -- # Write a here document: -- cat >>$CONFIG_STATUS <<_ACEOF -- # First, check the format of the line: -- cat >"\$tmp/defines.sed" <<\\CEOF --/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def --/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def --b --:def --_ACEOF -- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS -- echo 'CEOF -- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -- grep . conftest.tail >/dev/null || break -- rm -f conftest.defines -- mv conftest.tail conftest.defines --done --rm -f conftest.defines conftest.tail -- --echo "ac_result=$ac_in" >>$CONFIG_STATUS --cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then -- echo "/* $configure_input */" >"$tmp/config.h" -- cat "$ac_result" >>"$tmp/config.h" -- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --echo "$as_me: $ac_file is unchanged" >&6;} -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} - else -- rm -f $ac_file -- mv "$tmp/config.h" $ac_file -+ rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - fi - else -- echo "/* $configure_input */" -- cat "$ac_result" -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -+$as_echo "$as_me: error: could not create -" >&2;} -+ { (exit 1); exit 1; }; } - fi -- rm -f "$tmp/out12" --# Compute $ac_file's index in $config_headers. -+# Compute "$ac_file"'s index in $config_headers. - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ "$ac_file" | "$ac_file":* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| . 2>/dev/null || --echo X$ac_file | -+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -34031,8 +34782,8 @@ echo X$ac_file | - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - -- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 --echo "$as_me: executing $ac_file commands" >&6;} -+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - -@@ -34053,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || --echo X"$mf" | -+$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -34097,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || --echo X"$file" | -+$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -34123,7 +34874,7 @@ echo X"$file" | - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -34132,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --echo X"$as_dir" | -+$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -34153,8 +34904,8 @@ echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" -@@ -34174,8 +34925,8 @@ done - "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - - if test ! -f "po/Makefile"; then -- { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 --echo "$as_me: error: po/Makefile is not ready." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 -+$as_echo "$as_me: error: po/Makefile is not ready." >&2;} - { (exit 1); exit 1; }; } - fi - mv "po/Makefile" "po/Makefile.tmp" -@@ -34197,6 +34948,11 @@ _ACEOF - chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -34218,4 +34974,8 @@ if test "$no_create" != yes; then - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} -+fi - diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4 deleted file mode 100644 index 1805da02a..000000000 --- a/devel/libgtop/files/patch-libgtop-sysdeps.m4 +++ /dev/null @@ -1,12 +0,0 @@ ---- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400 -+++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500 -@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ - if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then - EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" - fi -+ AC_CHECK_LIB(util, kinfo_getfile, -+ [EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil" -+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:]) - ;; - esac - diff --git a/devel/libgtop/files/patch-src_daemon_server.c b/devel/libgtop/files/patch-src_daemon_server.c deleted file mode 100644 index bf0bba5c7..000000000 --- a/devel/libgtop/files/patch-src_daemon_server.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/daemon/server.c.orig Mon Feb 17 15:22:19 2003 -+++ src/daemon/server.c Mon Feb 17 15:23:31 2003 -@@ -88,11 +88,12 @@ - if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) || - strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) || - strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) { -- fprintf (stderr, "Can only run on %s %s %s\n", -+ fprintf (stderr, "This libgtop was compiled on %s %s %s\n", - LIBGTOP_COMPILE_SYSTEM, - LIBGTOP_COMPILE_RELEASE, - LIBGTOP_COMPILE_MACHINE); -- _exit (1); -+ fprintf (stderr, "If you see strange problems caused by it,\n"); -+ fprintf (stderr, "you should recompile libgtop and dependent applications\n"); - } - #endif - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am deleted file mode 100644 index 25ec1f7d7..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ ---- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400 -+++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400 -@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. - cpu.c msg_limits.c sem_limits.c loadavg.c \ - uptime.c netlist.c fsusage.c mem.c \ - mountlist.c procopenfiles.c procwd.c \ -- procaffinity.c glibtop_private.c -+ procaffinity.c glibtop_private.c open.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - - libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ -+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ - proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c \ - prockernel.c procsegment.c procargs.c \ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index f68c6d0d1..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig 2008-09-29 17:24:03.000000000 -0400 -+++ sysdeps/freebsd/Makefile.in 2008-09-29 17:24:44.000000000 -0400 -@@ -54,12 +54,13 @@ libgtop_sysdeps_2_0_la_LIBADD = - am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \ - shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \ - uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \ -- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo -+ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \ -+ open.lo - libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) - am__DEPENDENCIES_1 = - libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \ -+am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo \ - procmap.lo netload.lo ppp.lo -@@ -306,11 +307,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. - cpu.c msg_limits.c sem_limits.c loadavg.c \ - uptime.c netlist.c fsusage.c mem.c \ - mountlist.c procopenfiles.c procwd.c \ -- procaffinity.c glibtop_private.c -+ procaffinity.c glibtop_private.c open.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ -+libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ - proclist.c procstate.c procuid.c \ - proctime.c procmem.c procsignal.c \ - prockernel.c procsegment.c procargs.c \ -@@ -385,6 +386,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c deleted file mode 100644 index acb327f98..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c +++ /dev/null @@ -1,19 +0,0 @@ ---- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400 -+++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400 -@@ -21,16 +21,8 @@ - - #include <config.h> - #include <glibtop.h> --#include <glibtop/open.h> - #include <glibtop/close.h> - - void --glibtop_open_s (glibtop *server, -- const char *program_name, -- const unsigned long features, -- const unsigned flags) --{ } -- --void - glibtop_close_s (glibtop *server) - { } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c deleted file mode 100644 index f7bf0e3b1..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_open.c +++ /dev/null @@ -1,91 +0,0 @@ ---- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400 -+++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400 -@@ -20,76 +20,33 @@ - */ - - #include <config.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> - #include <glibtop.h> --#include <glibtop/error.h> - #include <glibtop/open.h> --#include <glibtop/init_hooks.h> -- --/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ -- --void --glibtop_init_p (glibtop *server, const unsigned long features, -- const unsigned flags) --{ -- const _glibtop_init_func_t *init_fkt; -- -- if (server == NULL) -- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); -- -- /* Do the initialization, but only if not already initialized. */ -- -- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { -- glibtop_open_p (server, "glibtop", features, flags); -+#include <glibtop/cpu.h> -+#include <glibtop/error.h> - -- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) -- (*init_fkt) (server); -+#include <glibtop_private.h> - -- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; -- } --} - - void --glibtop_open_p (glibtop *server, const char *program_name, -+glibtop_open_s (glibtop *server, const char *program_name, - const unsigned long features, - const unsigned flags) - { --#ifdef DEBUG -- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); --#endif -+ int ncpus; -+ size_t len; - -- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ -+ len = sizeof (ncpus); -+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ server->real_ncpu = ncpus - 1; -+ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu); - -- server->machine.uid = getuid (); -- server->machine.euid = geteuid (); -- server->machine.gid = getgid (); -- server->machine.egid = getegid (); - #if defined(__FreeBSD_kernel__) - server->os_version_code = __FreeBSD_kernel_version; - #else - server->os_version_code = __FreeBSD_version; - #endif -- /* Setup machine-specific data */ -- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); -- -- if (server->machine.kd == NULL) -- glibtop_error_io_r (server, "kvm_open"); -- -- /* Drop priviledges. */ -- -- if (setreuid (server->machine.euid, server->machine.uid)) -- _exit (1); -- -- if (setregid (server->machine.egid, server->machine.gid)) -- _exit (1); -- -- /* !!! END OF SUID ROOT PART !!! */ -- -- /* Our effective uid is now those of the user invoking the server, -- * so we do no longer have any priviledges. */ - -- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to -- * be sgid kmem. -- * -- * The server will only use setegid() to get back it's priviledges, -- * so it will fail if it is suid root and not sgid kmem. */ - } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c deleted file mode 100644 index e14dd39bd..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ /dev/null @@ -1,59 +0,0 @@ ---- sysdeps/freebsd/procopenfiles.c.orig 2008-08-18 11:23:36.000000000 -0400 -+++ sysdeps/freebsd/procopenfiles.c 2008-12-07 00:17:26.000000000 -0500 -@@ -35,6 +35,9 @@ - #include <sys/user.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#ifdef HAVE_KINFO_PROC -+#include <libutil.h> -+#endif - #include <string.h> - #include <stdlib.h> - -@@ -263,8 +266,12 @@ glibtop_get_proc_open_files_s (glibtop * - { - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) - struct kinfo_file *freep, *kif; -+#ifndef HAVE_KINFO_GETFILE - int name[4]; - size_t len; -+#else -+ int cnt; -+#endif - size_t i; - #else - char *output; -@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop * - memset(buf, 0, sizeof (glibtop_proc_open_files)); - - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+#ifndef HAVE_KINFO_GETFILE - name[0] = CTL_KERN; - name[1] = KERN_PROC; - name[2] = KERN_PROC_FILEDESC; -@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop * - g_free(freep); - return NULL; - } -+#else -+ freep = kinfo_getfile(pid, &cnt); -+#endif - - entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); - -+#ifndef HAVE_KINFO_GETFILE - for (i = 0; i < len / sizeof(*kif); i++, kif++) { - glibtop_open_files_entry entry = {0}; - -+ if (kif->kf_structsize != sizeof(*kif)) -+ continue; -+#else -+ for (i = 0; i < cnt; i++) { -+ glibtop_open_files_entry entry = {0}; -+ -+ kif = &freep[i]; -+#endif -+ - if (kif->kf_fd < 0) - continue; - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c deleted file mode 100644 index 731fec120..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ /dev/null @@ -1,58 +0,0 @@ ---- sysdeps/freebsd/procwd.c.orig 2008-08-18 11:23:36.000000000 -0400 -+++ sysdeps/freebsd/procwd.c 2008-12-07 00:19:44.000000000 -0500 -@@ -27,6 +27,9 @@ - #include <sys/sysctl.h> - #include <sys/param.h> - #include <sys/user.h> -+#ifdef HAVE_KINFO_GETFILE -+#include <libutil.h> -+#endif - #include <string.h> - - static const unsigned long _glibtop_sysdeps_proc_wd = -@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) - struct kinfo_file *freep, *kif; - GPtrArray *dirs; -+#ifndef HAVE_KINFO_GETFILE - size_t len; -- int i; - int name[4]; - #else -+ int cnt; -+#endif -+ int i; -+#else - char *output; - #endif - -@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g - buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); - - #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+#ifndef HAVE_KINFO_GETFILE - name[0] = CTL_KERN; - name[1] = KERN_PROC; - name[2] = KERN_PROC_FILEDESC; -@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g - g_free(freep); - return NULL; - } -+#else -+ freep = kinfo_getfile(pid, &cnt); -+#endif - - dirs = g_ptr_array_sized_new(1); - -+#ifndef HAVE_KINFO_GETFILE - for (i = 0; i < len / sizeof(*kif); i++, kif++) { -+ if (kif->kf_structsize != sizeof(*kif)) -+ continue; -+#else -+ for (i = 0; i < cnt; i++) { -+ kif = &freep[i]; -+#endif -+ - switch (kif->kf_fd) { - case KF_FD_TYPE_ROOT: - g_strlcpy(buf->root, kif->kf_path, diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c deleted file mode 100644 index a188b364c..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c +++ /dev/null @@ -1,94 +0,0 @@ ---- sysdeps/freebsd/suid_open.c.orig 2008-09-29 17:22:12.000000000 -0400 -+++ sysdeps/freebsd/suid_open.c 2008-09-29 17:23:35.000000000 -0400 -@@ -0,0 +1,91 @@ -+/* Copyright (C) 1998 Joshua Sled -+ This file is part of LibGTop 1.0. -+ -+ Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#include <config.h> -+#include <glibtop.h> -+#include <glibtop/error.h> -+#include <glibtop/cpu.h> -+#include <glibtop/open.h> -+#include <glibtop/init_hooks.h> -+ -+ -+/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ -+ -+void -+glibtop_init_p (glibtop *server, const unsigned long features, -+ const unsigned flags) -+{ -+ const _glibtop_init_func_t *init_fkt; -+ -+ if (server == NULL) -+ glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); -+ -+ /* Do the initialization, but only if not already initialized. */ -+ -+ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { -+ glibtop_open_p (server, "glibtop", features, flags); -+ -+ for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) -+ (*init_fkt) (server); -+ -+ server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; -+ } -+} -+ -+void -+glibtop_open_p (glibtop *server, const char *program_name, -+ const unsigned long features, -+ const unsigned flags) -+{ -+#ifdef DEBUG -+ fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); -+#endif -+ -+ /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ -+ server->machine.uid = getuid (); -+ server->machine.euid = geteuid (); -+ server->machine.gid = getgid (); -+ server->machine.egid = getegid (); -+ /* Setup machine-specific data */ -+ server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); -+ -+ if (server->machine.kd == NULL) -+ glibtop_error_io_r (server, "kvm_open"); -+ -+ /* Drop priviledges. */ -+ -+ if (setreuid (server->machine.euid, server->machine.uid)) -+ _exit (1); -+ -+ if (setregid (server->machine.egid, server->machine.gid)) -+ _exit (1); -+ -+ /* !!! END OF SUID ROOT PART !!! */ -+ -+ /* Our effective uid is now those of the user invoking the server, -+ * so we do no longer have any priviledges. */ -+ -+ /* NOTE: On FreeBSD, we do not need to be suid root, we just need to -+ * be sgid kmem. -+ * -+ * The server will only use setegid() to get back it's priviledges, -+ * so it will fail if it is suid root and not sgid kmem. */ -+} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c deleted file mode 100644 index ab5fdd66d..000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sysdeps/freebsd/sysinfo.c.orig 2008-05-23 18:13:23.000000000 -0400 -+++ sysdeps/freebsd/sysinfo.c 2008-09-29 14:35:25.000000000 -0400 -@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server) - - glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); - -- len = sizeof (ncpus); -- sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ ncpus = server->ncpu + 1; -+ - len = 0; - sysctlbyname ("hw.model", NULL, &len, NULL, 0); - model = g_malloc (len); diff --git a/devel/libgtop/files/pkg-message b/devel/libgtop/files/pkg-message deleted file mode 100644 index dacaf62a9..000000000 --- a/devel/libgtop/files/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -=============================================================================== - -In order to use the File System read/write monitor, you must chmod -/dev/devstat so that all users can open it read-only. For example: - -# chmod 0444 /dev/devstat - -In order for this to persist across reboots, add the following to -/etc/devfs.conf: - -perm devstat 0444 - -=============================================================================== diff --git a/devel/libgtop/pkg-descr b/devel/libgtop/pkg-descr deleted file mode 100644 index f263f1127..000000000 --- a/devel/libgtop/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This library provides the backend for gtop2, a GNOME 2.0 version -of top(1) that allows display and manipulation of running -processes. diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist deleted file mode 100644 index fa5b9d29d..000000000 --- a/devel/libgtop/pkg-plist +++ /dev/null @@ -1,202 +0,0 @@ -bin/libgtop_daemon2 -bin/libgtop_server2 -include/libgtop-2.0/glibtop.h -include/libgtop-2.0/glibtop/close.h -include/libgtop-2.0/glibtop/command.h -include/libgtop-2.0/glibtop/cpu.h -include/libgtop-2.0/glibtop/fsusage.h -include/libgtop-2.0/glibtop/global.h -include/libgtop-2.0/glibtop/gnuserv.h -include/libgtop-2.0/glibtop/loadavg.h -include/libgtop-2.0/glibtop/mem.h -include/libgtop-2.0/glibtop/mountlist.h -include/libgtop-2.0/glibtop/msg_limits.h -include/libgtop-2.0/glibtop/netlist.h -include/libgtop-2.0/glibtop/netload.h -include/libgtop-2.0/glibtop/open.h -include/libgtop-2.0/glibtop/parameter.h -include/libgtop-2.0/glibtop/ppp.h -include/libgtop-2.0/glibtop/procaffinity.h -include/libgtop-2.0/glibtop/procargs.h -include/libgtop-2.0/glibtop/prockernel.h -include/libgtop-2.0/glibtop/proclist.h -include/libgtop-2.0/glibtop/procmap.h -include/libgtop-2.0/glibtop/procmem.h -include/libgtop-2.0/glibtop/procopenfiles.h -include/libgtop-2.0/glibtop/procsegment.h -include/libgtop-2.0/glibtop/procsignal.h -include/libgtop-2.0/glibtop/procstate.h -include/libgtop-2.0/glibtop/proctime.h -include/libgtop-2.0/glibtop/procuid.h -include/libgtop-2.0/glibtop/procwd.h -include/libgtop-2.0/glibtop/sem_limits.h -include/libgtop-2.0/glibtop/shm_limits.h -include/libgtop-2.0/glibtop/signal.h -include/libgtop-2.0/glibtop/swap.h -include/libgtop-2.0/glibtop/sysdeps.h -include/libgtop-2.0/glibtop/sysinfo.h -include/libgtop-2.0/glibtop/union.h -include/libgtop-2.0/glibtop/uptime.h -include/libgtop-2.0/glibtop/version.h -include/libgtop-2.0/glibtop_machine.h -include/libgtop-2.0/glibtop_private.h -include/libgtop-2.0/glibtop_server.h -include/libgtop-2.0/glibtop_suid.h -include/libgtop-2.0/libgtopconfig.h -lib/libgtop-2.0.a -lib/libgtop-2.0.la -lib/libgtop-2.0.so -lib/libgtop-2.0.so.7 -libdata/pkgconfig/libgtop-2.0.pc -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libgtop-Close.html -%%DOCSDIR%%/libgtop-Command.html -%%DOCSDIR%%/libgtop-GlibTop-Server.html -%%DOCSDIR%%/libgtop-GlibTop.html -%%DOCSDIR%%/libgtop-Net-List.html -%%DOCSDIR%%/libgtop-Net-Load.html -%%DOCSDIR%%/libgtop-PPP.html -%%DOCSDIR%%/libgtop-Shared-Memory-Limits.html -%%DOCSDIR%%/libgtop-Uptime.html -%%DOCSDIR%%/libgtop-cpu.html -%%DOCSDIR%%/libgtop-fsusage.html -%%DOCSDIR%%/libgtop-lib.html -%%DOCSDIR%%/libgtop-loadavg.html -%%DOCSDIR%%/libgtop-mem.html -%%DOCSDIR%%/libgtop-mountlist.html -%%DOCSDIR%%/libgtop-msg-limits.html -%%DOCSDIR%%/libgtop-open.html -%%DOCSDIR%%/libgtop-parameter.html -%%DOCSDIR%%/libgtop-procargs.html -%%DOCSDIR%%/libgtop-prockernel.html -%%DOCSDIR%%/libgtop-proclist.html -%%DOCSDIR%%/libgtop-procmap.html -%%DOCSDIR%%/libgtop-procmem.html -%%DOCSDIR%%/libgtop-procopenfiles.html -%%DOCSDIR%%/libgtop-procsegment.html -%%DOCSDIR%%/libgtop-procsignal.html -%%DOCSDIR%%/libgtop-procstate.html -%%DOCSDIR%%/libgtop-proctime.html -%%DOCSDIR%%/libgtop-procuid.html -%%DOCSDIR%%/libgtop-sem-limits.html -%%DOCSDIR%%/libgtop-signal.html -%%DOCSDIR%%/libgtop-swap.html -%%DOCSDIR%%/libgtop-sysdeps.html -%%DOCSDIR%%/libgtop-sysinfo.html -%%DOCSDIR%%/libgtop-union.html -%%DOCSDIR%%/libgtop-version.html -%%DOCSDIR%%/libgtop-white-paper-overview.html -%%DOCSDIR%%/libgtop-white-paper.html -%%DOCSDIR%%/libgtop.devhelp -%%DOCSDIR%%/libgtop.devhelp2 -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -share/locale/am/LC_MESSAGES/libgtop-2.0.mo -share/locale/ar/LC_MESSAGES/libgtop-2.0.mo -share/locale/az/LC_MESSAGES/libgtop-2.0.mo -share/locale/be/LC_MESSAGES/libgtop-2.0.mo -share/locale/bg/LC_MESSAGES/libgtop-2.0.mo -share/locale/bn/LC_MESSAGES/libgtop-2.0.mo -share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo -share/locale/bs/LC_MESSAGES/libgtop-2.0.mo -share/locale/ca/LC_MESSAGES/libgtop-2.0.mo -share/locale/cs/LC_MESSAGES/libgtop-2.0.mo -share/locale/cy/LC_MESSAGES/libgtop-2.0.mo -share/locale/da/LC_MESSAGES/libgtop-2.0.mo -share/locale/de/LC_MESSAGES/libgtop-2.0.mo -share/locale/dz/LC_MESSAGES/libgtop-2.0.mo -share/locale/el/LC_MESSAGES/libgtop-2.0.mo -share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo -share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo -share/locale/eo/LC_MESSAGES/libgtop-2.0.mo -share/locale/es/LC_MESSAGES/libgtop-2.0.mo -share/locale/et/LC_MESSAGES/libgtop-2.0.mo -share/locale/eu/LC_MESSAGES/libgtop-2.0.mo -share/locale/fa/LC_MESSAGES/libgtop-2.0.mo -share/locale/fi/LC_MESSAGES/libgtop-2.0.mo -share/locale/fr/LC_MESSAGES/libgtop-2.0.mo -share/locale/ga/LC_MESSAGES/libgtop-2.0.mo -share/locale/gl/LC_MESSAGES/libgtop-2.0.mo -share/locale/gu/LC_MESSAGES/libgtop-2.0.mo -share/locale/he/LC_MESSAGES/libgtop-2.0.mo -share/locale/hi/LC_MESSAGES/libgtop-2.0.mo -share/locale/hr/LC_MESSAGES/libgtop-2.0.mo -share/locale/hu/LC_MESSAGES/libgtop-2.0.mo -share/locale/id/LC_MESSAGES/libgtop-2.0.mo -share/locale/it/LC_MESSAGES/libgtop-2.0.mo -share/locale/ja/LC_MESSAGES/libgtop-2.0.mo -share/locale/ka/LC_MESSAGES/libgtop-2.0.mo -share/locale/ko/LC_MESSAGES/libgtop-2.0.mo -share/locale/ku/LC_MESSAGES/libgtop-2.0.mo -share/locale/ky/LC_MESSAGES/libgtop-2.0.mo -share/locale/lt/LC_MESSAGES/libgtop-2.0.mo -share/locale/lv/LC_MESSAGES/libgtop-2.0.mo -share/locale/mg/LC_MESSAGES/libgtop-2.0.mo -share/locale/mi/LC_MESSAGES/libgtop-2.0.mo -share/locale/mk/LC_MESSAGES/libgtop-2.0.mo -share/locale/ml/LC_MESSAGES/libgtop-2.0.mo -share/locale/mn/LC_MESSAGES/libgtop-2.0.mo -share/locale/mr/LC_MESSAGES/libgtop-2.0.mo -share/locale/ms/LC_MESSAGES/libgtop-2.0.mo -share/locale/nb/LC_MESSAGES/libgtop-2.0.mo -share/locale/ne/LC_MESSAGES/libgtop-2.0.mo -share/locale/nl/LC_MESSAGES/libgtop-2.0.mo -share/locale/nn/LC_MESSAGES/libgtop-2.0.mo -share/locale/oc/LC_MESSAGES/libgtop-2.0.mo -share/locale/or/LC_MESSAGES/libgtop-2.0.mo -share/locale/pa/LC_MESSAGES/libgtop-2.0.mo -share/locale/pl/LC_MESSAGES/libgtop-2.0.mo -share/locale/pt/LC_MESSAGES/libgtop-2.0.mo -share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo -share/locale/ro/LC_MESSAGES/libgtop-2.0.mo -share/locale/ru/LC_MESSAGES/libgtop-2.0.mo -share/locale/rw/LC_MESSAGES/libgtop-2.0.mo -share/locale/sk/LC_MESSAGES/libgtop-2.0.mo -share/locale/sl/LC_MESSAGES/libgtop-2.0.mo -share/locale/sq/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo -share/locale/sv/LC_MESSAGES/libgtop-2.0.mo -share/locale/ta/LC_MESSAGES/libgtop-2.0.mo -share/locale/te/LC_MESSAGES/libgtop-2.0.mo -share/locale/th/LC_MESSAGES/libgtop-2.0.mo -share/locale/tr/LC_MESSAGES/libgtop-2.0.mo -share/locale/uk/LC_MESSAGES/libgtop-2.0.mo -share/locale/vi/LC_MESSAGES/libgtop-2.0.mo -share/locale/xh/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo -@dirrm %%DOCSDIR%% -@dirrm include/libgtop-2.0/glibtop -@dirrm include/libgtop-2.0 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mi/LC_MESSAGES -@dirrmtry share/locale/mi -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile deleted file mode 100644 index e360e4e49..000000000 --- a/devel/libnotify/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: libnotify -# Date created: 2005-08-06 -# Whom: Andreas Kohn <andreas@syndrom23.de> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= libnotify -PORTVERSION= 0.4.5 -CATEGORIES= devel gnome -MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/ - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A library for desktop notifications - -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib - -USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack -USE_GMAKE= yes -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --without-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include <bsd.port.mk> diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo deleted file mode 100644 index fa3d33aa8..000000000 --- a/devel/libnotify/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (libnotify-0.4.5.tar.gz) = 472e2c1f808848365572a9b024d9e8f5 -SHA256 (libnotify-0.4.5.tar.gz) = 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9 -SIZE (libnotify-0.4.5.tar.gz) = 364142 diff --git a/devel/libnotify/pkg-descr b/devel/libnotify/pkg-descr deleted file mode 100644 index 15579caee..000000000 --- a/devel/libnotify/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The Desktop Notifications framework provides a standard way of doing passive -pop-up notifications on the desktop. These are designed to notify the -user of something without interrupting their work with a dialog box that they -must close. Passive popups can automatically disappear after a short period -of time. - -This port contains the library and a small command line client. -See deskutils/notification-daemon for the daemon. - -WWW: http://www.galago-project.org/specs/notification/index.php diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist deleted file mode 100644 index bc896db17..000000000 --- a/devel/libnotify/pkg-plist +++ /dev/null @@ -1,25 +0,0 @@ -bin/notify-send -include/libnotify/notification.h -include/libnotify/notify-enum-types.h -include/libnotify/notify.h -lib/libnotify.a -lib/libnotify.la -lib/libnotify.so -lib/libnotify.so.1 -libdata/pkgconfig/libnotify.pc -share/gtk-doc/html/libnotify/NotifyNotification.html -share/gtk-doc/html/libnotify/ch01.html -share/gtk-doc/html/libnotify/home.png -share/gtk-doc/html/libnotify/index.html -share/gtk-doc/html/libnotify/index.sgml -share/gtk-doc/html/libnotify/left.png -share/gtk-doc/html/libnotify/libnotify-notify.html -share/gtk-doc/html/libnotify/libnotify.devhelp -share/gtk-doc/html/libnotify/libnotify.devhelp2 -share/gtk-doc/html/libnotify/right.png -share/gtk-doc/html/libnotify/style.css -share/gtk-doc/html/libnotify/up.png -@dirrm share/gtk-doc/html/libnotify -@dirrmtry share/gtk-doc/html -@dirrmtry share/gtk-doc -@dirrm include/libnotify diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile deleted file mode 100644 index 09aa52830..000000000 --- a/devel/libsoup/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# New ports collection makefile for: libsoup -# Date created: 12 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.51 2008/10/20 22:05:08 kwm Exp $ -# - -PORTNAME= libsoup -PORTVERSION= 2.24.2.1 -PORTREVISION?= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A SOAP (Simple Object Access Protocol) implementation in C - -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt - -USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -USE_GMAKE= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION="2.4" - -.if !defined(WITHOUT_SSL) -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -.else -CONFIGURE_ARGS+=--disable-ssl -.endif - -.include <bsd.port.pre.mk> - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "libsoup has the following configurable option(s):" - @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support" - @${ECHO_MSG} "" - -.include <bsd.port.post.mk> - -.endif diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo deleted file mode 100644 index df4036166..000000000 --- a/devel/libsoup/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libsoup-2.24.2.1.tar.bz2) = 27409ea1a93e45668e1b999f162ee4d0 -SHA256 (gnome2/libsoup-2.24.2.1.tar.bz2) = acc2568cd0d75b5a8c81f3a88754876ce16eddddbc9c153f7dec413182e874be -SIZE (gnome2/libsoup-2.24.2.1.tar.bz2) = 658843 diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr deleted file mode 100644 index 1ec2bfea4..000000000 --- a/devel/libsoup/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Soup is a SOAP (Simple Object Access Protocol) implementation in C. - -It provides a queued asynchronous callback-based mechanism for sending and -servicing SOAP requests, and a WSDL (Web Service Definition Language) for C -compilers which generates client stubs and server skeletons for easily -calling and implementing SOAP methods. It uses GLib and is designed to work -well with GTK applications. - -Features: - * Completely Asynchronous - * Connection cache - * HTTP chunked transfer and persistent connections - * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support - * SSL Support using OpenSSL - * Apache module server support - * Client digest authentication diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist deleted file mode 100644 index f753686dc..000000000 --- a/devel/libsoup/pkg-plist +++ /dev/null @@ -1,37 +0,0 @@ -include/libsoup-%%VERSION%%/libsoup/soup-address.h -include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h -include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h -include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h -include/libsoup-%%VERSION%%/libsoup/soup-auth.h -include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar.h -include/libsoup-%%VERSION%%/libsoup/soup-cookie.h -include/libsoup-%%VERSION%%/libsoup/soup-date.h -include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h -include/libsoup-%%VERSION%%/libsoup/soup-form.h -include/libsoup-%%VERSION%%/libsoup/soup-headers.h -include/libsoup-%%VERSION%%/libsoup/soup-logger.h -include/libsoup-%%VERSION%%/libsoup/soup-message-body.h -include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h -include/libsoup-%%VERSION%%/libsoup/soup-message.h -include/libsoup-%%VERSION%%/libsoup/soup-method.h -include/libsoup-%%VERSION%%/libsoup/soup-misc.h -include/libsoup-%%VERSION%%/libsoup/soup-portability.h -include/libsoup-%%VERSION%%/libsoup/soup-server.h -include/libsoup-%%VERSION%%/libsoup/soup-session-async.h -include/libsoup-%%VERSION%%/libsoup/soup-session-feature.h -include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h -include/libsoup-%%VERSION%%/libsoup/soup-session.h -include/libsoup-%%VERSION%%/libsoup/soup-socket.h -include/libsoup-%%VERSION%%/libsoup/soup-status.h -include/libsoup-%%VERSION%%/libsoup/soup-types.h -include/libsoup-%%VERSION%%/libsoup/soup-uri.h -include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h -include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h -include/libsoup-%%VERSION%%/libsoup/soup.h -lib/libsoup-%%VERSION%%.a -lib/libsoup-%%VERSION%%.la -lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.1 -libdata/pkgconfig/libsoup-%%VERSION%%.pc -@dirrm include/libsoup-%%VERSION%%/libsoup -@dirrm include/libsoup-%%VERSION%% diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile deleted file mode 100644 index 7a7814a4a..000000000 --- a/devel/py-gobject/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: py-gobject -# Date created: 10 January 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.28 2008/09/03 14:32:21 kwm Exp $ -# - -PORTNAME= gobject -PORTVERSION= 2.16.0 -CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pygobject-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for GObject - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 -USE_PYTHON= yes -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-docs - -CONFLICTS= py*-gtk-0* - -.include <bsd.port.mk> diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo deleted file mode 100644 index d7878e045..000000000 --- a/devel/py-gobject/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/pygobject-2.16.0.tar.bz2) = 431e7d4632163b93d1ee43cd071a389c -SHA256 (gnome2/pygobject-2.16.0.tar.bz2) = db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2 -SIZE (gnome2/pygobject-2.16.0.tar.bz2) = 515503 diff --git a/devel/py-gobject/files/patch-docs_Makefile.in b/devel/py-gobject/files/patch-docs_Makefile.in deleted file mode 100644 index 39d35befb..000000000 --- a/devel/py-gobject/files/patch-docs_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/Makefile.in.orig Sat May 5 01:25:03 2007 -+++ docs/Makefile.in Sat May 5 01:25:39 2007 -@@ -223,7 +223,7 @@ XSL_FILES = \ - # fixxref cannot be included in XSL_FILES, because automake is touching it - # so the date is newer then the files in HTML_FILES - FIXXREF = xsl/fixxref.py --TARGET_DIR = $(datadir)/gtk-doc/html/pygobject -+TARGET_DIR = $(prefix)/share/doc/pygobject - CSSdir = $(TARGET_DIR) - CSS_DATA = $(CSS_FILES) - XSLdir = $(datadir)/pygobject/xsl diff --git a/devel/py-gobject/pkg-descr b/devel/py-gobject/pkg-descr deleted file mode 100644 index eded7fcd4..000000000 --- a/devel/py-gobject/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -PyGObject provides a convenient wrapper for the GObject+ library for use -in Python programs, and takes care of many of the boring details such as -managing memory and type casting. When combined with PyGTK, PyORBit and -gnome-python, it can be used to write full featured Gnome applications. diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist deleted file mode 100644 index 63a4cceb8..000000000 --- a/devel/py-gobject/pkg-plist +++ /dev/null @@ -1,133 +0,0 @@ -bin/pygobject-codegen-2.0 -include/pygtk-2.0/pyglib.h -include/pygtk-2.0/pygobject.h -lib/libpyglib-2.0.la -lib/libpyglib-2.0.so -lib/libpyglib-2.0.so.0 -%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.la -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.so -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyo -%%PYTHON_SITELIBDIR%%/pygtk.pth -%%PYTHON_SITELIBDIR%%/pygtk.py -%%PYTHON_SITELIBDIR%%/pygtk.pyc -%%PYTHON_SITELIBDIR%%/pygtk.pyo -libdata/pkgconfig/pygobject-2.0.pc -share/doc/pygobject/class-glibmaincontext.html -share/doc/pygobject/class-glibmainloop.html -share/doc/pygobject/class-gobject.html -share/doc/pygobject/class-gobjectgboxed.html -share/doc/pygobject/class-gobjectginterface.html -share/doc/pygobject/class-gobjectgpointer.html -share/doc/pygobject/glib-constants.html -share/doc/pygobject/glib-functions.html -share/doc/pygobject/gobject-class-reference.html -share/doc/pygobject/gobject-constants.html -share/doc/pygobject/gobject-functions.html -share/doc/pygobject/index.html -share/doc/pygobject/index.sgml -share/doc/pygobject/pygobject-introduction.html -share/doc/pygobject/pygobject.devhelp -share/doc/pygobject/style.css -share/pygobject/2.0/codegen/__init__.py -share/pygobject/2.0/codegen/__init__.pyc -share/pygobject/2.0/codegen/__init__.pyo -share/pygobject/2.0/codegen/argtypes.py -share/pygobject/2.0/codegen/argtypes.pyc -share/pygobject/2.0/codegen/argtypes.pyo -share/pygobject/2.0/codegen/codegen.py -share/pygobject/2.0/codegen/codegen.pyc -share/pygobject/2.0/codegen/codegen.pyo -share/pygobject/2.0/codegen/createdefs.py -share/pygobject/2.0/codegen/createdefs.pyc -share/pygobject/2.0/codegen/createdefs.pyo -share/pygobject/2.0/codegen/definitions.py -share/pygobject/2.0/codegen/definitions.pyc -share/pygobject/2.0/codegen/definitions.pyo -share/pygobject/2.0/codegen/defsparser.py -share/pygobject/2.0/codegen/defsparser.pyc -share/pygobject/2.0/codegen/defsparser.pyo -share/pygobject/2.0/codegen/docextract.py -share/pygobject/2.0/codegen/docextract.pyc -share/pygobject/2.0/codegen/docextract.pyo -share/pygobject/2.0/codegen/docgen.py -share/pygobject/2.0/codegen/docgen.pyc -share/pygobject/2.0/codegen/docgen.pyo -share/pygobject/2.0/codegen/h2def.py -share/pygobject/2.0/codegen/h2def.pyc -share/pygobject/2.0/codegen/h2def.pyo -share/pygobject/2.0/codegen/mergedefs.py -share/pygobject/2.0/codegen/mergedefs.pyc -share/pygobject/2.0/codegen/mergedefs.pyo -share/pygobject/2.0/codegen/mkskel.py -share/pygobject/2.0/codegen/mkskel.pyc -share/pygobject/2.0/codegen/mkskel.pyo -share/pygobject/2.0/codegen/override.py -share/pygobject/2.0/codegen/override.pyc -share/pygobject/2.0/codegen/override.pyo -share/pygobject/2.0/codegen/reversewrapper.py -share/pygobject/2.0/codegen/reversewrapper.pyc -share/pygobject/2.0/codegen/reversewrapper.pyo -share/pygobject/2.0/codegen/scmexpr.py -share/pygobject/2.0/codegen/scmexpr.pyc -share/pygobject/2.0/codegen/scmexpr.pyo -share/pygobject/2.0/defs/gappinfo.override -share/pygobject/2.0/defs/gapplaunchcontext.override -share/pygobject/2.0/defs/gfile.override -share/pygobject/2.0/defs/gfileattribute.override -share/pygobject/2.0/defs/gfileenumerator.override -share/pygobject/2.0/defs/gfileinfo.override -share/pygobject/2.0/defs/gicon.override -share/pygobject/2.0/defs/ginputstream.override -share/pygobject/2.0/defs/gio-types.defs -share/pygobject/2.0/defs/gio.defs -share/pygobject/2.0/defs/gio.override -share/pygobject/2.0/defs/goutputstream.override -share/pygobject/2.0/defs/gvolume.override -share/pygobject/2.0/defs/gvolumemonitor.override -share/pygobject/2.0/defs/unix-types.defs -share/pygobject/2.0/defs/unix.defs -share/pygobject/2.0/defs/unix.override -share/pygobject/xsl/common.xsl -share/pygobject/xsl/devhelp.xsl -share/pygobject/xsl/fixxref.py -share/pygobject/xsl/html.xsl -share/pygobject/xsl/pdf-style.xsl -share/pygobject/xsl/pdf.xsl -share/pygobject/xsl/ref-html-style.xsl -@dirrm share/pygobject/xsl -@dirrm share/pygobject/2.0/defs -@dirrm share/pygobject/2.0/codegen -@dirrm share/pygobject/2.0 -@dirrm share/pygobject -@dirrm share/doc/pygobject -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio -@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 -@dirrmtry include/pygtk-2.0 diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile deleted file mode 100644 index 1047a6a69..000000000 --- a/devel/py-orbit/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: py-orbit2 -# Date created: 04 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= orbit -PORTVERSION= 2.24.0 -CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyorbit-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for ORBit2 - -CONFLICTS= py*-omniorb-[0-9]* - -USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= gnomehack orbit2 -USE_PYTHON= yes -GNU_CONFIGURE= yes -ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" - -.include <bsd.port.mk> diff --git a/devel/py-orbit/distinfo b/devel/py-orbit/distinfo deleted file mode 100644 index c2d848cee..000000000 --- a/devel/py-orbit/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/pyorbit-2.24.0.tar.bz2) = 574593815e75ee6e98062c75d6d1581f -SHA256 (gnome2/pyorbit-2.24.0.tar.bz2) = 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8 -SIZE (gnome2/pyorbit-2.24.0.tar.bz2) = 293054 diff --git a/devel/py-orbit/pkg-descr b/devel/py-orbit/pkg-descr deleted file mode 100644 index 853fdfdee..000000000 --- a/devel/py-orbit/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -To paraphrase the README: - -This is a Python language binding for the ORBit2 CORBA implementation. -It aims to take advantage of new features found in ORBit2 to make -language bindings more efficient. This includes: - - Use of ORBit2 type libraries to generate stubs - - use of the ORBit_small_invoke_stub() call for operation - invocation, which allows for short circuited invocation on local - objects. diff --git a/devel/py-orbit/pkg-plist b/devel/py-orbit/pkg-plist deleted file mode 100644 index 4ca215c28..000000000 --- a/devel/py-orbit/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -include/pyorbit-2/pyorbit.h -%%PYTHON_SITELIBDIR%%/CORBA.py -%%PYTHON_SITELIBDIR%%/CORBA.pyc -%%PYTHON_SITELIBDIR%%/CORBA.pyo -%%PYTHON_SITELIBDIR%%/ORBit.la -%%PYTHON_SITELIBDIR%%/ORBit.so -%%PYTHON_SITELIBDIR%%/PortableServer.py -%%PYTHON_SITELIBDIR%%/PortableServer.pyc -%%PYTHON_SITELIBDIR%%/PortableServer.pyo -libdata/pkgconfig/pyorbit-2.pc -@dirrm include/pyorbit-2 |