r24192 - in /desktop/unstable/brasero/debian: changelog control control.in patches/01_pkglibdir.patch patches/31_link_libice.patch patches/90_relibtoolize.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon May 3 14:02:48 UTC 2010
Author: joss
Date: Mon May 3 14:02:46 2010
New Revision: 24192
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24192
Log:
* New upstream release.
* Update build-dependencies.
* Disable introspection support to avoid blocking the totem
transition.
* Bump shlibs to 2.30.
* 01_pkglibdir.patch, 90_relibtoolize.patch: updated for the new
version.
Modified:
desktop/unstable/brasero/debian/changelog
desktop/unstable/brasero/debian/control
desktop/unstable/brasero/debian/control.in
desktop/unstable/brasero/debian/patches/01_pkglibdir.patch
desktop/unstable/brasero/debian/patches/31_link_libice.patch
desktop/unstable/brasero/debian/patches/90_relibtoolize.patch
desktop/unstable/brasero/debian/rules
Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Mon May 3 14:02:46 2010
@@ -1,12 +1,18 @@
-brasero (2.28.3-4) UNRELEASED; urgency=low
+brasero (2.30.1-1) unstable; urgency=low
* 31_link_libice.patch: new patch. Explicitly link to libice.
Closes: #554057.
- * 90_relibtoolize.patch: updated accordingly.
* Drop build-dependency on libbeagle since beagle is going to be
removed.
-
- -- Josselin Mouette <joss at debian.org> Sun, 28 Feb 2010 03:44:08 +0100
+ * New upstream release.
+ * Update build-dependencies.
+ * Disable introspection support to avoid blocking the totem
+ transition.
+ * Bump shlibs to 2.30.
+ * 01_pkglibdir.patch, 90_relibtoolize.patch: updated for the new
+ version.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 03 May 2010 16:02:19 +0200
brasero (2.28.3-3) unstable; urgency=low
Modified: desktop/unstable/brasero/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control [utf-8] (original)
+++ desktop/unstable/brasero/debian/control [utf-8] Mon May 3 14:02:46 2010
@@ -13,14 +13,15 @@
gnome-pkg-tools (>= 0.7),
quilt,
libcam-dev [kfreebsd-i386 kfreebsd-amd64],
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.16.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.19.7),
libgconf2-dev,
libgstreamer0.10-dev (>= 0.10.15),
libgstreamer-plugins-base0.10-dev (>= 0.10.0),
libxml2-dev (>= 2.6.0),
libdbus-glib-1-dev (>= 0.7.2),
- gtk-doc-tools (>= 1.9),
+ libcanberra-gtk-dev (>= 0.1),
+ gtk-doc-tools (>= 1.12),
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
pkg-config,
@@ -28,7 +29,8 @@
libnautilus-extension-dev (>= 2.22.2),
libburn-dev (>= 0.4.0),
libisofs-dev (>= 0.6.4),
- libtotem-plparser-dev (>= 2.22.0),
+ libtracker-client-0.8-dev (>= 0.8.0),
+ libtotem-plparser-dev (>= 2.29.1),
libunique-dev (>= 1.0.0),
libnotify-dev (>= 0.3.0),
intltool (>= 0.35.0)
Modified: desktop/unstable/brasero/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/control.in?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/control.in [utf-8] (original)
+++ desktop/unstable/brasero/debian/control.in [utf-8] Mon May 3 14:02:46 2010
@@ -8,14 +8,15 @@
gnome-pkg-tools (>= 0.7),
quilt,
libcam-dev [kfreebsd-i386 kfreebsd-amd64],
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.16.0),
+ libglib2.0-dev (>= 2.22.0),
+ libgtk2.0-dev (>= 2.19.7),
libgconf2-dev,
libgstreamer0.10-dev (>= 0.10.15),
libgstreamer-plugins-base0.10-dev (>= 0.10.0),
libxml2-dev (>= 2.6.0),
libdbus-glib-1-dev (>= 0.7.2),
- gtk-doc-tools (>= 1.9),
+ libcanberra-gtk-dev (>= 0.1),
+ gtk-doc-tools (>= 1.12),
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
pkg-config,
@@ -23,7 +24,8 @@
libnautilus-extension-dev (>= 2.22.2),
libburn-dev (>= 0.4.0),
libisofs-dev (>= 0.6.4),
- libtotem-plparser-dev (>= 2.22.0),
+ libtracker-client-0.8-dev (>= 0.8.0),
+ libtotem-plparser-dev (>= 2.29.1),
libunique-dev (>= 1.0.0),
libnotify-dev (>= 0.3.0),
intltool (>= 0.35.0)
Modified: desktop/unstable/brasero/debian/patches/01_pkglibdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/01_pkglibdir.patch?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/01_pkglibdir.patch [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/01_pkglibdir.patch [utf-8] Mon May 3 14:02:46 2010
@@ -1,7 +1,7 @@
-Index: brasero-2.28.3/libbrasero-burn/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/libbrasero-burn/Makefile.am 2010-01-13 19:42:47.894714777 +0100
-+++ brasero-2.28.3/libbrasero-burn/Makefile.am 2010-01-13 19:46:00.227214581 +0100
+Index: brasero-2.30.1/libbrasero-burn/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/libbrasero-burn/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/libbrasero-burn/Makefile.am 2010-05-03 15:48:18.492607597 +0200
@@ -9,7 +9,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -11,10 +11,10 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GMODULE_CFLAGS) \
-Index: brasero-2.28.3/libbrasero-burn/burn-basics.h
-===================================================================
---- brasero-2.28.3.orig/libbrasero-burn/burn-basics.h 2010-01-13 19:46:57.522715546 +0100
-+++ brasero-2.28.3/libbrasero-burn/burn-basics.h 2010-01-13 19:47:12.642716628 +0100
+Index: brasero-2.30.1/libbrasero-burn/burn-basics.h
+===================================================================
+--- brasero-2.30.1.orig/libbrasero-burn/burn-basics.h 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/libbrasero-burn/burn-basics.h 2010-05-03 15:48:18.492607597 +0200
@@ -39,7 +39,7 @@
G_BEGIN_DECLS
@@ -24,10 +24,10 @@
#define BRASERO_PLUGIN_KEY "/apps/brasero/config/plugins"
#define BRASERO_BURN_TMP_FILE_NAME "brasero_tmp_XXXXXX"
-Index: brasero-2.28.3/libbrasero-media/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/libbrasero-media/Makefile.am 2010-01-13 19:42:47.870713262 +0100
-+++ brasero-2.28.3/libbrasero-media/Makefile.am 2010-01-13 19:46:00.227214581 +0100
+Index: brasero-2.30.1/libbrasero-media/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/libbrasero-media/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/libbrasero-media/Makefile.am 2010-05-03 15:48:18.492607597 +0200
@@ -6,7 +6,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -37,10 +37,10 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-Index: brasero-2.28.3/libbrasero-utils/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/libbrasero-utils/Makefile.am 2010-01-13 19:42:47.555214164 +0100
-+++ brasero-2.28.3/libbrasero-utils/Makefile.am 2010-01-13 19:46:00.227214581 +0100
+Index: brasero-2.30.1/libbrasero-utils/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/libbrasero-utils/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/libbrasero-utils/Makefile.am 2010-05-03 15:48:18.496617953 +0200
@@ -6,7 +6,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -50,10 +50,10 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-Index: brasero-2.28.3/plugins/cdrdao/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrdao/Makefile.am 2010-01-13 19:42:48.090716724 +0100
-+++ brasero-2.28.3/plugins/cdrdao/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+Index: brasero-2.30.1/plugins/cdrdao/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrdao/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/cdrdao/Makefile.am 2010-05-03 15:48:18.496617953 +0200
@@ -9,14 +9,14 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -69,21 +69,12 @@
-cdrdaodir = $(libdir)/brasero/plugins
+cdrdaodir = $(pkglibdir)/plugins
cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
- libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c burn-cdrdao.h \
- burn-cdrdao-common.h
-@@ -24,7 +24,7 @@ libbrasero_cdrdao_la_LIBADD = $(BRASERO_
- libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
-
- #toc2cue
--toc2cuedir = $(libdir)/brasero/plugins
-+toc2cuedir = $(pkglibdir)/plugins
- toc2cue_LTLIBRARIES = libbrasero-toc2cue.la
- libbrasero_toc2cue_la_SOURCES = burn-toc2cue.c burn-toc2cue.h \
- burn-cdrdao-common.h
-Index: brasero-2.28.3/plugins/cdrkit/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrkit/Makefile.am 2010-01-13 19:42:47.998715151 +0100
-+++ brasero-2.28.3/plugins/cdrkit/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+ libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c
+ libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
+Index: brasero-2.30.1/plugins/cdrkit/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrkit/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/cdrkit/Makefile.am 2010-05-03 15:48:18.496617953 +0200
@@ -9,14 +9,14 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -99,7 +90,7 @@
-wodimdir = $(libdir)/brasero/plugins
+wodimdir = $(pkglibdir)/plugins
wodim_LTLIBRARIES = libbrasero-wodim.la
- libbrasero_wodim_la_SOURCES = burn-wodim.c burn-wodim.h \
+ libbrasero_wodim_la_SOURCES = burn-wodim.c \
burn-cdrkit.h
@@ -24,7 +24,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
libbrasero_wodim_la_LDFLAGS = -module -avoid-version
@@ -108,7 +99,7 @@
-genisoimagedir = $(libdir)/brasero/plugins
+genisoimagedir = $(pkglibdir)/plugins
genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
- libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c burn-genisoimage.h \
+ libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
burn-cdrkit.h
@@ -32,7 +32,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
@@ -117,12 +108,12 @@
-readomdir = $(libdir)/brasero/plugins
+readomdir = $(pkglibdir)/plugins
readom_LTLIBRARIES = libbrasero-readom.la
- libbrasero_readom_la_SOURCES = burn-readom.c burn-readom.h \
+ libbrasero_readom_la_SOURCES = burn-readom.c \
burn-cdrkit.h
-Index: brasero-2.28.3/plugins/cdrtools/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrtools/Makefile.am 2010-01-13 19:42:48.134717218 +0100
-+++ brasero-2.28.3/plugins/cdrtools/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+Index: brasero-2.30.1/plugins/cdrtools/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrtools/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/cdrtools/Makefile.am 2010-05-03 15:52:49.464111514 +0200
@@ -9,14 +9,14 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -138,7 +129,7 @@
-cdrecorddir = $(libdir)/brasero/plugins
+cdrecorddir = $(pkglibdir)/plugins
cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
- libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c burn-cdrecord.h \
+ libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
burn-cdrtools.h
@@ -24,7 +24,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
@@ -147,7 +138,7 @@
-mkisofsdir = $(libdir)/brasero/plugins
+mkisofsdir = $(pkglibdir)/plugins
mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
- libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c burn-mkisofs.h \
+ libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
burn-cdrtools.h
@@ -32,7 +32,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
@@ -156,13 +147,22 @@
-readcddir = $(libdir)/brasero/plugins
+readcddir = $(pkglibdir)/plugins
readcd_LTLIBRARIES = libbrasero-readcd.la
- libbrasero_readcd_la_SOURCES = burn-readcd.c burn-readcd.h \
+ libbrasero_readcd_la_SOURCES = burn-readcd.c \
burn-cdrtools.h
-Index: brasero-2.28.3/plugins/checksum/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/checksum/Makefile.am 2010-01-13 19:42:48.154718153 +0100
-+++ brasero-2.28.3/plugins/checksum/Makefile.am 2010-01-13 19:51:38.943214162 +0100
-@@ -9,14 +9,14 @@ INCLUDES = \
+@@ -40,7 +40,7 @@ libbrasero_readcd_la_LIBADD = $(BRASERO_
+ libbrasero_readcd_la_LDFLAGS = -module -avoid-version
+
+ #cdda2wav
+-cdda2wavdir = $(libdir)/brasero/plugins
++cdda2wavdir = $(pkglibdir)/plugins
+ cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
+ libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h
+ libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
+Index: brasero-2.30.1/plugins/checksum/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/checksum/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/checksum/Makefile.am 2010-05-03 15:48:18.496617953 +0200
+@@ -9,21 +9,21 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -177,9 +177,8 @@
-checksumdir = $(libdir)/brasero/plugins
+checksumdir = $(pkglibdir)/plugins
checksum_LTLIBRARIES = libbrasero-checksum.la
- libbrasero_checksum_la_SOURCES = burn-checksum-image.c \
- burn-checksum-image.h
-@@ -24,7 +24,7 @@ libbrasero_checksum_la_SOURCES = burn-ch
+ libbrasero_checksum_la_SOURCES = burn-checksum-image.c
+
libbrasero_checksum_la_LDFLAGS = -module -avoid-version
libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
@@ -187,11 +186,11 @@
+checksumfiledir = $(pkglibdir)/plugins
checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c \
- burn-checksum-files.h\
-Index: brasero-2.28.3/plugins/dvdauthor/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/dvdauthor/Makefile.am 2010-01-13 19:42:48.182717799 +0100
-+++ brasero-2.28.3/plugins/dvdauthor/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+ burn-volume-read.c \
+Index: brasero-2.30.1/plugins/dvdauthor/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/dvdauthor/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/dvdauthor/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -9,13 +9,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -207,11 +206,11 @@
+dvdauthordir = $(pkglibdir)/plugins
dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
- libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c burn-dvdauthor.h
-Index: brasero-2.28.3/plugins/dvdcss/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/dvdcss/Makefile.am 2010-01-13 19:42:47.978718613 +0100
-+++ brasero-2.28.3/plugins/dvdcss/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+ libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c
+Index: brasero-2.30.1/plugins/dvdcss/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/dvdcss/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/dvdcss/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/brasero/plugins
+plugindir = $(pkglibdir)/plugins
@@ -227,10 +226,10 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS)
-Index: brasero-2.28.3/plugins/growisofs/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/growisofs/Makefile.am 2010-01-13 19:42:48.066715209 +0100
-+++ brasero-2.28.3/plugins/growisofs/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+Index: brasero-2.30.1/plugins/growisofs/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/growisofs/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/growisofs/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -9,14 +9,14 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -246,7 +245,7 @@
-growisofsdir = $(libdir)/brasero/plugins
+growisofsdir = $(pkglibdir)/plugins
growisofs_LTLIBRARIES = libbrasero-growisofs.la
- libbrasero_growisofs_la_SOURCES = burn-growisofs.c burn-growisofs.h \
+ libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
burn-growisofs-common.h
@@ -24,7 +24,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
@@ -255,12 +254,12 @@
-dvdrwformatdir = $(libdir)/brasero/plugins
+dvdrwformatdir = $(pkglibdir)/plugins
dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
- libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c burn-dvd-rw-format.h
+ libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c
libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/plugins/libburnia/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/libburnia/Makefile.am 2010-01-13 19:42:48.046715250 +0100
-+++ brasero-2.28.3/plugins/libburnia/Makefile.am 2010-01-13 19:51:38.943214162 +0100
+Index: brasero-2.30.1/plugins/libburnia/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/libburnia/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/libburnia/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -9,7 +9,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -278,20 +277,20 @@
+libburndir = $(pkglibdir)/plugins
libburn_LTLIBRARIES = libbrasero-libburn.la
libbrasero_libburn_la_SOURCES = burn-libburn.c \
- burn-libburn.h \
-@@ -28,7 +28,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
+ burn-libburn-common.c \
+@@ -27,7 +27,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
libbrasero_libburn_la_LDFLAGS = -module -avoid-version
#libisofs (apparently libisofs needs one libburn function)
-libisofsdir = $(libdir)/brasero/plugins
+libisofsdir = $(pkglibdir)/plugins
libisofs_LTLIBRARIES = libbrasero-libisofs.la
- libbrasero_libisofs_la_SOURCES = burn-libisofs.c burn-libisofs.h \
+ libbrasero_libisofs_la_SOURCES = burn-libisofs.c \
burn-libburn-common.c burn-libburn-common.h \
-Index: brasero-2.28.3/plugins/local-track/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/local-track/Makefile.am 2010-01-13 19:42:48.206714422 +0100
-+++ brasero-2.28.3/plugins/local-track/Makefile.am 2010-01-13 19:51:38.947217185 +0100
+Index: brasero-2.30.1/plugins/local-track/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/local-track/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/local-track/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -9,14 +9,14 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -308,7 +307,7 @@
+local_trackdir = $(pkglibdir)/plugins
local_track_LTLIBRARIES = libbrasero-local-track.la
- libbrasero_local_track_la_SOURCES = burn-local-image.c burn-local-image.h
+ libbrasero_local_track_la_SOURCES = burn-local-image.c
@@ -24,7 +24,7 @@ libbrasero_local_track_la_LIBADD = $(BRA
libbrasero_local_track_la_LDFLAGS = -module -avoid-version
@@ -317,11 +316,11 @@
+burn_uridir = $(pkglibdir)/plugins
burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
- libbrasero_burn_uri_la_SOURCES = burn-uri.c burn-uri.h
-Index: brasero-2.28.3/plugins/transcode/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/transcode/Makefile.am 2010-01-13 19:42:48.022716178 +0100
-+++ brasero-2.28.3/plugins/transcode/Makefile.am 2010-01-13 19:51:38.947217185 +0100
+ libbrasero_burn_uri_la_SOURCES = burn-uri.c
+Index: brasero-2.30.1/plugins/transcode/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/transcode/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/transcode/Makefile.am 2010-05-03 15:51:09.848109124 +0200
@@ -9,27 +9,27 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -337,7 +336,7 @@
+transcodedir = $(pkglibdir)/plugins
transcode_LTLIBRARIES = libbrasero-transcode.la
- libbrasero_transcode_la_SOURCES = burn-transcode.c burn-transcode.h burn-normalize.h
+ libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h
libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
libbrasero_transcode_la_LDFLAGS = -module -avoid-version
@@ -353,11 +352,11 @@
+vobdir = $(pkglibdir)/plugins
vob_LTLIBRARIES = libbrasero-vob.la
- libbrasero_vob_la_SOURCES = burn-vob.c burn-vob.h
-Index: brasero-2.28.3/plugins/vcdimager/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/plugins/vcdimager/Makefile.am 2010-01-13 19:42:48.110717171 +0100
-+++ brasero-2.28.3/plugins/vcdimager/Makefile.am 2010-01-13 19:51:38.947217185 +0100
+ libbrasero_vob_la_SOURCES = burn-vob.c
+Index: brasero-2.30.1/plugins/vcdimager/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/vcdimager/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/plugins/vcdimager/Makefile.am 2010-05-03 15:48:18.500611199 +0200
@@ -9,13 +9,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -373,11 +372,11 @@
+vcdimagerdir = $(pkglibdir)/plugins
vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
- libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c burn-vcdimager.h
-Index: brasero-2.28.3/src/Makefile.am
-===================================================================
---- brasero-2.28.3.orig/src/Makefile.am 2010-01-13 19:42:47.622716041 +0100
-+++ brasero-2.28.3/src/Makefile.am 2010-01-13 19:46:00.231213692 +0100
+ libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c
+Index: brasero-2.30.1/src/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/src/Makefile.am 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/src/Makefile.am 2010-05-03 15:48:18.504610800 +0200
@@ -11,7 +11,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
@@ -387,3 +386,23 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
+Index: brasero-2.30.1/plugins/audio2cue/Makefile.am
+===================================================================
+--- brasero-2.30.1.orig/plugins/audio2cue/Makefile.am 2010-05-03 15:51:53.568111894 +0200
++++ brasero-2.30.1/plugins/audio2cue/Makefile.am 2010-05-03 15:52:04.920107947 +0200
+@@ -9,13 +9,13 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS)
+
+ #audio2cue
+-audio2cuedir = $(libdir)/brasero/plugins
++audio2cuedir = $(pkglibdir)/plugins
+ audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
+ libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
+ libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Modified: desktop/unstable/brasero/debian/patches/31_link_libice.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/31_link_libice.patch?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/31_link_libice.patch [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/31_link_libice.patch [utf-8] Mon May 3 14:02:46 2010
@@ -1,11 +1,11 @@
Debian #554057
GNOME #600591 (upstream refuses to include the fix)
-Index: brasero-2.28.3/configure.in
+Index: brasero-2.30.1/configure.in
===================================================================
---- brasero-2.28.3.orig/configure.in 2010-02-28 03:43:47.752534114 +0100
-+++ brasero-2.28.3/configure.in 2010-02-28 03:44:03.236531591 +0100
-@@ -218,7 +218,7 @@ AC_SUBST(BRASERO_DBUS_CFLAGS)
+--- brasero-2.30.1.orig/configure.in 2010-04-27 01:25:56.000000000 +0200
++++ brasero-2.30.1/configure.in 2010-05-03 15:56:31.052610555 +0200
+@@ -227,7 +227,7 @@ AC_SUBST(BRASERO_DBUS_CFLAGS)
AC_SUBST(BRASERO_DBUS_LIBS)
PKG_CHECK_MODULES(BRASERO_SM, \
Modified: desktop/unstable/brasero/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/90_relibtoolize.patch?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/90_relibtoolize.patch [utf-8] Mon May 3 14:02:46 2010
@@ -6,10 +6,10 @@
autoconf
rm -rf autom4te.cache/ config.h.in~
-Index: brasero-2.28.3/Makefile.in
+Index: brasero-2.30.1/Makefile.in
===================================================================
---- brasero-2.28.3.orig/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/Makefile.in 2010-02-28 03:45:46.365029004 +0100
+--- brasero-2.30.1.orig/Makefile.in 2010-04-27 01:29:16.000000000 +0200
++++ brasero-2.30.1/Makefile.in 2010-05-03 15:56:49.064107689 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -27,7 +27,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -267,6 +267,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -278,6 +278,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35,7 +35,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -464,7 +465,7 @@ uninstall-pkgconfigDATA:
+@@ -475,7 +476,7 @@ uninstall-pkgconfigDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -44,7 +44,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -489,7 +490,7 @@ $(RECURSIVE_TARGETS):
+@@ -500,7 +501,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -53,7 +53,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -656,7 +657,8 @@ distdir: $(DISTFILES)
+@@ -667,7 +668,8 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
@@ -63,7 +63,7 @@
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -700,17 +702,17 @@ dist dist-all: distdir
+@@ -711,17 +713,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -85,10 +85,10 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
-Index: brasero-2.28.3/aclocal.m4
+Index: brasero-2.30.1/aclocal.m4
===================================================================
---- brasero-2.28.3.orig/aclocal.m4 2009-12-14 19:54:29.000000000 +0100
-+++ brasero-2.28.3/aclocal.m4 2010-02-28 03:45:41.144528087 +0100
+--- brasero-2.30.1.orig/aclocal.m4 2010-04-27 01:26:22.000000000 +0200
++++ brasero-2.30.1/aclocal.m4 2010-05-03 15:56:49.076106980 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -115,22 +115,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3469,13 +3469,10 @@ linux* | k*bsd*-gnu)
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3487,6 +3484,18 @@ linux* | k*bsd*-gnu)
+@@ -3484,6 +3484,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -149,7 +134,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4074,11 +4083,11 @@ irix5* | irix6* | nonstopux*)
+@@ -4071,11 +4083,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -163,7 +148,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -4695,7 +4704,7 @@ m4_if([$1], [CXX], [
+@@ -4692,7 +4704,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -172,7 +157,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -4759,7 +4768,7 @@ m4_if([$1], [CXX], [
+@@ -4756,7 +4768,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -181,7 +166,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4979,7 +4988,7 @@ m4_if([$1], [CXX], [
+@@ -4976,7 +4988,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -190,7 +175,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -5184,6 +5193,9 @@ m4_if([$1], [CXX], [
+@@ -5181,6 +5193,9 @@ m4_if([$1], [CXX], [
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -200,7 +185,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5248,6 +5260,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -5245,6 +5260,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -210,7 +195,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5269,6 +5284,7 @@ dnl Note also adjust exclude_expsyms for
+@@ -5266,6 +5284,7 @@ dnl Note also adjust exclude_expsyms for
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -218,7 +203,7 @@
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -5360,7 +5376,7 @@ _LT_EOF
+@@ -5357,7 +5376,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -227,7 +212,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -5430,7 +5446,7 @@ _LT_EOF
+@@ -5427,7 +5446,7 @@ _LT_EOF
fi
;;
@@ -236,7 +221,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5605,6 +5621,7 @@ _LT_EOF
+@@ -5602,6 +5621,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -244,7 +229,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5843,7 +5860,7 @@ _LT_EOF
+@@ -5840,7 +5860,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -253,7 +238,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6839,7 +6856,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6836,7 +6856,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -262,7 +247,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -8846,15 +8863,15 @@ m4_define([lt_dict_filter],
+@@ -8843,15 +8863,15 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
@@ -283,7 +268,7 @@
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-@@ -9052,14 +9069,16 @@ fi])
+@@ -9049,14 +9069,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -308,7 +293,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -9103,9 +9122,9 @@ See the pkg-config man page for more det
+@@ -9100,9 +9122,9 @@ See the pkg-config man page for more det
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -320,7 +305,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -9155,7 +9174,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+@@ -9152,7 +9174,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
@@ -329,7 +314,7 @@
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -9171,7 +9190,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+@@ -9168,7 +9190,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -338,24 +323,75 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-Index: brasero-2.28.3/config.guess
+Index: brasero-2.30.1/config.guess
===================================================================
---- brasero-2.28.3.orig/config.guess 2009-11-25 14:25:32.000000000 +0100
-+++ brasero-2.28.3/config.guess 2010-02-28 03:45:43.124530783 +0100
+--- brasero-2.30.1.orig/config.guess 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/config.guess 2010-05-03 15:57:24.076606139 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -139,16 +140,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-case "${UNAME_MACHINE}" in
+- i?86)
+- test -z "$VENDOR" && VENDOR=pc
+- ;;
+- *)
+- test -z "$VENDOR" && VENDOR=unknown
+- ;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -180,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -364,7 +400,17 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@ EOF
+@@ -343,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -666,7 +660,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -373,7 +419,22 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@ EOF
+@@ -817,12 +811,12 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -832,6 +826,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -383,24 +444,82 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@ EOF
+@@ -861,18 +858,32 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+@@ -881,181 +892,91 @@ EOF
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-${VENDOR}-linux-gnu
++ echo frv-unknown-linux-gnu
++ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
- #undef mips
- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
@@ -412,70 +531,308 @@
- s: ::g
- p
- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
- #undef mips64
- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
-@@ -947,7 +927,7 @@ EOF
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-${VENDOR}-linux-gnu
+- exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-${VENDOR}-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-${VENDOR}-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
++ echo or32-unknown-linux-gnu
exit ;;
-@@ -1001,14 +981,6 @@ EOF
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+- *) echo hppa-${VENDOR}-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
++ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-${VENDOR}-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-${VENDOR}-linux-gnu
++ echo x86_64-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
+- ;;
- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1076,16 +997,16 @@ EOF
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+- echo ${UNAME_MACHINE}-${VENDOR}-stop
++ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-atheos
++ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+- echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
++ echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+@@ -1105,7 +1026,7 @@ EOF
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+@@ -1144,7 +1065,7 @@ EOF
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit ;;
+ mini*:CTIX:SYS*5:*)
+@@ -1181,19 +1102,19 @@ EOF
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
++ echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-Index: brasero-2.28.3/config.h.in
+ echo mips-dde-sysv${UNAME_RELEASE}
+@@ -1243,7 +1164,7 @@ EOF
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+@@ -1285,6 +1206,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1324,13 +1255,13 @@ EOF
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+- echo ${UNAME_MACHINE}-${VENDOR}-plan9
++ echo ${UNAME_MACHINE}-unknown-plan9
+ exit ;;
+ *:TOPS-10:*:*)
+- echo pdp10-${VENDOR}-tops10
++ echo pdp10-unknown-tops10
+ exit ;;
+ *:TENEX:*:*)
+- echo pdp10-${VENDOR}-tenex
++ echo pdp10-unknown-tenex
+ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+@@ -1339,16 +1270,16 @@ EOF
+ echo pdp10-xkl-tops20
+ exit ;;
+ *:TOPS-20:*:*)
+- echo pdp10-${VENDOR}-tops20
++ echo pdp10-unknown-tops20
+ exit ;;
+ *:ITS:*:*)
+- echo pdp10-${VENDOR}-its
++ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+Index: brasero-2.30.1/config.h.in
===================================================================
---- brasero-2.28.3.orig/config.h.in 2009-12-14 19:54:38.000000000 +0100
-+++ brasero-2.28.3/config.h.in 2010-02-28 03:45:23.872528761 +0100
-@@ -124,6 +124,9 @@
+--- brasero-2.30.1.orig/config.h.in 2010-04-27 01:29:12.000000000 +0200
++++ brasero-2.30.1/config.h.in 2010-05-03 15:56:49.096114761 +0200
+@@ -136,6 +136,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -485,24 +842,59 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: brasero-2.28.3/config.sub
+Index: brasero-2.30.1/config.sub
===================================================================
---- brasero-2.28.3.orig/config.sub 2009-11-25 14:25:32.000000000 +0100
-+++ brasero-2.28.3/config.sub 2010-02-28 03:45:43.128530383 +0100
+--- brasero-2.30.1.orig/config.sub 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/config.sub 2010-05-03 15:57:24.236111042 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
+@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -512,7 +904,60 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
+@@ -281,6 +288,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -523,16 +968,70 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
+@@ -719,6 +734,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1240,6 +1263,9 @@ case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -541,15 +1040,15 @@
vendor=ibm
;;
-beos*)
-Index: brasero-2.28.3/configure
+Index: brasero-2.30.1/configure
===================================================================
---- brasero-2.28.3.orig/configure 2009-12-14 19:54:33.000000000 +0100
-+++ brasero-2.28.3/configure 2010-02-28 03:45:47.585025482 +0100
+--- brasero-2.30.1.orig/configure 2010-04-27 01:29:11.000000000 +0200
++++ brasero-2.30.1/configure 2010-05-03 15:57:31.024103860 +0200
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for brasero 2.28.3.
-+# Generated by GNU Autoconf 2.65 for brasero 2.28.3.
+-# Generated by GNU Autoconf 2.63 for brasero 2.30.1.
++# Generated by GNU Autoconf 2.65 for brasero 2.30.1.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1015,7 +1514,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-+
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -1091,7 +1590,6 @@
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-(eval "as_func_return () {
- (exit \$1)
-}
@@ -1107,6 +1605,10 @@
-as_func_ret_failure () {
- return 1
-}
+
+-exitcode=0
+-if as_func_success; then
+- :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
@@ -1119,16 +1621,20 @@
+ {
+ eval $1+=\$2
+ }'
-+else
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
--exitcode=0
--if as_func_success; then
-- :
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
@@ -1139,23 +1645,16 @@
+ {
+ as_val=$(( $* ))
+ }'
- else
-- exitcode=1
-- echo as_func_success failed.
--fi
++else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
-
-if as_func_ret_success; then
- :
++
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -1351,14 +1850,14 @@
# Identity of this package.
PACKAGE_NAME='brasero'
@@ -746,6 +701,7 @@ PACKAGE_TARNAME='brasero'
- PACKAGE_VERSION='2.28.3'
- PACKAGE_STRING='brasero 2.28.3'
+ PACKAGE_VERSION='2.30.1'
+ PACKAGE_STRING='brasero 2.30.1'
PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
ac_unique_file="src/main.c"
# Factoring default headers for most tests.
-@@ -1035,6 +991,7 @@ bindir
+@@ -1054,6 +1010,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -1366,7 +1865,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1232,8 +1189,7 @@ do
+@@ -1260,8 +1217,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1376,7 +1875,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1259,8 +1215,7 @@ do
+@@ -1287,8 +1243,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1386,7 +1885,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,8 +1419,7 @@ do
+@@ -1492,8 +1447,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1396,7 +1895,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1481,8 +1435,7 @@ do
+@@ -1509,8 +1463,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1406,7 +1905,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1512,17 +1465,17 @@ do
+@@ -1540,17 +1493,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1430,7 +1929,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1539,15 +1492,13 @@ done
+@@ -1567,15 +1520,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1448,7 +1947,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1570,8 +1521,7 @@ do
+@@ -1598,8 +1549,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1458,7 +1957,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1601,11 +1551,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1629,11 +1579,9 @@ 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 .` ||
@@ -1472,7 +1971,7 @@
# Find the source files, if location was not specified.
-@@ -1644,13 +1592,11 @@ else
+@@ -1672,13 +1620,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1488,28 +1987,38 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1773,22 +1719,22 @@ Optional Features:
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
- --disable-largefile omit support for large files
+@@ -1794,9 +1740,9 @@ Optional Features:
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
+ --disable-scrollkeeper do not make updates to the scrollkeeper database
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
- --enable-gtk-doc-html build documentation in html format [default=yes]
- --enable-gtk-doc-pdf build documentation in pdf format [default=no]
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
- --disable-scrollkeeper do not make updates to the scrollkeeper database
+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
+ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+@@ -1805,22 +1751,22 @@ Optional Features:
+
+ --enable-iso-cxx Try to warn if code is not ISO C++
+ --disable-largefile omit support for large files
- --enable-nautilus Build Nautilus extension [default=yes]
- --enable-libburnia Build libburnia plugins [default=yes]
- --enable-cdrtools Build cdrtools plugins [default=yes]
+- --enable-cdrdao Build cdrdao plugins [default=yes]
- --enable-cdrkit Build cdrkit plugins [default=yes]
+- --enable-growisofs Build growisofs plugins [default=yes]
+ --enable-nautilus Build Nautilus extension [[default=yes]]
+ --enable-libburnia Build libburnia plugins [[default=yes]]
+ --enable-cdrtools Build cdrtools plugins [[default=yes]]
++ --enable-cdrdao Build cdrdao plugins [[default=yes]]
+ --enable-cdrkit Build cdrkit plugins [[default=yes]]
- --enable-search Build search pane (if beagle is available)
-- [default=yes]
-+ [[default=yes]]
++ --enable-growisofs Build growisofs plugins [[default=yes]]
+ --enable-search Build search pane (if a search backend is available)
+- [default=auto]
++ [[default=auto]]
--enable-playlist Build playlist pane (if totem is
- available)[default=yes]
- --enable-preview Build preview pane [default=yes]
@@ -1517,13 +2026,15 @@
+ available)[[default=yes]]
+ --enable-preview Build preview pane [[default=yes]]
+ --enable-inotify use inotify [[default=yes]]
+ --enable-introspection=[no/auto/yes]
+ Enable introspection for this build
--enable-caches Run update-* to update mime, desktop and icon caches
- when installing [default=yes]
+ when installing [[default=yes]]
--disable-nls do not use Native Language Support
--disable-schemas-install
Disable installation of the gconf schemas
-@@ -1818,7 +1764,7 @@ Some influential environment variables:
+@@ -1852,7 +1798,7 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1532,7 +2043,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1891,6 +1837,7 @@ Some influential environment variables:
+@@ -1934,6 +1880,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1540,21 +2051,27 @@
_ACEOF
ac_status=$?
fi
-@@ -1954,21 +1901,426 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- brasero configure 2.28.3
+@@ -1993,25 +1940,430 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+ done
+ fi
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-brasero configure 2.30.1
-generated by GNU Autoconf 2.63
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++ cat <<\_ACEOF
++brasero configure 2.30.1
+generated by GNU Autoconf 2.65
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++
+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
- exit
- fi
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++ exit
++fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1907,7 +2424,11 @@
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
-+
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-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.
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -1932,7 +2453,8 @@
+ ;
+ return 0;
+}
-+_ACEOF
+ _ACEOF
+- exit
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -1954,7 +2476,7 @@
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
@@ -1965,13 +2487,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by brasero $as_me 2.28.3, which was
+ It was created by brasero $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -2004,8 +2356,8 @@ for as_dir in $PATH
+@@ -2047,8 +2399,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1982,7 +2504,7 @@
IFS=$as_save_IFS
} >&5
-@@ -2042,9 +2394,9 @@ do
+@@ -2085,9 +2437,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1994,7 +2516,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2060,13 +2412,13 @@ do
+@@ -2103,13 +2455,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -2011,7 +2533,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2091,13 +2443,13 @@ _ASBOX
+@@ -2134,13 +2486,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -2027,7 +2549,7 @@
esac ;;
esac
done
-@@ -2169,39 +2521,41 @@ _ASBOX
+@@ -2212,39 +2564,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2074,7 +2596,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2219,8 +2573,8 @@ fi
+@@ -2262,8 +2616,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -2085,7 +2607,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2228,10 +2582,10 @@ $as_echo "$as_me: loading site script $a
+@@ -2271,10 +2625,10 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -2100,7 +2622,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2239,7 +2593,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2282,7 +2636,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -2109,7 +2631,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2254,11 +2608,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2297,11 +2651,11 @@ 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,)
@@ -2123,7 +2645,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2268,17 +2622,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2311,17 +2665,17 @@ $as_echo "$as_me: error: \`$ac_var' was
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
@@ -2145,7 +2667,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2290,43 +2644,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2333,43 +2687,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2196,7 +2718,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2385,24 +2716,16 @@ am__api_version='1.11'
+@@ -2428,24 +2759,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2229,7 +2751,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2428,10 +2751,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2471,10 +2794,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2242,7 +2764,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2439,11 +2762,11 @@ for as_dir in $PATH
+@@ -2482,11 +2805,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2258,7 +2780,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2480,7 +2803,7 @@ case $as_dir/ in
+@@ -2523,7 +2846,7 @@ case $as_dir/ in
;;
esac
@@ -2267,7 +2789,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2496,7 +2819,7 @@ fi
+@@ -2539,7 +2862,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -2276,7 +2798,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2507,7 +2830,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2550,7 +2873,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2285,7 +2807,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2518,15 +2841,11 @@ am_lf='
+@@ -2561,15 +2884,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2303,7 +2825,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2548,11 +2867,8 @@ if (
+@@ -2591,11 +2910,8 @@ 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".
@@ -2317,7 +2839,7 @@
fi
test "$2" = conftest.file
-@@ -2561,13 +2877,10 @@ then
+@@ -2604,13 +2920,10 @@ then
# Ok.
:
else
@@ -2334,7 +2856,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2595,7 +2908,7 @@ if eval "$MISSING --run true"; then
+@@ -2638,7 +2951,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2343,7 +2865,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2616,9 +2929,9 @@ if test "$cross_compiling" != no; then
+@@ -2659,9 +2972,9 @@ 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
@@ -2355,7 +2877,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2629,24 +2942,24 @@ for as_dir in $PATH
+@@ -2672,24 +2985,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2385,7 +2907,7 @@
$as_echo "no" >&6; }
fi
-@@ -2656,9 +2969,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2699,9 +3012,9 @@ 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
@@ -2397,7 +2919,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2669,24 +2982,24 @@ for as_dir in $PATH
+@@ -2712,24 +3025,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2427,7 +2949,7 @@
$as_echo "no" >&6; }
fi
-@@ -2695,7 +3008,7 @@ fi
+@@ -2738,7 +3051,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2436,7 +2958,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2708,10 +3021,10 @@ fi
+@@ -2751,10 +3064,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2449,7 +2971,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2719,7 +3032,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2762,7 +3075,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2458,7 +2980,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2731,11 +3044,12 @@ do
+@@ -2774,11 +3087,12 @@ do
esac
done
done
@@ -2472,7 +2994,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2743,11 +3057,10 @@ fi
+@@ -2786,11 +3100,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2485,7 +3007,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2760,9 +3073,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2803,9 +3116,9 @@ 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
@@ -2497,7 +3019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2773,24 +3086,24 @@ for as_dir in $PATH
+@@ -2816,24 +3129,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2527,7 +3049,7 @@
$as_echo "no" >&6; }
fi
-@@ -2798,11 +3111,11 @@ fi
+@@ -2841,11 +3154,11 @@ fi
test -n "$AWK" && break
done
@@ -2541,7 +3063,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2820,11 +3133,11 @@ esac
+@@ -2863,11 +3176,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2555,7 +3077,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2844,9 +3157,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2887,9 +3200,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2566,7 +3088,7 @@
fi
fi
-@@ -2904,7 +3215,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2947,7 +3258,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -2575,27 +3097,111 @@
enableval=$enable_silent_rules;
fi
-@@ -2920,16 +3231,16 @@ ac_config_headers="$ac_config_headers co
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
--if test "${enable_maintainer_mode+set}" = set; then
-+if test "${enable_maintainer_mode+set}" = set; then :
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
- fi
-
-- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
- $as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
-@@ -2957,7 +3268,7 @@ am__doit:
+@@ -2963,7 +3274,7 @@ ac_config_headers="$ac_config_headers co
+
+
+ # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
++if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+@@ -2995,14 +3306,14 @@ fi
+
+ case `pwd` in
+ *\ * | *\ *)
+- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ esac
+
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -3020,35 +3331,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- { { $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; }; }
++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then
++if test "${ac_cv_build+set}" = set; then :
+ $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 &&
+- { { $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; }; }
++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- { { $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; }; }
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $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; }; };;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3064,28 +3367,24 @@ IFS=$ac_save_IFS
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then
++if test "${ac_cv_host+set}" = set; then :
+ $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` ||
+- { { $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; }; }
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $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; }; };;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3113,7 +3412,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2604,7 +3210,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2985,12 +3296,12 @@ if test "$am__include" = "#"; then
+@@ -3141,12 +3440,12 @@ if test "$am__include" = "#"; then
fi
@@ -2619,7 +3225,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3015,9 +3326,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3171,9 +3470,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2631,7 +3237,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3028,24 +3339,24 @@ for as_dir in $PATH
+@@ -3184,24 +3483,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2661,7 +3267,7 @@
$as_echo "no" >&6; }
fi
-@@ -3055,9 +3366,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3211,9 +3510,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2673,7 +3279,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3068,24 +3379,24 @@ for as_dir in $PATH
+@@ -3224,24 +3523,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2703,7 +3309,7 @@
$as_echo "no" >&6; }
fi
-@@ -3094,7 +3405,7 @@ fi
+@@ -3250,7 +3549,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2712,7 +3318,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3108,9 +3419,9 @@ if test -z "$CC"; then
+@@ -3264,9 +3563,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2724,7 +3330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3121,24 +3432,24 @@ for as_dir in $PATH
+@@ -3277,24 +3576,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2754,7 +3360,7 @@
$as_echo "no" >&6; }
fi
-@@ -3148,9 +3459,9 @@ fi
+@@ -3304,9 +3603,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2766,7 +3372,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3162,18 +3473,18 @@ for as_dir in $PATH
+@@ -3318,18 +3617,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2788,7 +3394,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3192,10 +3503,10 @@ fi
+@@ -3348,10 +3647,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2801,7 +3407,7 @@
$as_echo "no" >&6; }
fi
-@@ -3207,9 +3518,9 @@ if test -z "$CC"; then
+@@ -3363,9 +3662,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2813,7 +3419,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3220,24 +3531,24 @@ for as_dir in $PATH
+@@ -3376,24 +3675,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2843,7 +3449,7 @@
$as_echo "no" >&6; }
fi
-@@ -3251,9 +3562,9 @@ if test -z "$CC"; then
+@@ -3407,9 +3706,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2855,7 +3461,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3264,24 +3575,24 @@ for as_dir in $PATH
+@@ -3420,24 +3719,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2885,7 +3491,7 @@
$as_echo "no" >&6; }
fi
-@@ -3294,7 +3605,7 @@ done
+@@ -3450,7 +3749,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2894,7 +3500,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3305,57 +3616,37 @@ fi
+@@ -3461,57 +3760,37 @@ fi
fi
@@ -2972,7 +3578,7 @@
/* end confdefs.h. */
int
-@@ -3371,8 +3662,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3527,8 +3806,8 @@ ac_clean_files="$ac_clean_files a.out a.
# 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.
@@ -2983,7 +3589,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3388,17 +3679,17 @@ do
+@@ -3544,17 +3823,17 @@ do
done
rm -f $ac_rmfiles
@@ -3006,7 +3612,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3415,7 +3706,7 @@ do
+@@ -3571,7 +3850,7 @@ do
# certainly right.
break;;
*.* )
@@ -3015,7 +3621,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3434,84 +3725,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3590,84 +3869,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -3121,7 +3727,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3526,32 +3775,83 @@ for ac_file in conftest.exe conftest con
+@@ -3682,32 +3919,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -3221,7 +3827,7 @@
/* end confdefs.h. */
int
-@@ -3563,17 +3863,17 @@ main ()
+@@ -3719,17 +4007,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3244,7 +3850,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3586,31 +3886,23 @@ else
+@@ -3742,31 +4030,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3283,7 +3889,7 @@
/* end confdefs.h. */
int
-@@ -3624,37 +3916,16 @@ main ()
+@@ -3780,37 +4060,16 @@ main ()
return 0;
}
_ACEOF
@@ -3324,7 +3930,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3663,20 +3934,16 @@ else
+@@ -3819,20 +4078,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3348,7 +3954,7 @@
/* end confdefs.h. */
int
-@@ -3687,35 +3954,11 @@ main ()
+@@ -3843,35 +4098,11 @@ main ()
return 0;
}
_ACEOF
@@ -3387,7 +3993,7 @@
/* end confdefs.h. */
int
-@@ -3726,36 +3969,12 @@ main ()
+@@ -3882,82 +4113,33 @@ main ()
return 0;
}
_ACEOF
@@ -3428,10 +4034,13 @@
/* end confdefs.h. */
int
-@@ -3766,42 +3985,17 @@ main ()
- return 0;
- }
- _ACEOF
+ main ()
+ {
+
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -3450,13 +4059,18 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
+- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3473,7 +4087,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3818,18 +4012,14 @@ else
+@@ -3974,18 +4156,14 @@ else
CFLAGS=
fi
fi
@@ -3495,7 +4109,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3886,32 +4076,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -4042,32 +4220,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3529,7 +4143,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3922,17 +4089,19 @@ fi
+@@ -4078,17 +4233,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3552,7 +4166,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3942,9 +4111,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4098,9 +4255,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -3564,7 +4178,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4052,7 +4221,7 @@ else
+@@ -4208,7 +4365,7 @@ else
fi
fi
@@ -3573,265 +4187,8 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4071,7 +4240,7 @@ fi
-
-
- # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
-+if test "${enable_compile_warnings+set}" = set; then :
- enableval=$enable_compile_warnings;
- else
- enable_compile_warnings="maximum"
-@@ -4102,13 +4271,9 @@ fi
- for option in -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
-- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
- $as_echo_n "checking whether gcc understands $option... " >&6; }
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -4119,35 +4284,14 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- has_option=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- has_option=no
-+ has_option=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
-- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
- $as_echo "$has_option" >&6; }
- if test $has_option = yes; then
- warning_flags="$warning_flags $option"
-@@ -4161,26 +4305,24 @@ $as_echo "$has_option" >&6; }
- fi
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
-- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
- $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
- $as_echo "$warning_flags" >&6; }
-
- # Check whether --enable-iso-c was given.
--if test "${enable_iso_c+set}" = set; then
-+if test "${enable_iso_c+set}" = set; then :
- enableval=$enable_iso_c;
- else
- enable_iso_c=no
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
- $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
-@@ -4195,7 +4337,7 @@ $as_echo_n "checking what language compl
- esac
- fi
- fi
-- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
- $as_echo "$complCFLAGS" >&6; }
-
- WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -4203,14 +4345,14 @@ $as_echo "$complCFLAGS" >&6; }
-
-
- # Check whether --enable-cxx-warnings was given.
--if test "${enable_cxx_warnings+set}" = set; then
-+if test "${enable_cxx_warnings+set}" = set; then :
- enableval=$enable_cxx_warnings;
- else
- enable_cxx_warnings="minimum"
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
- $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
- warnCXXFLAGS=
- if test "x$GXX" != xyes; then
-@@ -4230,18 +4372,18 @@ $as_echo_n "checking what warning flags
- fi
- fi
- fi
-- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5
- $as_echo "$warnCXXFLAGS" >&6; }
-
- # Check whether --enable-iso-cxx was given.
--if test "${enable_iso_cxx+set}" = set; then
-+if test "${enable_iso_cxx+set}" = set; then :
- enableval=$enable_iso_cxx;
- else
- enable_iso_cxx=no
- fi
-
-
-- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5
- $as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
- complCXXFLAGS=
- if test "x$enable_iso_cxx" != "xno"; then
-@@ -4257,7 +4399,7 @@ $as_echo_n "checking what language compl
- esac
- fi
- fi
-- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5
- $as_echo "$complCXXFLAGS" >&6; }
-
- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -4281,7 +4423,7 @@ $as_echo "$complCXXFLAGS" >&6; }
-
-
- # Check whether --enable-static was given.
--if test "${enable_static+set}" = set; then
-+if test "${enable_static+set}" = set; then :
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
-@@ -4313,14 +4455,14 @@ fi
-
- case `pwd` in
- *\ * | *\ *)
-- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
- $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
-
-
-
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-
-
-
-@@ -4338,35 +4480,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- { { $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; }; }
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
--if test "${ac_cv_build+set}" = set; then
-+if test "${ac_cv_build+set}" = set; then :
- $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 &&
-- { { $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; }; }
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- { { $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; }; }
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { $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; }; };;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -4382,28 +4516,24 @@ IFS=$ac_save_IFS
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
- $as_echo_n "checking host system type... " >&6; }
--if test "${ac_cv_host+set}" = set; then
-+if test "${ac_cv_host+set}" = set; then :
- $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` ||
-- { { $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; }; }
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { $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; }; };;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -4419,9 +4549,9 @@ IFS=$ac_save_IFS
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+@@ -4223,9 +4380,9 @@ else
+ fi
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
@@ -3842,7 +4199,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4429,7 +4559,7 @@ else
+@@ -4233,7 +4390,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3851,7 +4208,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -4438,7 +4568,7 @@ for as_dir in $PATH
+@@ -4242,7 +4399,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3860,7 +4217,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -4458,7 +4588,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -4262,7 +4419,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3869,7 +4226,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -4473,19 +4603,17 @@ esac
+@@ -4277,19 +4434,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -3892,7 +4249,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4503,9 +4631,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -4307,9 +4462,9 @@ Xsed="$SED -e 1s/^X//"
@@ -3904,7 +4261,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4516,7 +4644,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4320,7 +4475,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3913,7 +4270,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4536,7 +4664,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4340,7 +4495,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$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
@@ -3922,7 +4279,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4551,26 +4679,24 @@ esac
+@@ -4355,26 +4510,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -3954,7 +4311,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4584,7 +4710,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4388,7 +4541,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3963,7 +4320,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4604,7 +4730,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4408,7 +4561,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
$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
@@ -3972,7 +4329,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4619,12 +4745,10 @@ esac
+@@ -4423,12 +4576,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -3987,7 +4344,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4632,14 +4756,14 @@ fi
+@@ -4436,14 +4587,14 @@ fi
fi
fi
@@ -4005,7 +4362,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4653,7 +4777,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4457,7 +4608,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4014,7 +4371,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4673,7 +4797,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -4477,7 +4628,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4023,7 +4380,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4688,12 +4812,10 @@ esac
+@@ -4492,12 +4643,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -4038,7 +4395,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4701,7 +4823,7 @@ fi
+@@ -4505,7 +4654,7 @@ fi
fi
fi
@@ -4047,7 +4404,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4727,7 +4849,7 @@ test -z "$GREP" && GREP=grep
+@@ -4531,7 +4680,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -4056,7 +4413,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4736,7 +4858,7 @@ fi
+@@ -4540,7 +4689,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -4065,7 +4422,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4766,13 +4888,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -4570,13 +4719,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -4082,7 +4439,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4803,18 +4925,16 @@ fi
+@@ -4607,18 +4756,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -4106,7 +4463,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4827,7 +4947,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -4631,7 +4778,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -4115,7 +4472,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4839,9 +4959,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -4643,9 +4790,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -4127,7 +4484,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4888,7 +5008,7 @@ else
+@@ -4692,7 +4839,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -4136,7 +4493,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4899,9 +5019,9 @@ else
+@@ -4703,9 +4850,9 @@ else
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
@@ -4148,7 +4505,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4912,24 +5032,24 @@ for as_dir in $PATH
+@@ -4716,24 +4863,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4178,7 +4535,7 @@
$as_echo "no" >&6; }
fi
-@@ -4943,9 +5063,9 @@ if test -z "$DUMPBIN"; then
+@@ -4747,9 +4894,9 @@ if test -z "$DUMPBIN"; 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
@@ -4190,7 +4547,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4956,24 +5076,24 @@ for as_dir in $PATH
+@@ -4760,24 +4907,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4220,7 +4577,7 @@
$as_echo "no" >&6; }
fi
-@@ -4986,7 +5106,7 @@ done
+@@ -4790,7 +4937,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4229,7 +4586,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5006,44 +5126,44 @@ test -z "$NM" && NM=nm
+@@ -4810,44 +4957,44 @@ test -z "$NM" && NM=nm
@@ -4242,16 +4599,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5016: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5136: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:4820: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4967: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5019: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5139: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:4823: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4970: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5022: output\"" >&5)
-+ (eval echo "\"\$as_me:5142: output\"" >&5)
+- (eval echo "\"\$as_me:4826: output\"" >&5)
++ (eval echo "\"\$as_me:4973: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4285,7 +4642,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5161,10 +5281,10 @@ else
+@@ -4965,10 +5112,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -4298,7 +4655,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -5178,7 +5298,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -4982,7 +5129,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -4307,7 +4664,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -5188,17 +5308,17 @@ xsi_shell=no
+@@ -4992,17 +5139,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -4328,7 +4685,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5233,14 +5353,14 @@ esac
+@@ -5037,14 +5184,14 @@ esac
@@ -4346,7 +4703,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5269,9 +5389,9 @@ esac
+@@ -5073,9 +5220,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -4358,7 +4715,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5282,24 +5402,24 @@ for as_dir in $PATH
+@@ -5086,24 +5233,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4388,7 +4745,7 @@
$as_echo "no" >&6; }
fi
-@@ -5309,9 +5429,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -5113,9 +5260,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -4400,7 +4757,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5322,24 +5442,24 @@ for as_dir in $PATH
+@@ -5126,24 +5273,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4430,7 +4787,7 @@
$as_echo "no" >&6; }
fi
-@@ -5348,7 +5468,7 @@ fi
+@@ -5152,7 +5299,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4439,7 +4796,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5368,9 +5488,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5172,9 +5319,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -4451,7 +4808,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5485,11 +5605,11 @@ irix5* | irix6* | nonstopux*)
+@@ -5289,11 +5436,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -4465,7 +4822,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5564,7 +5684,7 @@ tpf*)
+@@ -5368,7 +5515,7 @@ tpf*)
esac
fi
@@ -4474,7 +4831,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -5584,9 +5704,9 @@ test -z "$deplibs_check_method" && depli
+@@ -5388,9 +5535,9 @@ test -z "$deplibs_check_method" && depli
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
@@ -4486,7 +4843,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5597,24 +5717,24 @@ for as_dir in $PATH
+@@ -5401,24 +5548,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4516,7 +4873,7 @@
$as_echo "no" >&6; }
fi
-@@ -5624,9 +5744,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -5428,9 +5575,9 @@ 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
@@ -4528,7 +4885,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5637,24 +5757,24 @@ for as_dir in $PATH
+@@ -5441,24 +5588,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4558,7 +4915,7 @@
$as_echo "no" >&6; }
fi
-@@ -5663,7 +5783,7 @@ fi
+@@ -5467,7 +5614,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4567,7 +4924,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5689,9 +5809,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -5493,9 +5640,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
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
@@ -4579,7 +4936,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5702,24 +5822,24 @@ for as_dir in $PATH
+@@ -5506,24 +5653,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4609,7 +4966,7 @@
$as_echo "no" >&6; }
fi
-@@ -5729,9 +5849,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -5533,9 +5680,9 @@ 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
@@ -4621,7 +4978,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5742,24 +5862,24 @@ for as_dir in $PATH
+@@ -5546,24 +5693,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4651,7 +5008,7 @@
$as_echo "no" >&6; }
fi
-@@ -5768,7 +5888,7 @@ fi
+@@ -5572,7 +5719,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4660,7 +5017,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5788,9 +5908,9 @@ test -z "$STRIP" && STRIP=:
+@@ -5592,9 +5739,9 @@ test -z "$STRIP" && STRIP=:
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
@@ -4672,7 +5029,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5801,24 +5921,24 @@ for as_dir in $PATH
+@@ -5605,24 +5752,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4702,7 +5059,7 @@
$as_echo "no" >&6; }
fi
-@@ -5828,9 +5948,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -5632,9 +5779,9 @@ 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
@@ -4714,7 +5071,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5841,24 +5961,24 @@ for as_dir in $PATH
+@@ -5645,24 +5792,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4744,7 +5101,7 @@
$as_echo "no" >&6; }
fi
-@@ -5867,7 +5987,7 @@ fi
+@@ -5671,7 +5818,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4753,7 +5110,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5945,9 +6065,9 @@ compiler=$CC
+@@ -5749,9 +5896,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4765,7 +5122,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -6063,18 +6183,18 @@ void nm_test_func(void){}
+@@ -5867,18 +6014,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4790,7 +5147,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -6127,11 +6247,11 @@ _LT_EOF
+@@ -5931,11 +6078,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4805,7 +5162,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -6165,10 +6285,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -5969,10 +6116,10 @@ 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
@@ -4818,7 +5175,7 @@
$as_echo "ok" >&6; }
fi
-@@ -6194,7 +6314,7 @@ fi
+@@ -5999,7 +6146,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -4827,7 +5184,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6206,11 +6326,11 @@ case $host in
+@@ -6011,11 +6158,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4842,13 +5199,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6224,12 +6344,12 @@ ia64-*-hpux*)
+@@ -6029,12 +6176,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6227 "configure"' > conftest.$ac_ext
+- echo '#line 6032 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6347 "configure"' > conftest.$ac_ext
++ echo '#line 6179 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4859,7 +5216,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6263,11 +6383,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -6068,11 +6215,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4874,7 +5231,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6316,9 +6436,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6121,9 +6268,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -4886,7 +5243,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6327,11 +6447,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -6132,11 +6279,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4899,7 +5256,7 @@
/* end confdefs.h. */
int
-@@ -6342,38 +6458,13 @@ main ()
+@@ -6147,38 +6290,13 @@ main ()
return 0;
}
_ACEOF
@@ -4942,7 +5299,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6381,7 +6472,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6186,7 +6304,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -4951,7 +5308,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -6391,11 +6482,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -6196,11 +6314,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4966,7 +5323,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6421,9 +6512,9 @@ need_locks="$enable_libtool_lock"
+@@ -6226,9 +6344,9 @@ need_locks="$enable_libtool_lock"
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
@@ -4978,7 +5335,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6434,24 +6525,24 @@ for as_dir in $PATH
+@@ -6239,24 +6357,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5008,7 +5365,7 @@
$as_echo "no" >&6; }
fi
-@@ -6461,9 +6552,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -6266,9 +6384,9 @@ 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
@@ -5020,7 +5377,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6474,24 +6565,24 @@ for as_dir in $PATH
+@@ -6279,24 +6397,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5050,7 +5407,7 @@
$as_echo "no" >&6; }
fi
-@@ -6500,7 +6591,7 @@ fi
+@@ -6305,7 +6423,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5059,7 +5416,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6513,9 +6604,9 @@ fi
+@@ -6318,9 +6436,9 @@ 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
@@ -5071,7 +5428,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6526,24 +6617,24 @@ for as_dir in $PATH
+@@ -6331,24 +6449,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5101,7 +5458,7 @@
$as_echo "no" >&6; }
fi
-@@ -6553,9 +6644,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -6358,9 +6476,9 @@ 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
@@ -5113,7 +5470,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6566,24 +6657,24 @@ for as_dir in $PATH
+@@ -6371,24 +6489,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5143,7 +5500,7 @@
$as_echo "no" >&6; }
fi
-@@ -6592,7 +6683,7 @@ fi
+@@ -6397,7 +6515,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5152,7 +5509,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6605,9 +6696,9 @@ fi
+@@ -6410,9 +6528,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -5164,7 +5521,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6618,24 +6709,24 @@ for as_dir in $PATH
+@@ -6423,24 +6541,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5194,7 +5551,7 @@
$as_echo "no" >&6; }
fi
-@@ -6645,9 +6736,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -6450,9 +6568,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -5206,7 +5563,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6658,24 +6749,24 @@ for as_dir in $PATH
+@@ -6463,24 +6581,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5236,7 +5593,7 @@
$as_echo "no" >&6; }
fi
-@@ -6684,7 +6775,7 @@ fi
+@@ -6489,7 +6607,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5245,7 +5602,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6697,9 +6788,9 @@ fi
+@@ -6502,9 +6620,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -5257,7 +5614,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6710,24 +6801,24 @@ for as_dir in $PATH
+@@ -6515,24 +6633,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5287,7 +5644,7 @@
$as_echo "no" >&6; }
fi
-@@ -6737,9 +6828,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -6542,9 +6660,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -5299,7 +5656,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6750,24 +6841,24 @@ for as_dir in $PATH
+@@ -6555,24 +6673,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5329,7 +5686,7 @@
$as_echo "no" >&6; }
fi
-@@ -6776,7 +6867,7 @@ fi
+@@ -6581,7 +6699,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5338,7 +5695,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6789,9 +6880,9 @@ fi
+@@ -6594,9 +6712,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -5350,7 +5707,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6802,24 +6893,24 @@ for as_dir in $PATH
+@@ -6607,24 +6725,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5380,7 +5737,7 @@
$as_echo "no" >&6; }
fi
-@@ -6829,9 +6920,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -6634,9 +6752,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -5392,7 +5749,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6842,24 +6933,24 @@ for as_dir in $PATH
+@@ -6647,24 +6765,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5422,7 +5779,7 @@
$as_echo "no" >&6; }
fi
-@@ -6868,7 +6959,7 @@ fi
+@@ -6673,7 +6791,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5431,7 +5788,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6904,9 +6995,9 @@ fi
+@@ -6709,9 +6827,9 @@ fi
@@ -5443,7 +5800,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6931,22 +7022,18 @@ else
+@@ -6736,22 +6854,18 @@ else
rm -f conftest.*
fi
fi
@@ -5470,7 +5827,7 @@
/* end confdefs.h. */
int
-@@ -6957,42 +7044,17 @@ main ()
+@@ -6762,42 +6876,17 @@ main ()
return 0;
}
_ACEOF
@@ -5518,7 +5875,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -7034,14 +7096,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -6839,14 +6928,14 @@ 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
@@ -5535,7 +5892,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7056,11 +7118,7 @@ do
+@@ -6861,11 +6950,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5548,7 +5905,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7069,78 +7127,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6874,78 +6959,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5632,7 +5989,7 @@
break
fi
-@@ -7152,7 +7166,7 @@ fi
+@@ -6957,7 +6998,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -5641,7 +5998,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -7163,11 +7177,7 @@ do
+@@ -6968,11 +7009,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -5654,7 +6011,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7176,87 +7186,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6981,87 +7018,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5751,7 +6108,7 @@
fi
ac_ext=c
-@@ -7266,16 +7229,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -7071,16 +7061,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5771,7 +6128,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7290,48 +7249,23 @@ main ()
+@@ -7095,48 +7081,23 @@ main ()
return 0;
}
_ACEOF
@@ -5825,7 +6182,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7341,18 +7275,14 @@ fi
+@@ -7146,18 +7107,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5847,7 +6204,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7362,14 +7292,10 @@ fi
+@@ -7167,14 +7124,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5864,10 +6221,15 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7396,118 +7322,34 @@ main ()
- return 0;
- }
- _ACEOF
+@@ -7196,123 +7149,39 @@ main ()
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+- || toupper (i) != TOUPPER (i))
+- return 2;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -5895,46 +6257,126 @@
- $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
-+if ac_fn_c_try_run "$LINENO"; then :
-
+-
-( exit $ac_status )
-ac_cv_header_stdc=no
-+else
-+ ac_cv_header_stdc=no
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
--
- fi
- fi
+-fi
+-
+-
+-fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
- $as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-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=`$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
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++ || toupper (i) != TOUPPER (i))
++ return 2;
++ return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
++if ac_fn_c_try_run "$LINENO"; then :
+
+-#include <$ac_header>
+-_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
+- eval "$as_ac_Header=yes"
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+
+- eval "$as_ac_Header=no"
+ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
- fi
-
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-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; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7322,62 +7191,13 @@ fi
+ done
+
+
+-
+ for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -5988,73 +6430,6 @@
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -7517,62 +7359,13 @@ fi
- done
-
-
--
- for ac_header in dlfcn.h
--do
--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
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--
--#include <$ac_header>
--_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
-- eval "$as_ac_Header=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--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; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
@@ -6064,7 +6439,7 @@
_ACEOF
fi
-@@ -7592,7 +7385,7 @@ done
+@@ -7397,7 +7217,7 @@ done
# Check whether --enable-shared was given.
@@ -6073,7 +6448,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -7625,7 +7418,7 @@ fi
+@@ -7430,7 +7250,7 @@ fi
# Check whether --with-pic was given.
@@ -6082,7 +6457,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7641,7 +7434,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -7446,7 +7266,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -6091,7 +6466,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7722,9 +7515,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -7527,9 +7347,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -6103,7 +6478,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7737,7 +7530,7 @@ else
+@@ -7542,7 +7362,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -6112,7 +6487,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7830,9 +7623,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -7635,9 +7455,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -6124,7 +6499,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7883,10 +7676,10 @@ fi
+@@ -7688,10 +7508,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6137,7 +6512,7 @@
$as_echo "no" >&6; }
fi
-@@ -7896,9 +7689,9 @@ fi
+@@ -7701,9 +7521,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -6149,7 +6524,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7949,10 +7742,10 @@ fi
+@@ -7754,10 +7574,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6162,7 +6537,7 @@
$as_echo "no" >&6; }
fi
-@@ -8029,9 +7822,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -7834,9 +7654,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -6174,21 +6549,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8047,11 +7840,11 @@ else
+@@ -7852,11 +7672,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:8050: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7843: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7855: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7675: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8054: \$? = $ac_status" >&5
-+ echo "$as_me:7847: \$? = $ac_status" >&5
+- echo "$as_me:7859: \$? = $ac_status" >&5
++ echo "$as_me:7679: \$? = $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.
-@@ -8064,7 +7857,7 @@ else
+@@ -7869,7 +7689,7 @@ else
$RM conftest*
fi
@@ -6197,7 +6572,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -8084,7 +7877,7 @@ fi
+@@ -7889,7 +7709,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -6206,7 +6581,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8216,7 +8009,7 @@ $as_echo_n "checking for $compiler optio
+@@ -8021,7 +7841,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -6215,7 +6590,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -8356,7 +8149,7 @@ case $host_os in
+@@ -8161,7 +7981,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -6224,7 +6599,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8368,9 +8161,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -8173,9 +7993,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -6236,21 +6611,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8386,11 +8179,11 @@ else
+@@ -8191,11 +8011,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:8389: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8182: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8194: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8014: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8393: \$? = $ac_status" >&5
-+ echo "$as_me:8186: \$? = $ac_status" >&5
+- echo "$as_me:8198: \$? = $ac_status" >&5
++ echo "$as_me:8018: \$? = $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.
-@@ -8403,7 +8196,7 @@ else
+@@ -8208,7 +8028,7 @@ else
$RM conftest*
fi
@@ -6259,7 +6634,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8427,9 +8220,9 @@ fi
+@@ -8232,9 +8052,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -6271,7 +6646,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8455,7 +8248,7 @@ else
+@@ -8260,7 +8080,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -6280,7 +6655,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8470,9 +8263,9 @@ fi
+@@ -8275,9 +8095,9 @@ fi
@@ -6292,21 +6667,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8491,11 +8284,11 @@ else
+@@ -8296,11 +8116,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:8494: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8287: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8498: \$? = $ac_status" >&5
-+ echo "$as_me:8291: \$? = $ac_status" >&5
+- echo "$as_me:8303: \$? = $ac_status" >&5
++ echo "$as_me:8123: \$? = $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
-@@ -8517,7 +8310,7 @@ else
+@@ -8322,7 +8142,7 @@ else
$RM conftest*
fi
@@ -6315,7 +6690,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8525,9 +8318,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -8330,9 +8150,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -6327,21 +6702,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8546,11 +8339,11 @@ else
+@@ -8351,11 +8171,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:8549: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8342: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8553: \$? = $ac_status" >&5
-+ echo "$as_me:8346: \$? = $ac_status" >&5
+- echo "$as_me:8358: \$? = $ac_status" >&5
++ echo "$as_me:8178: \$? = $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
-@@ -8572,7 +8365,7 @@ else
+@@ -8377,7 +8197,7 @@ else
$RM conftest*
fi
@@ -6350,7 +6725,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8581,7 +8374,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -8386,7 +8206,7 @@ $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
@@ -6359,7 +6734,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8589,10 +8382,10 @@ $as_echo_n "checking if we can lock with
+@@ -8394,10 +8214,10 @@ $as_echo_n "checking if we can lock with
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -6372,7 +6747,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -8605,7 +8398,7 @@ fi
+@@ -8410,7 +8230,7 @@ fi
@@ -6381,7 +6756,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8665,6 +8458,9 @@ $as_echo_n "checking whether the $compil
+@@ -8470,6 +8290,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -6391,7 +6766,7 @@
esac
ld_shlibs=yes
-@@ -8686,6 +8482,7 @@ $as_echo_n "checking whether the $compil
+@@ -8491,6 +8314,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -6399,7 +6774,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -8777,7 +8574,7 @@ _LT_EOF
+@@ -8582,7 +8406,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -6408,7 +6783,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -8847,7 +8644,7 @@ _LT_EOF
+@@ -8652,7 +8476,7 @@ _LT_EOF
fi
;;
@@ -6417,7 +6792,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9022,6 +8819,7 @@ _LT_EOF
+@@ -8827,6 +8651,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -6425,7 +6800,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9047,11 +8845,7 @@ _LT_EOF
+@@ -8852,11 +8677,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6438,7 +6813,7 @@
/* end confdefs.h. */
int
-@@ -9062,27 +8856,7 @@ main ()
+@@ -8867,27 +8688,7 @@ main ()
return 0;
}
_ACEOF
@@ -6467,7 +6842,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9096,16 +8870,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -8901,16 +8702,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -6486,7 +6861,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9118,11 +8885,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8923,11 +8717,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6499,7 +6874,7 @@
/* end confdefs.h. */
int
-@@ -9133,27 +8896,7 @@ main ()
+@@ -8938,27 +8728,7 @@ main ()
return 0;
}
_ACEOF
@@ -6528,7 +6903,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9167,16 +8910,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -8972,16 +8742,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -6547,7 +6922,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9388,42 +9124,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9193,42 +8956,16 @@ if test -z "$aix_libpath"; then aix_libp
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -6595,7 +6970,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -9436,7 +9146,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9241,7 +8978,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -6604,7 +6979,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9679,7 +9389,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9484,7 +9221,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -6613,7 +6988,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9716,16 +9426,16 @@ x|xyes)
+@@ -9521,16 +9258,16 @@ 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.
@@ -6634,7 +7009,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9739,11 +9449,11 @@ $as_echo_n "checking whether -lc should
+@@ -9544,11 +9281,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6649,7 +7024,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9754,7 +9464,7 @@ $as_echo_n "checking whether -lc should
+@@ -9559,7 +9296,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6658,7 +7033,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9918,7 +9628,7 @@ esac
+@@ -9723,7 +9460,7 @@ esac
@@ -6667,7 +7042,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10326,7 +10036,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -10131,7 +9868,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -6676,7 +7051,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10340,11 +10050,7 @@ linux* | k*bsd*-gnu)
+@@ -10145,11 +9882,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6689,7 +7064,7 @@
/* end confdefs.h. */
int
-@@ -10355,41 +10061,13 @@ main ()
+@@ -10160,41 +9893,13 @@ main ()
return 0;
}
_ACEOF
@@ -6735,22 +7110,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10398,13 +10076,10 @@ rm -f core conftest.err conftest.$ac_obj
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10416,6 +10091,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10218,6 +9923,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6769,7 +7129,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10604,7 +10291,7 @@ uts4*)
+@@ -10406,7 +10123,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -6778,7 +7138,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10706,7 +10393,7 @@ fi
+@@ -10508,7 +10225,7 @@ fi
@@ -6787,7 +7147,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10731,7 +10418,7 @@ else
+@@ -10533,7 +10250,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -6796,32 +7156,44 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10776,18 +10463,14 @@ else
-
- darwin*)
- # if libdl is installed we need to link against it
+@@ -10573,189 +10290,19 @@ else
+
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- darwin*)
+- # if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -10805,43 +10488,18 @@ return dlopen ();
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -6843,35 +7215,34 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
- else
+- ac_cv_lib_dl_dlopen=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-
-@@ -10854,106 +10512,18 @@ fi
- ;;
-
- *)
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+-
+-fi
+-
+- ;;
+-
+- *)
- { $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
@@ -6950,7 +7321,9 @@
-
- ac_cv_func_shl_load=no
-fi
--
++ lt_cv_dlopen_libs=
++ ;;
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -6958,29 +7331,42 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
- lt_cv_dlopen="shl_load"
- else
+- lt_cv_dlopen="shl_load"
+-else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++ darwin*)
++ # if libdl is installed we need to link against it
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld $LIBS"
+-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10971,145 +10541,32 @@ return shl_load ();
+@@ -10764,81 +10311,52 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shl_load ();
++char dlopen ();
+ int
+ main ()
+ {
+-return shl_load ();
++return dlopen ();
+ ;
return 0;
}
_ACEOF
@@ -7005,14 +7391,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+- ac_cv_lib_dld_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dld_shl_load=yes
++ ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
++ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
@@ -7023,17 +7410,19 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+-else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -7043,26 +7432,46 @@
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ lt_cv_dlopen="dyld"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++
++ ;;
+
-#undef dlopen
--
--/* 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
++ *)
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
++ lt_cv_dlopen="shl_load"
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -10846,72 +10364,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -7071,14 +7480,16 @@
-choke me
-#endif
-
--int
--main ()
--{
++char shl_load ();
+ int
+ main ()
+ {
-return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++return shl_load ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -7101,20 +7512,31 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_dld_shl_load=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
--fi
++ 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
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
@@ -7137,7 +7559,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11127,57 +10584,28 @@ return dlopen ();
+@@ -10929,57 +10416,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7204,7 +7626,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11195,57 +10623,28 @@ return dlopen ();
+@@ -10997,57 +10455,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7271,7 +7693,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11263,43 +10662,18 @@ return dld_link ();
+@@ -11065,43 +10494,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -7321,7 +7743,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11338,9 +10712,9 @@ fi
+@@ -11140,9 +10544,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -7333,16 +7755,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11349,7 +10723,7 @@ else
+@@ -11151,7 +10555,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11352 "configure"
-+#line 10726 "configure"
+-#line 11154 "configure"
++#line 10558 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11408,11 +10782,11 @@ int main ()
+@@ -11210,11 +10614,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7357,7 +7779,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11429,14 +10803,14 @@ rm -fr conftest*
+@@ -11231,14 +10635,14 @@ rm -fr conftest*
fi
@@ -7375,16 +7797,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11445,7 +10819,7 @@ else
+@@ -11247,7 +10651,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 11448 "configure"
-+#line 10822 "configure"
+-#line 11250 "configure"
++#line 10654 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11504,11 +10878,11 @@ int main ()
+@@ -11306,11 +10710,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7399,7 +7821,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11525,7 +10899,7 @@ rm -fr conftest*
+@@ -11327,7 +10731,7 @@ rm -fr conftest*
fi
@@ -7408,7 +7830,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11564,12 +10938,12 @@ fi
+@@ -11366,12 +10770,12 @@ fi
striplib=
old_striplib=
@@ -7423,7 +7845,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11578,15 +10952,15 @@ else
+@@ -11380,15 +10784,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -7442,7 +7864,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11604,12 +10978,12 @@ fi
+@@ -11406,12 +10810,12 @@ fi
# Report which library types will actually be built
@@ -7458,7 +7880,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11630,14 +11004,14 @@ $as_echo_n "checking whether to build sh
+@@ -11432,14 +10836,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -7476,7 +7898,552 @@
$as_echo "$enable_static" >&6; }
-@@ -11681,9 +11055,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11476,16 +10880,16 @@ CC="$lt_save_CC"
+
+
+
+-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+-if test "${enable_maintainer_mode+set}" = set; then
++if test "${enable_maintainer_mode+set}" = set; then :
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+ else
+ USE_MAINTAINER_MODE=no
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+ $as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+@@ -11506,9 +10910,9 @@ 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -11521,14 +10925,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11536,10 +10940,10 @@ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -11549,9 +10953,9 @@ 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -11564,14 +10968,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11579,10 +10983,10 @@ esac
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -11591,7 +10995,7 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11604,13 +11008,13 @@ fi
+ fi
+ if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+@@ -11619,35 +11023,33 @@ fi
+
+ gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+ $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ gdu_cv_have_gdu=yes
+ else
+ gdu_cv_have_gdu=no
+ fi
+
+ if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+ fi
+
+
+
+ # Check whether --with-help-dir was given.
+-if test "${with_help_dir+set}" = set; then
++if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+ else
+ with_help_dir='${datadir}/gnome/help'
+@@ -11658,7 +11060,7 @@ HELP_DIR="$with_help_dir"
+
+
+ # Check whether --with-omf-dir was given.
+-if test "${with_omf_dir+set}" = set; then
++if test "${with_omf_dir+set}" = set; then :
+ withval=$with_omf_dir;
+ else
+ with_omf_dir='${datadir}/omf'
+@@ -11669,7 +11071,7 @@ OMF_DIR="$with_omf_dir"
+
+
+ # Check whether --with-help-formats was given.
+-if test "${with_help_formats+set}" = set; then
++if test "${with_help_formats+set}" = set; then :
+ withval=$with_help_formats;
+ else
+ with_help_formats=''
+@@ -11679,7 +11081,7 @@ DOC_USER_FORMATS="$with_help_formats"
+
+
+ # Check whether --enable-scrollkeeper was given.
+-if test "${enable_scrollkeeper+set}" = set; then
++if test "${enable_scrollkeeper+set}" = set; then :
+ enableval=$enable_scrollkeeper;
+ else
+ enable_scrollkeeper=yes
+@@ -11711,9 +11113,9 @@ fi
+
+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+ set dummy gtkdoc-check; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+@@ -11726,14 +11128,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11741,10 +11143,10 @@ esac
+ fi
+ GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+ if test -n "$GTKDOC_CHECK"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+ $as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -11753,9 +11155,9 @@ fi
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_REBASE in
+@@ -11768,14 +11170,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11783,10 +11185,10 @@ esac
+ fi
+ GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+ if test -n "$GTKDOC_REBASE"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+ $as_echo "$GTKDOC_REBASE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -11797,9 +11199,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+
+ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+ set dummy gtkdoc-mkpdf; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_MKPDF in
+@@ -11812,14 +11214,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -11827,10 +11229,10 @@ esac
+ fi
+ GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+ if test -n "$GTKDOC_MKPDF"; then
+- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+ $as_echo "$GTKDOC_MKPDF" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -11838,7 +11240,7 @@ fi
+
+
+ # Check whether --with-html-dir was given.
+-if test "${with_html_dir+set}" = set; then
++if test "${with_html_dir+set}" = set; then :
+ withval=$with_html_dir;
+ else
+ with_html_dir='${datadir}/gtk-doc/html'
+@@ -11848,7 +11250,7 @@ fi
+
+
+ # Check whether --enable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then
++if test "${enable_gtk_doc+set}" = set; then :
+ enableval=$enable_gtk_doc;
+ else
+ enable_gtk_doc=no
+@@ -11857,33 +11259,31 @@ fi
+
+ if test x$enable_gtk_doc = xyes; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.12") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&5
+-$as_echo "$as_me: error: You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "You need to have gtk-doc >= 1.12 installed to build $PACKAGE_NAME" "$LINENO" 5
+ fi
+ fi
+
+- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
++ { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+ $as_echo "$enable_gtk_doc" >&6; }
+
+ # Check whether --enable-gtk-doc-html was given.
+-if test "${enable_gtk_doc_html+set}" = set; then
++if test "${enable_gtk_doc_html+set}" = set; then :
+ enableval=$enable_gtk_doc_html;
+ else
+ enable_gtk_doc_html=yes
+ fi
+
+ # Check whether --enable-gtk-doc-pdf was given.
+-if test "${enable_gtk_doc_pdf+set}" = set; then
++if test "${enable_gtk_doc_pdf+set}" = set; then :
+ enableval=$enable_gtk_doc_pdf;
+ else
+ enable_gtk_doc_pdf=no
+@@ -11941,7 +11341,7 @@ fi
+
+
+ # Check whether --enable-compile-warnings was given.
+-if test "${enable_compile_warnings+set}" = set; then
++if test "${enable_compile_warnings+set}" = set; then :
+ enableval=$enable_compile_warnings;
+ else
+ enable_compile_warnings="maximum"
+@@ -11972,13 +11372,9 @@ fi
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
+ $as_echo_n "checking whether gcc understands $option... " >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -11989,35 +11385,14 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ has_option=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- has_option=no
++ has_option=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$SAVE_CFLAGS"
+- { $as_echo "$as_me:$LINENO: result: $has_option" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
+ $as_echo "$has_option" >&6; }
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+@@ -12031,26 +11406,24 @@ $as_echo "$has_option" >&6; }
+ fi
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
+-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
+ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
+ $as_echo "$warning_flags" >&6; }
+
+ # Check whether --enable-iso-c was given.
+-if test "${enable_iso_c+set}" = set; then
++if test "${enable_iso_c+set}" = set; then :
+ enableval=$enable_iso_c;
+ else
+ enable_iso_c=no
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
+ $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+@@ -12065,7 +11438,7 @@ $as_echo_n "checking what language compl
+ esac
+ fi
+ fi
+- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
+ $as_echo "$complCFLAGS" >&6; }
+
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+@@ -12073,14 +11446,14 @@ $as_echo "$complCFLAGS" >&6; }
+
+
+ # Check whether --enable-cxx-warnings was given.
+-if test "${enable_cxx_warnings+set}" = set; then
++if test "${enable_cxx_warnings+set}" = set; then :
+ enableval=$enable_cxx_warnings;
+ else
+ enable_cxx_warnings="minimum"
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
+ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
+ warnCXXFLAGS=
+ if test "x$GXX" != xyes; then
+@@ -12100,18 +11473,18 @@ $as_echo_n "checking what warning flags
+ fi
+ fi
+ fi
+- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5
+ $as_echo "$warnCXXFLAGS" >&6; }
+
+ # Check whether --enable-iso-cxx was given.
+-if test "${enable_iso_cxx+set}" = set; then
++if test "${enable_iso_cxx+set}" = set; then :
+ enableval=$enable_iso_cxx;
+ else
+ enable_iso_cxx=no
+ fi
+
+
+- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5
+ $as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
+@@ -12127,7 +11500,7 @@ $as_echo_n "checking what language compl
+ esac
+ fi
+ fi
+- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5
+ $as_echo "$complCXXFLAGS" >&6; }
+
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+@@ -12158,9 +11531,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7488,7 +8455,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11694,24 +11068,24 @@ for as_dir in $PATH
+@@ -12171,24 +11544,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7518,7 +8485,7 @@
$as_echo "no" >&6; }
fi
-@@ -11721,9 +11095,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -12198,9 +11571,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -7530,7 +8497,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11734,24 +11108,24 @@ for as_dir in $PATH
+@@ -12211,24 +11584,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7560,7 +8527,7 @@
$as_echo "no" >&6; }
fi
-@@ -11760,7 +11134,7 @@ fi
+@@ -12237,7 +11610,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7569,7 +8536,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11774,9 +11148,9 @@ if test -z "$CC"; then
+@@ -12251,9 +11624,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -7581,7 +8548,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11787,24 +11161,24 @@ for as_dir in $PATH
+@@ -12264,24 +11637,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7611,7 +8578,7 @@
$as_echo "no" >&6; }
fi
-@@ -11814,9 +11188,9 @@ fi
+@@ -12291,9 +11664,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -7623,7 +8590,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11828,18 +11202,18 @@ for as_dir in $PATH
+@@ -12305,18 +11678,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7645,7 +8612,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11858,10 +11232,10 @@ fi
+@@ -12335,10 +11708,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7658,7 +8625,7 @@
$as_echo "no" >&6; }
fi
-@@ -11873,9 +11247,9 @@ if test -z "$CC"; then
+@@ -12350,9 +11723,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7670,7 +8637,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11886,24 +11260,24 @@ for as_dir in $PATH
+@@ -12363,24 +11736,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7700,7 +8667,7 @@
$as_echo "no" >&6; }
fi
-@@ -11917,9 +11291,9 @@ if test -z "$CC"; then
+@@ -12394,9 +11767,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7712,7 +8679,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11930,24 +11304,24 @@ for as_dir in $PATH
+@@ -12407,24 +11780,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7742,7 +8709,7 @@
$as_echo "no" >&6; }
fi
-@@ -11960,7 +11334,7 @@ done
+@@ -12437,7 +11810,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7751,7 +8718,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11971,62 +11345,42 @@ fi
+@@ -12448,62 +11821,42 @@ fi
fi
@@ -7783,6 +8750,17 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -v >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
@@ -7791,22 +8769,11 @@
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
+- (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
@@ -7836,7 +8803,7 @@
/* end confdefs.h. */
int
-@@ -12040,37 +11394,16 @@ main ()
+@@ -12517,37 +11870,16 @@ main ()
return 0;
}
_ACEOF
@@ -7877,7 +8844,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12079,20 +11412,16 @@ else
+@@ -12556,59 +11888,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7897,14 +8864,16 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -12103,35 +11432,11 @@ main ()
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -7923,9 +8892,8 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
- else
+- ac_cv_prog_cc_g=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -7935,15 +8903,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-@@ -12142,36 +11447,12 @@ main ()
- return 0;
- }
- _ACEOF
+@@ -12616,39 +11905,14 @@ main ()
+ {
+
+ ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -7966,22 +8936,25 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
+-
- ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
+- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ return 0;
++}
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
++else
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-@@ -12182,42 +11463,17 @@ main ()
+@@ -12659,42 +11923,33 @@ main ()
return 0;
}
_ACEOF
@@ -8003,13 +8976,27 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+- ac_cv_prog_cc_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--else
++
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
--
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_prog_cc_g=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8026,7 +9013,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12234,18 +11490,14 @@ else
+@@ -12711,18 +11966,14 @@ else
CFLAGS=
fi
fi
@@ -8048,7 +9035,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12302,32 +11554,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -12779,32 +12030,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8082,7 +9069,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12338,17 +11567,19 @@ fi
+@@ -12815,17 +12043,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8105,7 +9092,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12358,9 +11589,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12835,9 +12065,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8117,7 +9104,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12468,7 +11699,7 @@ else
+@@ -12945,7 +12175,7 @@ else
fi
fi
@@ -8126,7 +9113,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12483,16 +11714,12 @@ else
+@@ -12960,16 +12190,12 @@ else
fi
@@ -8146,7 +9133,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -12507,48 +11734,23 @@ main ()
+@@ -12984,48 +12210,23 @@ main ()
return 0;
}
_ACEOF
@@ -8200,7 +9187,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -12558,18 +11760,14 @@ fi
+@@ -13035,18 +12236,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8222,7 +9209,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -12579,14 +11777,10 @@ fi
+@@ -13056,14 +12253,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8239,10 +9226,18 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -12613,51 +11807,22 @@ main ()
- return 0;
- }
- _ACEOF
+@@ -13082,575 +12275,127 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+- int i;
+- for (i = 0; i < 256; i++)
+- if (XOR (islower (i), ISLOWER (i))
+- || toupper (i) != TOUPPER (i))
+- return 2;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8270,38 +9265,47 @@
- $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
-+if ac_fn_c_try_run "$LINENO"; then :
-
+-
-( exit $ac_status )
-ac_cv_header_stdc=no
-+else
-+ ac_cv_header_stdc=no
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
--
- fi
- fi
+-fi
+-
+-
+-fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
- $as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
-
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
-
-@@ -12681,499 +11846,80 @@ _ACEOF
-
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
+-
+-fi
+-
+-if test "x${datadir}" = 'x${prefix}/share'; then
+- if test "x${prefix}" = "xNONE"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
+-_ACEOF
+-
+- else
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_DATA_DIR "${prefix}/share/"
+-_ACEOF
+-
+- fi
+- elif test "x${datadir}" = 'x${datarootdir}'; then
+- if test "x${datarootdir}" = 'x${prefix}/share'; then
+- if test "x${prefix}" = "xNONE"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
-_ACEOF
-
- else
@@ -8533,9 +9537,14 @@
-if (sizeof ((sg_io_hdr_t)))
- return 0;
- ;
-- return 0;
--}
--_ACEOF
++ int i;
++ for (i = 0; i < 256; i++)
++ if (XOR (islower (i), ISLOWER (i))
++ || toupper (i) != TOUPPER (i))
++ return 2;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8558,34 +9567,53 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_run "$LINENO"; then :
+
- ac_cv_type_sg_io_hdr_t=yes
--fi
--
++else
++ ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 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
--
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
+
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_sg_io_hdr_t" >&5
-$as_echo "$ac_cv_type_sg_io_hdr_t" >&6; }
-if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
++if test "x${datadir}" = 'x${prefix}/share'; then
++ if test "x${prefix}" = "xNONE"; then
+
+ cat >>confdefs.h <<_ACEOF
-#define HAVE_SG_IO_HDR_T 1
--_ACEOF
--
++#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
+ _ACEOF
+
-has_sg="yes"
-else
- has_sg="no"
-fi
--
--
++ else
+
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${prefix}/share/"
++_ACEOF
+
-{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
-$as_echo_n "checking for scsireq_t... " >&6; }
-if test "${ac_cv_type_scsireq_t+set}" = set; then
@@ -8594,13 +9622,20 @@
- ac_cv_type_scsireq_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ fi
++ elif test "x${datadir}" = 'x${datarootdir}'; then
++ if test "x${datarootdir}" = 'x${prefix}/share'; then
++ if test "x${prefix}" = "xNONE"; then
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/scsiio.h>
--
+
-int
-main ()
-{
@@ -8609,7 +9644,11 @@
- ;
- return 0;
-}
--_ACEOF
++ else
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${prefix}/share/"
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8630,13 +9669,19 @@
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++
++ fi
++ else
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${datarootdir}/"
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/scsiio.h>
--
+
-int
-main ()
-{
@@ -8645,7 +9690,12 @@
- ;
- return 0;
-}
--_ACEOF
++ fi
++ else
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${datadir}/"
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8668,44 +9718,50 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_type_scsireq_t=yes
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++for ac_header in camlib.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "camlib.h" "ac_cv_header_camlib_h" "$ac_includes_default"
++if test "x$ac_cv_header_camlib_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CAMLIB_H 1
+_ACEOF
-
-- ac_cv_type_scsireq_t=yes
--fi
-+ else
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++ has_cam="yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATA_DIR "${prefix}/share/"
-+_ACEOF
-
-+ fi
-+ else
++ has_cam="no"
++fi
+
++done
-fi
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATA_DIR "${datarootdir}/"
-+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5
-$as_echo "$ac_cv_type_scsireq_t" >&6; }
-if test "x$ac_cv_type_scsireq_t" = x""yes; then
-+ fi
-+ else
++ac_fn_c_check_type "$LINENO" "sg_io_hdr_t" "ac_cv_type_sg_io_hdr_t" "#include <sys/types.h>
++ #include <scsi/sg.h>
++"
++if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_SCSIREQ_T 1
-+#define PACKAGE_DATA_DIR "${datadir}/"
++#define HAVE_SG_IO_HDR_T 1
_ACEOF
-has_scsiio="yes"
--else
++has_sg="yes"
+ else
- has_scsiio="no"
++ has_sg="no"
fi
@@ -8717,22 +9773,16 @@
- ac_cv_type_struct_uscsi_cmd=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+for ac_header in camlib.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "camlib.h" "ac_cv_header_camlib_h" "$ac_includes_default"
-+if test "x$ac_cv_header_camlib_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_CAMLIB_H 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/scsi/impl/uscsi.h>
-+ has_cam="yes"
-+else
-+ has_cam="no"
-+fi
++ac_fn_c_check_type "$LINENO" "scsireq_t" "ac_cv_type_scsireq_t" "#include <sys/types.h>
++ #include <sys/scsiio.h>
++"
++if test "x$ac_cv_type_scsireq_t" = x""yes; then :
-int
-main ()
@@ -8763,13 +9813,14 @@
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SCSIREQ_T 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/scsi/impl/uscsi.h>
-+done
-int
-main ()
@@ -8779,15 +9830,7 @@
- ;
- return 0;
-}
-+
-+ac_fn_c_check_type "$LINENO" "sg_io_hdr_t" "ac_cv_type_sg_io_hdr_t" "#include <sys/types.h>
-+ #include <scsi/sg.h>
-+"
-+if test "x$ac_cv_type_sg_io_hdr_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SG_IO_HDR_T 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8807,14 +9850,13 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
--else
++has_scsiio="yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
- ac_cv_type_struct_uscsi_cmd=yes
-+has_sg="yes"
-+else
-+ has_sg="no"
++ has_scsiio="no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8822,26 +9864,14 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ac_fn_c_check_type "$LINENO" "scsireq_t" "ac_cv_type_scsireq_t" "#include <sys/types.h>
-+ #include <sys/scsiio.h>
-+"
-+if test "x$ac_cv_type_scsireq_t" = x""yes; then :
-
+-
-fi
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SCSIREQ_T 1
-+_ACEOF
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+has_scsiio="yes"
-+else
-+ has_scsiio="no"
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_uscsi_cmd" >&5
-$as_echo "$ac_cv_type_struct_uscsi_cmd" >&6; }
-if test "x$ac_cv_type_struct_uscsi_cmd" = x""yes; then
-+
-+
+ac_fn_c_check_type "$LINENO" "struct uscsi_cmd" "ac_cv_type_struct_uscsi_cmd" "#include <sys/types.h>
+ #include <sys/scsi/impl/uscsi.h>
+"
@@ -8849,7 +9879,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_USCSI_CMD 1
-@@ -13194,9 +11940,7 @@ elif test x"$has_scsiio" = x"yes"; then
+@@ -13671,9 +12416,7 @@ elif test x"$has_scsiio" = x"yes"; then
elif test x"$has_uscsi" = x"yes"; then
:
else
@@ -8860,7 +9890,7 @@
fi
if test x"$has_cam" = "xyes"; then
-@@ -13234,15 +11978,15 @@ fi
+@@ -13711,15 +12454,15 @@ fi
# Check whether --enable-largefile was given.
@@ -8879,7 +9909,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -13251,11 +11995,7 @@ else
+@@ -13728,11 +12471,7 @@ else
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
@@ -8892,7 +9922,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13274,60 +12014,14 @@ main ()
+@@ -13751,60 +12490,14 @@ main ()
return 0;
}
_ACEOF
@@ -8955,7 +9985,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -13335,23 +12029,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13812,23 +12505,19 @@ rm -f core conftest.err conftest.$ac_obj
rm -f conftest.$ac_ext
fi
fi
@@ -8983,7 +10013,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13370,38 +12060,11 @@ main ()
+@@ -13847,38 +12536,11 @@ main ()
return 0;
}
_ACEOF
@@ -9024,10 +10054,21 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -13421,38 +12084,15 @@ main ()
- return 0;
- }
- _ACEOF
+@@ -13887,49 +12549,26 @@ cat >>conftest.$ac_ext <<_ACEOF
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+- && LARGE_OFF_T % 2147483647 == 1)
+- ? 1 : -1];
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9046,13 +10087,24 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=64; break
+- ac_cv_sys_file_offset_bits=64; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++ && LARGE_OFF_T % 2147483647 == 1)
++ ? 1 : -1];
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ ac_cv_sys_file_offset_bits=64; break
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9065,7 +10117,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -13464,17 +12104,13 @@ _ACEOF
+@@ -13941,17 +12580,13 @@ _ACEOF
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -9086,7 +10138,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13493,38 +12129,11 @@ main ()
+@@ -13970,38 +12605,11 @@ main ()
return 0;
}
_ACEOF
@@ -9127,7 +10179,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -13544,38 +12153,15 @@ main ()
+@@ -14021,38 +12629,15 @@ main ()
return 0;
}
_ACEOF
@@ -9168,379 +10220,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -13609,9 +12195,9 @@ 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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $PKG_CONFIG in
-@@ -13624,14 +12210,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -13639,10 +12225,10 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -13652,9 +12238,9 @@ 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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $ac_pt_PKG_CONFIG in
-@@ -13667,14 +12253,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -13682,10 +12268,10 @@ esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -13694,7 +12280,7 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -13707,13 +12293,13 @@ fi
- fi
- if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
-- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-@@ -13723,9 +12309,9 @@ fi
-
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_CHECK in
-@@ -13738,14 +12324,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -13753,10 +12339,10 @@ esac
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
- $as_echo "$GTKDOC_CHECK" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -13765,9 +12351,9 @@ fi
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_REBASE in
-@@ -13780,14 +12366,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -13795,10 +12381,10 @@ esac
- fi
- GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
- if test -n "$GTKDOC_REBASE"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
- $as_echo "$GTKDOC_REBASE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -13809,9 +12395,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
-
- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
- set dummy gtkdoc-mkpdf; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_MKPDF in
-@@ -13824,14 +12410,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -13839,10 +12425,10 @@ esac
- fi
- GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
- if test -n "$GTKDOC_MKPDF"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
- $as_echo "$GTKDOC_MKPDF" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -13850,7 +12436,7 @@ fi
-
-
- # Check whether --with-html-dir was given.
--if test "${with_html_dir+set}" = set; then
-+if test "${with_html_dir+set}" = set; then :
- withval=$with_html_dir;
- else
- with_html_dir='${datadir}/gtk-doc/html'
-@@ -13860,7 +12446,7 @@ fi
-
-
- # Check whether --enable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then
-+if test "${enable_gtk_doc+set}" = set; then :
- enableval=$enable_gtk_doc;
- else
- enable_gtk_doc=no
-@@ -13869,33 +12455,31 @@ fi
-
- if test x$enable_gtk_doc = xyes; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.3\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.3") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.3 installed to build $PACKAGE_NAME" >&5
--$as_echo "$as_me: error: You need to have gtk-doc >= 1.3 installed to build $PACKAGE_NAME" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.3 installed to build $PACKAGE_NAME" "$LINENO" 5
- fi
- fi
-
-- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
-+ { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
- $as_echo "$enable_gtk_doc" >&6; }
-
- # Check whether --enable-gtk-doc-html was given.
--if test "${enable_gtk_doc_html+set}" = set; then
-+if test "${enable_gtk_doc_html+set}" = set; then :
- enableval=$enable_gtk_doc_html;
- else
- enable_gtk_doc_html=yes
- fi
-
- # Check whether --enable-gtk-doc-pdf was given.
--if test "${enable_gtk_doc_pdf+set}" = set; then
-+if test "${enable_gtk_doc_pdf+set}" = set; then :
- enableval=$enable_gtk_doc_pdf;
- else
- enable_gtk_doc_pdf=no
-@@ -13951,35 +12535,33 @@ fi
-
- gdu_cv_version_required=0.3.2
-
--{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
- $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- gdu_cv_have_gdu=yes
- else
- gdu_cv_have_gdu=no
- fi
-
- if test "$gdu_cv_have_gdu" = "yes"; then
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- :
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
--$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
- fi
-
-
-
- # Check whether --with-help-dir was given.
--if test "${with_help_dir+set}" = set; then
-+if test "${with_help_dir+set}" = set; then :
- withval=$with_help_dir;
- else
- with_help_dir='${datadir}/gnome/help'
-@@ -13990,7 +12572,7 @@ HELP_DIR="$with_help_dir"
-
-
- # Check whether --with-omf-dir was given.
--if test "${with_omf_dir+set}" = set; then
-+if test "${with_omf_dir+set}" = set; then :
- withval=$with_omf_dir;
- else
- with_omf_dir='${datadir}/omf'
-@@ -14001,7 +12583,7 @@ OMF_DIR="$with_omf_dir"
-
-
- # Check whether --with-help-formats was given.
--if test "${with_help_formats+set}" = set; then
-+if test "${with_help_formats+set}" = set; then :
- withval=$with_help_formats;
- else
- with_help_formats=''
-@@ -14011,7 +12593,7 @@ DOC_USER_FORMATS="$with_help_formats"
-
-
- # Check whether --enable-scrollkeeper was given.
--if test "${enable_scrollkeeper+set}" = set; then
-+if test "${enable_scrollkeeper+set}" = set; then :
- enableval=$enable_scrollkeeper;
- else
- enable_scrollkeeper=yes
-@@ -14042,24 +12624,25 @@ fi
+@@ -14084,24 +12669,25 @@ CANBERRA_REQUIRED=0.1
pkg_failed=no
@@ -9575,7 +10255,7 @@
pkg_cv_BRASERO_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "\
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
-@@ -14067,24 +12650,26 @@ if test -n "$BRASERO_GSTREAMER_CFLAGS";
+@@ -14109,24 +12695,26 @@ if test -n "$BRASERO_GSTREAMER_CFLAGS";
else
pkg_failed=yes
fi
@@ -9612,7 +10292,7 @@
pkg_cv_BRASERO_GSTREAMER_LIBS=`$PKG_CONFIG --libs "\
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
-@@ -14092,8 +12677,9 @@ if test -n "$BRASERO_GSTREAMER_LIBS"; th
+@@ -14134,8 +12722,9 @@ if test -n "$BRASERO_GSTREAMER_LIBS"; th
else
pkg_failed=yes
fi
@@ -9624,7 +10304,7 @@
fi
-@@ -14106,34 +12692,20 @@ else
+@@ -14148,34 +12737,20 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9664,7 +10344,7 @@
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
-@@ -14146,22 +12718,11 @@ installed software in a non-standard pre
+@@ -14188,22 +12763,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GSTREAMER_CFLAGS
and BRASERO_GSTREAMER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9690,7 +10370,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14170,12 +12731,11 @@ and BRASERO_GSTREAMER_LIBS to avoid the
+@@ -14212,12 +12776,11 @@ and BRASERO_GSTREAMER_LIBS to avoid the
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -9705,7 +10385,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14187,46 +12747,50 @@ BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAM
+@@ -14229,46 +12792,50 @@ BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAM
pkg_failed=no
@@ -9777,7 +10457,7 @@
fi
-@@ -14239,28 +12803,16 @@ else
+@@ -14281,28 +12848,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9793,7 +10473,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$BRASERO_GIO_PKG_ERRORS" >&5
--
+
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
- gio-2.0 >= $GIO_REQUIRED) were not met:
-
@@ -9807,12 +10487,11 @@
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (\
-+
+ as_fn_error "Package requirements (\
gio-2.0 >= $GIO_REQUIRED) were not met:
$BRASERO_GIO_PKG_ERRORS
-@@ -14271,22 +12823,11 @@ installed software in a non-standard pre
+@@ -14313,12 +12868,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GIO_CFLAGS
and BRASERO_GIO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9824,6 +10503,16 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -14327,22 +12881,11 @@ and BRASERO_GIO_LIBS to avoid the need t
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -9832,16 +10521,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -14295,12 +12836,11 @@ and BRASERO_GIO_LIBS to avoid the need t
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -9853,7 +10532,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14310,46 +12850,50 @@ fi
+@@ -14352,46 +12895,50 @@ fi
pkg_failed=no
@@ -9925,7 +10604,7 @@
fi
-@@ -14362,28 +12906,16 @@ else
+@@ -14404,28 +12951,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9959,7 +10638,7 @@
libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
$BRASERO_LIBXML_PKG_ERRORS
-@@ -14394,22 +12926,11 @@ installed software in a non-standard pre
+@@ -14436,22 +12971,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_LIBXML_CFLAGS
and BRASERO_LIBXML_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9985,7 +10664,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14418,12 +12939,11 @@ and BRASERO_LIBXML_LIBS to avoid the nee
+@@ -14460,12 +12984,11 @@ and BRASERO_LIBXML_LIBS to avoid the nee
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10000,7 +10679,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14433,46 +12953,50 @@ fi
+@@ -14475,46 +12998,50 @@ fi
pkg_failed=no
@@ -10072,7 +10751,7 @@
fi
-@@ -14485,28 +13009,16 @@ else
+@@ -14527,28 +13054,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10106,7 +10785,7 @@
unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
$BRASERO_LIBUNIQUE_PKG_ERRORS
-@@ -14517,22 +13029,11 @@ installed software in a non-standard pre
+@@ -14559,22 +13074,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -10132,7 +10811,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14541,12 +13042,11 @@ and BRASERO_LIBUNIQUE_LIBS to avoid the
+@@ -14583,12 +13087,11 @@ and BRASERO_LIBUNIQUE_LIBS to avoid the
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10147,7 +10826,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14556,46 +13056,50 @@ fi
+@@ -14598,46 +13101,50 @@ fi
pkg_failed=no
@@ -10219,7 +10898,7 @@
fi
-@@ -14608,28 +13112,16 @@ else
+@@ -14650,16 +13157,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10237,6 +10916,16 @@
echo "$BRASERO_GTHREAD_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
++ as_fn_error "Package requirements (\
+ gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
+
+ $BRASERO_GTHREAD_PKG_ERRORS
+@@ -14670,34 +13177,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
+ and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (\
- gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
-
-$BRASERO_GTHREAD_PKG_ERRORS
@@ -10247,16 +10936,6 @@
-Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
-and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (\
-+ as_fn_error "Package requirements (\
- gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
-
- $BRASERO_GTHREAD_PKG_ERRORS
-@@ -14640,22 +13132,11 @@ installed software in a non-standard pre
- Alternatively, you may set the environment variables BRASERO_GTHREAD_CFLAGS
- and BRASERO_GTHREAD_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -10279,7 +10958,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14664,12 +13145,11 @@ and BRASERO_GTHREAD_LIBS to avoid the ne
+@@ -14706,12 +13190,11 @@ and BRASERO_GTHREAD_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10294,7 +10973,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14679,52 +13159,56 @@ fi
+@@ -14721,52 +13204,56 @@ fi
pkg_failed=no
@@ -10372,7 +11051,7 @@
fi
-@@ -14737,31 +13221,18 @@ else
+@@ -14779,31 +13266,18 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10409,7 +11088,7 @@
gobject-2.0 >= $GLIB_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED) were not met:
-@@ -14773,22 +13244,11 @@ installed software in a non-standard pre
+@@ -14815,22 +13289,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GLIB_CFLAGS
and BRASERO_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -10435,7 +11114,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14797,12 +13257,11 @@ and BRASERO_GLIB_LIBS to avoid the need
+@@ -14839,12 +13302,11 @@ and BRASERO_GLIB_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10450,7 +11129,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14812,46 +13271,50 @@ fi
+@@ -14854,46 +13316,50 @@ fi
pkg_failed=no
@@ -10522,7 +11201,7 @@
fi
-@@ -14864,28 +13327,16 @@ else
+@@ -14906,28 +13372,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10556,7 +11235,7 @@
gconf-2.0 >= $GCONF_REQUIRED) were not met:
$BRASERO_GCONF_PKG_ERRORS
-@@ -14896,22 +13347,11 @@ installed software in a non-standard pre
+@@ -14938,22 +13392,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GCONF_CFLAGS
and BRASERO_GCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -10582,7 +11261,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14920,12 +13360,11 @@ and BRASERO_GCONF_LIBS to avoid the need
+@@ -14962,12 +13405,11 @@ and BRASERO_GCONF_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10597,7 +11276,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14935,46 +13374,50 @@ fi
+@@ -14977,46 +13419,50 @@ fi
pkg_failed=no
@@ -10669,7 +11348,7 @@
fi
-@@ -14987,16 +13430,16 @@ else
+@@ -15029,28 +13475,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10687,26 +11366,26 @@
echo "$BRASERO_GMODULE_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
+- gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
+-
+-$BRASERO_GMODULE_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
+-and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (\
+ as_fn_error "Package requirements (\
gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
$BRASERO_GMODULE_PKG_ERRORS
-@@ -15007,34 +13450,11 @@ installed software in a non-standard pre
+@@ -15061,22 +13495,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (\
-- gmodule-2.0 >= $GMODULE_REQUIRED) were not met:
--
--$BRASERO_GMODULE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables BRASERO_GMODULE_CFLAGS
--and BRASERO_GMODULE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -10729,7 +11408,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15043,12 +13463,11 @@ and BRASERO_GMODULE_LIBS to avoid the ne
+@@ -15085,12 +13508,11 @@ and BRASERO_GMODULE_LIBS to avoid the ne
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10744,7 +11423,154 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15058,52 +13477,56 @@ fi
+@@ -15100,46 +13522,50 @@ fi
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_GMODULE_EXPORT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_GMODULE_EXPORT" >&5
+ $as_echo_n "checking for BRASERO_GMODULE_EXPORT... " >&6; }
+
+-if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
+- pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_GMODULE_EXPORT_CFLAGS"; then
++ pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS="$BRASERO_GMODULE_EXPORT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
++ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS=`$PKG_CONFIG --cflags "\
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
+- pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+- gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_GMODULE_EXPORT_LIBS"; then
++ pkg_cv_BRASERO_GMODULE_EXPORT_LIBS="$BRASERO_GMODULE_EXPORT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
++ gmodule-export-2.0 >= \$GMODULE_EXPORT_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_GMODULE_EXPORT_LIBS=`$PKG_CONFIG --libs "\
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15152,28 +13578,16 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
+- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
++ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
++ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
+ else
+- BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
+- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED" 2>&1`
++ BRASERO_GMODULE_EXPORT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
++ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_GMODULE_EXPORT_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
+- gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
+-
+-$BRASERO_GMODULE_EXPORT_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
+-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (\
++ as_fn_error "Package requirements (\
+ gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED) were not met:
+
+ $BRASERO_GMODULE_EXPORT_PKG_ERRORS
+@@ -15184,22 +13598,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
+ and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BRASERO_GMODULE_EXPORT_CFLAGS
+-and BRASERO_GMODULE_EXPORT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -15208,12 +13611,11 @@ and BRASERO_GMODULE_EXPORT_LIBS to avoid
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ BRASERO_GMODULE_EXPORT_CFLAGS=$pkg_cv_BRASERO_GMODULE_EXPORT_CFLAGS
+ BRASERO_GMODULE_EXPORT_LIBS=$pkg_cv_BRASERO_GMODULE_EXPORT_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -15223,52 +13625,56 @@ fi
pkg_failed=no
@@ -10822,7 +11648,7 @@
fi
-@@ -15116,31 +13539,18 @@ else
+@@ -15281,31 +13687,18 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10859,7 +11685,7 @@
gdk-2.0 >= $GDK_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED) were not met:
-@@ -15152,22 +13562,11 @@ installed software in a non-standard pre
+@@ -15317,22 +13710,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_GTK_CFLAGS
and BRASERO_GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -10885,7 +11711,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15176,12 +13575,11 @@ and BRASERO_GTK_LIBS to avoid the need t
+@@ -15341,12 +13723,11 @@ and BRASERO_GTK_LIBS to avoid the need t
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -10900,7 +11726,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15191,46 +13589,50 @@ fi
+@@ -15356,46 +13737,50 @@ fi
pkg_failed=no
@@ -10972,7 +11798,7 @@
fi
-@@ -15243,28 +13645,16 @@ else
+@@ -15408,28 +13793,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11006,7 +11832,7 @@
dbus-glib-1 >= $DBUS_REQUIRED) were not met:
$BRASERO_DBUS_PKG_ERRORS
-@@ -15275,22 +13665,11 @@ installed software in a non-standard pre
+@@ -15440,12 +13813,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_DBUS_CFLAGS
and BRASERO_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11018,6 +11844,16 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -15454,22 +13826,11 @@ and BRASERO_DBUS_LIBS to avoid the need
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -11026,16 +11862,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -15299,12 +13678,11 @@ and BRASERO_DBUS_LIBS to avoid the need
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -11047,7 +11873,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15314,46 +13692,50 @@ fi
+@@ -15479,46 +13840,50 @@ fi
pkg_failed=no
@@ -11123,20 +11949,23 @@
fi
-@@ -15365,30 +13747,18 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
- else
+@@ -15531,29 +13896,17 @@ else
_pkg_short_errors_supported=no
fi
-- if test $_pkg_short_errors_supported = yes; then
+ if test $_pkg_short_errors_supported = yes; then
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
- sm" 2>&1`
-- else
++ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
++ ice sm"`
+ else
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
- sm" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$BRASERO_SM_PKG_ERRORS" >&5
--
++ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
++ ice sm"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_SM_PKG_ERRORS" >&5
+
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
- sm) were not met:
-
@@ -11144,16 +11973,7 @@
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-+ if test $_pkg_short_errors_supported = yes; then
-+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-+ ice sm"`
-+ else
-+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-+ ice sm"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$BRASERO_SM_PKG_ERRORS" >&5
-
+-
-Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
-and BRASERO_SM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
@@ -11165,7 +11985,7 @@
$BRASERO_SM_PKG_ERRORS
-@@ -15398,22 +13768,11 @@ installed software in a non-standard pre
+@@ -15563,22 +13916,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables BRASERO_SM_CFLAGS
and BRASERO_SM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -11191,7 +12011,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15422,12 +13781,11 @@ and BRASERO_SM_LIBS to avoid the need to
+@@ -15587,12 +13929,11 @@ and BRASERO_SM_LIBS to avoid the need to
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11206,7 +12026,163 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15438,7 +13796,7 @@ fi
+@@ -15602,52 +13943,56 @@ fi
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_CANBERRA" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_CANBERRA" >&5
+ $as_echo_n "checking for BRASERO_CANBERRA... " >&6; }
+
+-if test -n "$BRASERO_CANBERRA_CFLAGS"; then
+- pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_CANBERRA_CFLAGS"; then
++ pkg_cv_BRASERO_CANBERRA_CFLAGS="$BRASERO_CANBERRA_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+ libcanberra >= \$CANBERRA_REQUIRED \\
+- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
++ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ libcanberra >= $CANBERRA_REQUIRED \
+ libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_CANBERRA_CFLAGS=`$PKG_CONFIG --cflags "\
+ libcanberra >= $CANBERRA_REQUIRED \
+ libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BRASERO_CANBERRA_LIBS"; then
+- pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_CANBERRA_LIBS"; then
++ pkg_cv_BRASERO_CANBERRA_LIBS="$BRASERO_CANBERRA_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
+ libcanberra >= \$CANBERRA_REQUIRED \\
+- libcanberra-gtk >= \$CANBERRA_REQUIRED\"") >&5
++ libcanberra-gtk >= \$CANBERRA_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ libcanberra >= $CANBERRA_REQUIRED \
+ libcanberra-gtk >= $CANBERRA_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_CANBERRA_LIBS=`$PKG_CONFIG --libs "\
+ libcanberra >= $CANBERRA_REQUIRED \
+ libcanberra-gtk >= $CANBERRA_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15660,31 +14005,18 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
++ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
+ libcanberra >= $CANBERRA_REQUIRED \
+- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
++ libcanberra-gtk >= $CANBERRA_REQUIRED"`
+ else
+- BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
++ BRASERO_CANBERRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
+ libcanberra >= $CANBERRA_REQUIRED \
+- libcanberra-gtk >= $CANBERRA_REQUIRED" 2>&1`
++ libcanberra-gtk >= $CANBERRA_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_CANBERRA_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
+- libcanberra >= $CANBERRA_REQUIRED \
+- libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
+-
+-$BRASERO_CANBERRA_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
+-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (\
++ as_fn_error "Package requirements (\
+ libcanberra >= $CANBERRA_REQUIRED \
+ libcanberra-gtk >= $CANBERRA_REQUIRED) were not met:
+
+@@ -15696,22 +14028,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
+ and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BRASERO_CANBERRA_CFLAGS
+-and BRASERO_CANBERRA_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -15720,12 +14041,11 @@ and BRASERO_CANBERRA_LIBS to avoid the n
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ BRASERO_CANBERRA_CFLAGS=$pkg_cv_BRASERO_CANBERRA_CFLAGS
+ BRASERO_CANBERRA_LIBS=$pkg_cv_BRASERO_CANBERRA_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+@@ -15736,7 +14056,7 @@ fi
NAUTILUS_REQUIRED=2.22.2
# Check whether --enable-nautilus was given.
@@ -11215,7 +12191,7 @@
enableval=$enable_nautilus; enable_nautilus=$enableval
else
enable_nautilus="yes"
-@@ -15447,7 +13805,7 @@ fi
+@@ -15745,7 +14065,7 @@ fi
# Check whether --with-nautilusdir was given.
@@ -11224,7 +12200,7 @@
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
else
ac_with_nautilusdir=""
-@@ -15457,40 +13815,44 @@ fi
+@@ -15755,40 +14075,44 @@ fi
if test x"$enable_nautilus" = "xyes"; then
pkg_failed=no
@@ -11288,7 +12264,7 @@
fi
-@@ -15503,14 +13865,14 @@ else
+@@ -15801,183 +14125,49 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11306,26 +12282,32 @@
$as_echo "no" >&6; }
build_nautilus=no
elif test $pkg_failed = untried; then
-@@ -15518,7 +13880,7 @@ elif test $pkg_failed = untried; then
- else
- NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
- NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
+ build_nautilus=no
+ else
+- NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
+- NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- build_nautilus=yes
- fi
-@@ -15534,152 +13896,18 @@ if test x"$build_nautilus" = "xyes"; the
- ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
- fi
-
+-$as_echo "yes" >&6; }
+- build_nautilus=yes
+-fi
+-else
+- build_nautilus="no"
+-fi
+-
+-if test x"$build_nautilus" = "xyes"; then
+- NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
+- NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
+-
+- if test "${ac_with_nautilusdir}" = ""; then
+- ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+- fi
+-
- { $as_echo "$as_me:$LINENO: installing plugin in ${ac_with_nautilusdir}" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: installing plugin in ${ac_with_nautilusdir}" >&5
- $as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
- NAUTILUSDIR=${ac_with_nautilusdir}
-
-
-
+-$as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
+- NAUTILUSDIR=${ac_with_nautilusdir}
+-
+-
+-
-
-for ac_header in locale.h
-do
@@ -11417,12 +12399,23 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
--fi
--
++ NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
++ NAUTILUS_EXTENSION_LIBS=$pkg_cv_NAUTILUS_EXTENSION_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ build_nautilus=yes
++fi
++else
++ build_nautilus="no"
+ fi
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
++if test x"$build_nautilus" = "xyes"; then
++ NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
++ NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -11445,7 +12438,10 @@
-$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;}
--
++ if test "${ac_with_nautilusdir}" = ""; then
++ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
++ fi
+
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -11459,11 +12455,16 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
++ { $as_echo "$as_me:${as_lineno-$LINENO}: installing plugin in ${ac_with_nautilusdir}" >&5
++$as_echo "$as_me: installing plugin in ${ac_with_nautilusdir}" >&6;}
++ NAUTILUSDIR=${ac_with_nautilusdir}
+
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++
+ for ac_header in locale.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -11474,7 +12475,7 @@
_ACEOF
fi
-@@ -15687,16 +13915,12 @@ fi
+@@ -15985,16 +14175,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -11494,7 +12495,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -15707,46 +13931,19 @@ return LC_MESSAGES
+@@ -16005,46 +14191,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -11547,7 +12548,7 @@
fi
fi
-@@ -15759,150 +13956,20 @@ _ACEOF
+@@ -16057,150 +14216,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -11703,7 +12704,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -15915,201 +13982,57 @@ return !ngettext ("","", 1)
+@@ -16213,54 +14242,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -11751,213 +12752,22 @@
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--$as_echo_n "checking for dgettext in libc... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$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
-- $as_echo_n "(cached) " >&6
--else
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include <libintl.h>
--
--int
--main ()
--{
--return !dgettext ("","")
-- ;
-- 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
-- gt_cv_func_dgettext_libc=yes
--else
-- $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
--{ $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=`$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
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* 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 $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+ { $as_echo "$as_me:${as_lineno-$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 :
-+ $as_echo_n "(cached) " >&6
-+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <libintl.h>
-
- int
- main ()
- {
--return $ac_func ();
-+return !dgettext ("","")
- ;
- 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
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gt_cv_func_dgettext_libc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ gt_cv_func_dgettext_libc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
--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 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$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 :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -16124,18 +14047,14 @@ done
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -16153,55 +14072,26 @@ return bindtextdomain ();
+ #include <libintl.h>
+@@ -16273,141 +14273,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -11983,13 +12793,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
+ gt_cv_func_dgettext_libc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_intl_bindtextdomain=no
-+ ac_cv_lib_intl_bindtextdomain=no
+- gt_cv_func_dgettext_libc=no
++ gt_cv_func_dgettext_libc=no
fi
-
-rm -rf conftest.dSYM
@@ -11997,293 +12807,14 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16219,55 +14109,26 @@ return ngettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16285,43 +14146,18 @@ return dgettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dgettext=no
-+ 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -16331,22 +14167,18 @@ fi
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+ { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16364,55 +14196,26 @@ return ngettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$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
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -16430,43 +14233,18 @@ return dcgettext ();
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dcgettext=no
-+ 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
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -16488,102 +14266,12 @@ fi
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++{ $as_echo "$as_me:${as_lineno-$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
@@ -12378,7 +12909,7 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
++ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
@@ -12388,42 +12919,375 @@
_ACEOF
fi
-@@ -16613,15 +14301,13 @@ done
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
+@@ -16422,18 +14307,14 @@ done
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$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
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
-_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16451,55 +14332,26 @@ return bindtextdomain ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_bindtextdomain=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_bindtextdomain=no
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$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
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case "$MSGFMT" in
-@@ -16646,118 +14332,28 @@ esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- if test "$MSGFMT" != "no"; then
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16517,55 +14369,26 @@ return ngettext ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$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
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16574,52 +14397,27 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char dgettext ();
+-int
+-main ()
+-{
+-return dgettext ();
+- ;
+- 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
++char dgettext ();
++int
++main ()
++{
++return dgettext ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dgettext=no
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -16629,22 +14427,18 @@ fi
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++ { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$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
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16662,55 +14456,26 @@ return ngettext ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$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
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16728,43 +14493,18 @@ return dcgettext ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dcgettext=no
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -16786,102 +14526,12 @@ fi
glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
+-
+-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -12516,122 +13380,100 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in dcgettext
++ for ac_func in bind_textdomain_codeset
+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
fi
- done
-
- MSGFMT_OPTS=
-- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-@@ -16772,14 +14368,14 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--else { $as_echo "$as_me:$LINENO: result: no" >&5
-+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- echo "$as_me: failed input was:" >&5
- sed 's/^/| /' conftest.foo >&5
-@@ -16787,9 +14383,9 @@ fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
+@@ -16911,15 +14561,13 @@ done
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case $GMSGFMT in
-@@ -16802,14 +14398,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -16818,19 +14414,19 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
+ case "$MSGFMT" in
+@@ -16944,118 +14592,28 @@ esac
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-
-
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$XGETTEXT" in
-@@ -16854,145 +14450,34 @@ else
- esac
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
--if test "$XGETTEXT" != ":"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
+-do
+-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
+- $as_echo_n "(cached) " >&6
-else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* 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 $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
-
-int
-main ()
-{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
+-return $ac_func ();
- ;
- return 0;
-}
@@ -12657,70 +13499,140 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- CATOBJEXT=.gmo
-- DATADIRNAME=share
-+if test "$XGETTEXT" != ":"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
- else
+- eval "$as_ac_var=yes"
+-else
- $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 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++ for ac_func in dcgettext
++do :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DCGETTEXT 1
+ _ACEOF
+
+ fi
+ done
+
+ MSGFMT_OPTS=
+- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+ $as_echo_n "checking if msgfmt accepts -c... " >&6; }
+ cat >conftest.foo <<_ACEOF
+
+@@ -17070,14 +14628,14 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+@@ -17085,9 +14643,9 @@ fi
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -17100,14 +14658,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -17116,19 +14674,19 @@ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
+ $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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -17153,18 +14711,14 @@ esac
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
int
- main ()
- {
--return bind_textdomain_codeset ();
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
+@@ -17176,121 +14730,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -12745,11 +13657,89 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return bind_textdomain_codeset ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
- ac_cv_func_bind_textdomain_codeset=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -12763,14 +13753,12 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ case $host in
-+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -17007,10 +14492,8 @@ fi
+@@ -17305,10 +14752,8 @@ fi
;;
esac
fi
@@ -12783,7 +13771,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -17024,9 +14507,7 @@ fi
+@@ -17322,9 +14767,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -12794,7 +13782,7 @@
fi
-@@ -17034,7 +14515,7 @@ _ACEOF
+@@ -17332,7 +14775,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -12803,7 +13791,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -17067,7 +14548,7 @@ $as_echo "found xgettext program is not
+@@ -17365,7 +14808,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -12812,7 +13800,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -17092,7 +14573,7 @@ $as_echo_n "checking for catalogs to be
+@@ -17390,7 +14833,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -12821,7 +13809,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -17159,7 +14640,7 @@ LIBBURN_REQUIRED=0.4.0
+@@ -17457,7 +14900,7 @@ LIBBURN_REQUIRED=0.4.0
LIBISOFS_REQUIRED=0.6.4
# Check whether --enable-libburnia was given.
@@ -12830,7 +13818,7 @@
enableval=$enable_libburnia; enable_libburnia=$enableval
else
enable_libburnia="yes"
-@@ -17169,40 +14650,44 @@ fi
+@@ -17467,40 +14910,44 @@ fi
if test x"$enable_libburnia" = "xyes"; then
pkg_failed=no
@@ -12894,7 +13882,7 @@
fi
-@@ -17215,14 +14700,14 @@ else
+@@ -17513,14 +14960,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12912,7 +13900,7 @@
$as_echo "no" >&6; }
build_libburnia=no
elif test $pkg_failed = untried; then
-@@ -17230,7 +14715,7 @@ elif test $pkg_failed = untried; then
+@@ -17528,7 +14975,7 @@ elif test $pkg_failed = untried; then
else
LIBBURNIA_CFLAGS=$pkg_cv_LIBBURNIA_CFLAGS
LIBBURNIA_LIBS=$pkg_cv_LIBBURNIA_LIBS
@@ -12921,7 +13909,7 @@
$as_echo "yes" >&6; }
build_libburnia=yes
fi
-@@ -17245,9 +14730,7 @@ if test x"$build_libburnia" = "xyes"; th
+@@ -17543,9 +14990,7 @@ if test x"$build_libburnia" = "xyes"; th
BRASERO_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
BRASERO_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
@@ -12932,7 +13920,7 @@
fi
if test x"$build_libburnia" = "xyes"; then
-@@ -17260,7 +14743,7 @@ fi
+@@ -17558,7 +15003,7 @@ fi
# Check whether --enable-cdrtools was given.
@@ -12941,7 +13929,7 @@
enableval=$enable_cdrtools; build_cdrtools=$enableval
else
build_cdrtools="yes"
-@@ -17269,9 +14752,7 @@ fi
+@@ -17567,9 +15012,7 @@ fi
if test x"$build_cdrtools" = "xyes"; then
@@ -12952,7 +13940,27 @@
else
build_cdrtools="no"
-@@ -17286,7 +14767,7 @@ fi
+@@ -17584,7 +15027,7 @@ fi
+
+
+ # Check whether --enable-cdrdao was given.
+-if test "${enable_cdrdao+set}" = set; then
++if test "${enable_cdrdao+set}" = set; then :
+ enableval=$enable_cdrdao; build_cdrdao=$enableval
+ else
+ build_cdrdao="yes"
+@@ -17593,9 +15036,7 @@ fi
+
+ if test x"$build_cdrdao" = "xyes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_CDRDAO 1
+-_ACEOF
++$as_echo "#define BUILD_CDRDAO 1" >>confdefs.h
+
+ else
+ build_cdrdao="no"
+@@ -17610,7 +15051,7 @@ fi
# Check whether --enable-cdrkit was given.
@@ -12961,7 +13969,7 @@
enableval=$enable_cdrkit; build_cdrkit=$enableval
else
build_cdrkit="yes"
-@@ -17295,9 +14776,7 @@ fi
+@@ -17619,9 +15060,7 @@ fi
if test x"$build_cdrkit" = "xyes"; then
@@ -12972,31 +13980,199 @@
else
build_cdrkit="no"
-@@ -17318,7 +14797,7 @@ fi
- BEAGLE_REQUIRED=0.3.0
+@@ -17636,7 +15075,7 @@ fi
+
+
+ # Check whether --enable-growisofs was given.
+-if test "${enable_growisofs+set}" = set; then
++if test "${enable_growisofs+set}" = set; then :
+ enableval=$enable_growisofs; build_growisofs=$enableval
+ else
+ build_growisofs="yes"
+@@ -17645,9 +15084,7 @@ fi
+
+ if test x"$build_growisofs" = "xyes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_GROWISOFS 1
+-_ACEOF
++$as_echo "#define BUILD_GROWISOFS 1" >>confdefs.h
+
+ else
+ build_growisofs="no"
+@@ -17669,7 +15106,7 @@ BEAGLE_REQUIRED=0.3.0
+ TRACKER_REQUIRED=0.8.0
# Check whether --enable-search was given.
-if test "${enable_search+set}" = set; then
+if test "${enable_search+set}" = set; then :
- enableval=$enable_search; enable_search=$enableval
- else
- enable_search="yes"
-@@ -17328,40 +14807,44 @@ fi
- if test x"$enable_search" = "xyes"; then
+ enableval=$enable_search; case "$enableval" in
+ "auto") enable_search="yes" ;;
+ "yes") enable_search="yes" ;;
+@@ -17686,40 +15123,44 @@ fi
+ if test x"$enable_search" = "xtracker"; then
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BRASERO_BEAGLE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_BEAGLE" >&5
- $as_echo_n "checking for BRASERO_BEAGLE... " >&6; }
-
--if test -n "$BRASERO_BEAGLE_CFLAGS"; then
-- pkg_cv_BRASERO_BEAGLE_CFLAGS="$BRASERO_BEAGLE_CFLAGS"
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
+ $as_echo_n "checking for BRASERO_SEARCH... " >&6; }
+
+-if test -n "$BRASERO_SEARCH_CFLAGS"; then
+- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_CFLAGS"; then
++ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BRASERO_SEARCH_LIBS"; then
+- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_LIBS"; then
++ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -17732,25 +15173,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
+ else
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
+-
+-$BRASERO_SEARCH_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
++ as_fn_error "Package requirements (tracker-client-0.8 >= $TRACKER_REQUIRED) were not met:
+
+ $BRASERO_SEARCH_PKG_ERRORS
+
+@@ -17760,22 +15190,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+ and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -17784,24 +15203,19 @@ and BRASERO_SEARCH_LIBS to avoid the nee
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
+ BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_SEARCH 1
+-_ACEOF
++$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_TRACKER 1
+-_ACEOF
++$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
+
+
+
+@@ -17811,40 +15225,44 @@ _ACEOF
+ elif test x"$enable_search" = "xbeagle"; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
+ $as_echo_n "checking for BRASERO_SEARCH... " >&6; }
+
+-if test -n "$BRASERO_SEARCH_CFLAGS"; then
+- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BRASERO_BEAGLE_CFLAGS"; then
-+ pkg_cv_BRASERO_BEAGLE_CFLAGS="$BRASERO_BEAGLE_CFLAGS"
++ if test -n "$BRASERO_SEARCH_CFLAGS"; then
++ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
@@ -13006,7 +14182,7 @@
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_BRASERO_BEAGLE_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
+ pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13016,14 +14192,14 @@
+else
+ pkg_failed=untried
fi
--if test -n "$BRASERO_BEAGLE_LIBS"; then
-- pkg_cv_BRASERO_BEAGLE_LIBS="$BRASERO_BEAGLE_LIBS"
+-if test -n "$BRASERO_SEARCH_LIBS"; then
+- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$BRASERO_BEAGLE_LIBS"; then
-+ pkg_cv_BRASERO_BEAGLE_LIBS="$BRASERO_BEAGLE_LIBS"
++ if test -n "$BRASERO_SEARCH_LIBS"; then
++ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
@@ -13033,7 +14209,7 @@
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_BRASERO_BEAGLE_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
+ pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -13045,36 +14221,76 @@
fi
-@@ -17374,14 +14857,14 @@ else
+@@ -17857,25 +15275,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- BRASERO_BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
-+ BRASERO_BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
else
-- BRASERO_BEAGLE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
-+ BRASERO_BEAGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$BRASERO_BEAGLE_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- build_beagle=no
+ echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
+-
+-$BRASERO_SEARCH_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
++ as_fn_error "Package requirements (libbeagle-1.0 >= $BEAGLE_REQUIRED) were not met:
+
+ $BRASERO_SEARCH_PKG_ERRORS
+
+@@ -17885,22 +15292,11 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+ and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
elif test $pkg_failed = untried; then
-@@ -17389,7 +14872,7 @@ elif test $pkg_failed = untried; then
- else
- BRASERO_BEAGLE_CFLAGS=$pkg_cv_BRASERO_BEAGLE_CFLAGS
- BRASERO_BEAGLE_LIBS=$pkg_cv_BRASERO_BEAGLE_LIBS
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BRASERO_SEARCH_CFLAGS
+-and BRASERO_SEARCH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -17909,24 +15305,19 @@ and BRASERO_SEARCH_LIBS to avoid the nee
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
+ BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- build_beagle=yes
- fi
-@@ -17399,9 +14882,7 @@ fi
-
- if test x"$build_beagle" = "xyes"; then
+ :
+ fi
-cat >>confdefs.h <<\_ACEOF
-#define BUILD_SEARCH 1
@@ -13082,9 +14298,227 @@
+$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
-
-@@ -17420,7 +14901,7 @@ fi
- TOTEM_REQUIRED=2.22.0
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_BEAGLE 1
+-_ACEOF
++$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
+
+
+
+@@ -17936,40 +15327,44 @@ _ACEOF
+ elif test x"$enable_search" = "xyes"; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
+ $as_echo_n "checking for BRASERO_SEARCH... " >&6; }
+
+-if test -n "$BRASERO_SEARCH_CFLAGS"; then
+- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_CFLAGS"; then
++ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BRASERO_SEARCH_LIBS"; then
+- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_LIBS"; then
++ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= \$TRACKER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -17982,14 +15377,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
+ else
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= $TRACKER_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_search=no
+ elif test $pkg_failed = untried; then
+@@ -17997,20 +15392,16 @@ elif test $pkg_failed = untried; then
+ else
+ BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
+ BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ build_search=yes
+ fi
+ if test x"$build_search" = "xyes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_SEARCH 1
+-_ACEOF
++$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_TRACKER 1
+-_ACEOF
++$as_echo "#define BUILD_TRACKER 1" >>confdefs.h
+
+
+
+@@ -18021,40 +15412,44 @@ _ACEOF
+ else
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BRASERO_SEARCH" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BRASERO_SEARCH" >&5
+ $as_echo_n "checking for BRASERO_SEARCH... " >&6; }
+
+-if test -n "$BRASERO_SEARCH_CFLAGS"; then
+- pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_CFLAGS"; then
++ pkg_cv_BRASERO_SEARCH_CFLAGS="$BRASERO_SEARCH_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+-if test -n "$BRASERO_SEARCH_LIBS"; then
+- pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\"") >&5
++if test -n "$PKG_CONFIG"; then
++ if test -n "$BRASERO_SEARCH_LIBS"; then
++ pkg_cv_BRASERO_SEARCH_LIBS="$BRASERO_SEARCH_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= \$BEAGLE_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ pkg_cv_BRASERO_SEARCH_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -18067,14 +15462,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
+ else
+- BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED" 2>&1`
++ BRASERO_SEARCH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= $BEAGLE_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BRASERO_SEARCH_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_search=no
+ elif test $pkg_failed = untried; then
+@@ -18082,20 +15477,16 @@ elif test $pkg_failed = untried; then
+ else
+ BRASERO_SEARCH_CFLAGS=$pkg_cv_BRASERO_SEARCH_CFLAGS
+ BRASERO_SEARCH_LIBS=$pkg_cv_BRASERO_SEARCH_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ build_search=yes
+ fi
+ if test x"$build_search" = "xyes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_SEARCH 1
+-_ACEOF
++$as_echo "#define BUILD_SEARCH 1" >>confdefs.h
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define BUILD_BEAGLE 1
+-_ACEOF
++$as_echo "#define BUILD_BEAGLE 1" >>confdefs.h
+
+
+
+@@ -18137,7 +15528,7 @@ fi
+ TOTEM_REQUIRED=2.29.1
# Check whether --enable-playlist was given.
-if test "${enable_playlist+set}" = set; then
@@ -13092,7 +14526,7 @@
enableval=$enable_playlist; enable_playlist=$enableval
else
enable_playlist="yes"
-@@ -17430,40 +14911,44 @@ fi
+@@ -18147,40 +15538,44 @@ fi
if test x"$enable_playlist" = "xyes"; then
pkg_failed=no
@@ -13156,7 +14590,7 @@
fi
-@@ -17476,14 +14961,14 @@ else
+@@ -18193,14 +15588,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13174,7 +14608,7 @@
$as_echo "no" >&6; }
build_totem=no
elif test $pkg_failed = untried; then
-@@ -17491,7 +14976,7 @@ elif test $pkg_failed = untried; then
+@@ -18208,7 +15603,7 @@ elif test $pkg_failed = untried; then
else
BRASERO_PL_PARSER_CFLAGS=$pkg_cv_BRASERO_PL_PARSER_CFLAGS
BRASERO_PL_PARSER_LIBS=$pkg_cv_BRASERO_PL_PARSER_LIBS
@@ -13183,7 +14617,7 @@
$as_echo "yes" >&6; }
build_totem=yes
fi
-@@ -17501,9 +14986,7 @@ fi
+@@ -18218,9 +15613,7 @@ fi
if test x"$build_totem" = "xyes"; then
@@ -13194,7 +14628,7 @@
fi
-@@ -17521,7 +15004,7 @@ fi
+@@ -18238,7 +15631,7 @@ fi
GSTREAMER_MODULE_REQUIRED=0.10.0
# Check whether --enable-preview was given.
@@ -13203,7 +14637,7 @@
enableval=$enable_preview; enable_preview=$enableval
else
enable_preview="yes"
-@@ -17531,40 +15014,44 @@ fi
+@@ -18248,40 +15641,44 @@ fi
if test x"$enable_preview" = "xyes"; then
pkg_failed=no
@@ -13267,7 +14701,7 @@
fi
-@@ -17577,14 +15064,14 @@ else
+@@ -18294,14 +15691,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13285,7 +14719,7 @@
$as_echo "no" >&6; }
build_preview=no
elif test $pkg_failed = untried; then
-@@ -17592,7 +15079,7 @@ elif test $pkg_failed = untried; then
+@@ -18309,7 +15706,7 @@ elif test $pkg_failed = untried; then
else
BRASERO_GSTREAMER_BASE_CFLAGS=$pkg_cv_BRASERO_GSTREAMER_BASE_CFLAGS
BRASERO_GSTREAMER_BASE_LIBS=$pkg_cv_BRASERO_GSTREAMER_BASE_LIBS
@@ -13294,7 +14728,7 @@
$as_echo "yes" >&6; }
build_preview=yes
fi
-@@ -17602,9 +15089,7 @@ fi
+@@ -18319,9 +15716,7 @@ fi
if test x"$build_preview" = "xyes"; then
@@ -13305,7 +14739,7 @@
fi
-@@ -17621,7 +15106,7 @@ fi
+@@ -18338,7 +15733,7 @@ fi
# Check whether --enable-inotify was given.
@@ -13314,7 +14748,7 @@
enableval=$enable_inotify; enable_inotify=$enableval
else
enable_inotify="yes"
-@@ -17630,9 +15115,7 @@ fi
+@@ -18347,9 +15742,7 @@ fi
if test x"$enable_inotify" = "xyes"; then
@@ -13325,7 +14759,131 @@
fi
if test x"$enable_inotify" = "xyes"; then
-@@ -17645,7 +15128,7 @@ fi
+@@ -18365,7 +15758,7 @@ fi
+ GOBJECT_INTROSPECTION_REQUIRED=0.6.3
+
+ # Check whether --enable-introspection was given.
+-if test "${enable_introspection+set}" = set; then
++if test "${enable_introspection+set}" = set; then :
+ enableval=$enable_introspection; enable_introspection=$enableval
+ else
+ enable_introspection="auto"
+@@ -18374,7 +15767,7 @@ fi
+
+
+ # Check whether --with-girdir was given.
+-if test "${with_girdir+set}" = set; then
++if test "${with_girdir+set}" = set; then :
+ withval=$with_girdir; ac_with_girdir=$withval
+ else
+ ac_with_girdir=""
+@@ -18383,62 +15776,59 @@ fi
+
+
+ # Check whether --with-typelibdir was given.
+-if test "${with_typelibdir+set}" = set; then
++if test "${with_typelibdir+set}" = set; then :
+ withval=$with_typelibdir; ac_with_typelibdir=$withval
+ else
+ ac_with_typelibdir=""
+ fi
+
+
+-{ $as_echo "$as_me:$LINENO: checking for gobject-introspection" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+ $as_echo_n "checking for gobject-introspection... " >&6; }
+
+-case $enable_introspection in
+- no) found_introspection="no (disabled, use --enable-introspection to enable)"
+- ;;
+- yes) if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\"") >&5
++case $enable_introspection in #(
++ no) :
++ found_introspection="no (disabled, use --enable-introspection to enable)"
++ ;; #(
++ yes) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: gobject-introspection-1.0 is not installed" >&5
+-$as_echo "$as_me: error: gobject-introspection-1.0 is not installed" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ fi
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ found_introspection=yes
+ else
+- { { $as_echo "$as_me:$LINENO: error: You need to have gobject-introspection >= $1 installed to build brasero" >&5
+-$as_echo "$as_me: error: You need to have gobject-introspection >= $1 installed to build brasero" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "You need to have gobject-introspection >= $1 installed to build brasero" "$LINENO" 5
+ fi
+- ;;
+- auto) if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
++ ;; #(
++ auto) :
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
+ found_introspection=yes
+ else
+ found_introspection=no
+ fi
+- ;;
+- *) { { $as_echo "$as_me:$LINENO: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&5
+-$as_echo "$as_me: error: invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" >&2;}
+- { (exit 1); exit 1; }; }
++ ;; #(
++ *) :
++ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ ;;
+ esac
+-
+-{ $as_echo "$as_me:$LINENO: result: $found_introspection" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+ $as_echo "$found_introspection" >&6; }
+
+ INTROSPECTION_SCANNER=
+@@ -18455,14 +15845,14 @@ if test "x$found_introspection" = "xyes"
+ ac_with_girdir=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ fi
+ INTROSPECTION_GIRDIR=${ac_with_girdir}
+- { $as_echo "$as_me:$LINENO: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .gir files in ${INTROSPECTION_GIRDIR}" >&5
+ $as_echo "$as_me: installing .gir files in ${INTROSPECTION_GIRDIR}" >&6;}
+
+ if test "${ac_with_typelibdir}" = ""; then
+ ac_with_typelibdir="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ fi
+ INTROSPECTION_TYPELIBDIR=${ac_with_typelibdir}
+- { $as_echo "$as_me:$LINENO: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&5
+ $as_echo "$as_me: installing .typelib files in ${INTROSPECTION_TYPELIBDIR}" >&6;}
+ fi
+
+@@ -18481,7 +15871,7 @@ fi
# Check whether --enable-caches was given.
@@ -13334,7 +14892,7 @@
enableval=$enable_caches; enable_caches=$enableval
else
enable_caches="yes"
-@@ -17670,146 +15153,12 @@ _ACEOF
+@@ -18506,146 +15896,12 @@ _ACEOF
@@ -13486,7 +15044,7 @@
_ACEOF
fi
-@@ -17817,16 +15166,12 @@ fi
+@@ -18653,16 +15909,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -13506,7 +15064,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17837,202 +15182,45 @@ return LC_MESSAGES
+@@ -18673,202 +15925,45 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -13558,10 +15116,10 @@
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
fi
- fi
- USE_NLS=yes
-
-
+- fi
+- USE_NLS=yes
+-
+-
- gt_cv_have_gettext=no
-
- CATOBJEXT=NONE
@@ -13654,11 +15212,13 @@
-
- ac_header_preproc=no
-fi
--
++ fi
++ USE_NLS=yes
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
--
+
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -13681,7 +15241,8 @@
-$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;}
--
++ gt_cv_have_gettext=no
+
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
@@ -13693,15 +15254,12 @@
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
--
--fi
--if test "x$ac_cv_header_libintl_h" = x""yes; then
-+ gt_cv_have_gettext=no
-+
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-+
+
+-fi
+-if test "x$ac_cv_header_libintl_h" = x""yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
@@ -13726,7 +15284,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -18045,54 +15233,25 @@ return !ngettext ("","", 1)
+@@ -18881,54 +15976,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -13789,7 +15347,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -18105,141 +15264,26 @@ return !dgettext ("","")
+@@ -18941,141 +16007,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -13941,7 +15499,7 @@
_ACEOF
fi
-@@ -18254,18 +15298,14 @@ done
+@@ -19090,18 +16041,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13963,7 +15521,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18283,55 +15323,26 @@ return bindtextdomain ();
+@@ -19119,55 +16066,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -14028,7 +15586,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18349,55 +15360,26 @@ return ngettext ();
+@@ -19185,55 +16103,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -14093,7 +15651,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18415,43 +15397,18 @@ return dgettext ();
+@@ -19251,43 +16140,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -14143,7 +15701,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18461,22 +15418,18 @@ fi
+@@ -19297,22 +16161,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -14171,7 +15729,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18494,55 +15447,26 @@ return ngettext ();
+@@ -19330,226 +16190,82 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -14232,14 +15790,19 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -18556,164 +15480,49 @@ int
- main ()
- {
- return dcgettext ();
+-/* 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 dcgettext ();
+-int
+-main ()
+-{
+-return dcgettext ();
- ;
- return 0;
-}
@@ -14316,7 +15879,8 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -14333,9 +15897,9 @@
-#endif
-
-#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
+
+ /* 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"
@@ -14346,16 +15910,21 @@
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
--#endif
--
--int
--main ()
--{
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
+ #endif
+-
++char dcgettext ();
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++return dcgettext ();
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14378,10 +15947,6 @@
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
else
@@ -14439,7 +16004,7 @@
_ACEOF
fi
-@@ -18743,15 +15552,13 @@ done
+@@ -19579,15 +16295,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -14458,7 +16023,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18776,118 +15583,28 @@ esac
+@@ -19612,118 +16326,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -14585,7 +16150,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18902,14 +15619,14 @@ msgstr ""
+@@ -19738,14 +16362,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -14605,7 +16170,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18917,9 +15634,9 @@ fi
+@@ -19753,9 +16377,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -14617,7 +16182,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18932,14 +15649,14 @@ for as_dir in $PATH
+@@ -19768,14 +16392,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14635,7 +16200,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18948,19 +15665,19 @@ esac
+@@ -19784,19 +16408,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14659,7 +16224,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18985,18 +15702,14 @@ esac
+@@ -19821,18 +16445,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14681,7 +16246,7 @@
/* end confdefs.h. */
int
-@@ -19008,121 +15721,14 @@ extern int _nl_msg_cat_cntr;
+@@ -19844,121 +16464,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -14807,7 +16372,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -19137,10 +15743,8 @@ fi
+@@ -19973,10 +16486,8 @@ fi
;;
esac
fi
@@ -14820,7 +16385,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -19154,9 +15758,7 @@ fi
+@@ -19990,9 +16501,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -14831,7 +16396,7 @@
fi
-@@ -19164,7 +15766,7 @@ _ACEOF
+@@ -20000,7 +16509,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -14840,7 +16405,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -19197,7 +15799,7 @@ $as_echo "found xgettext program is not
+@@ -20033,7 +16542,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -14849,7 +16414,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -19222,7 +15824,7 @@ $as_echo_n "checking for catalogs to be
+@@ -20058,7 +16567,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -14858,7 +16423,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -19256,16 +15858,16 @@ $as_echo "$LINGUAS" >&6; }
+@@ -20092,16 +16601,16 @@ $as_echo "$LINGUAS" >&6; }
@@ -14878,7 +16443,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -19273,35 +15875,31 @@ $as_echo "$USE_NLS" >&6; }
+@@ -20109,35 +16618,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -14920,7 +16485,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -19314,14 +15912,14 @@ for as_dir in $PATH
+@@ -20150,14 +16655,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14938,7 +16503,7 @@
IFS=$as_save_IFS
;;
-@@ -19329,19 +15927,19 @@ esac
+@@ -20165,19 +16670,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -14962,7 +16527,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -19354,14 +15952,14 @@ for as_dir in $PATH
+@@ -20190,14 +16695,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14980,7 +16545,7 @@
IFS=$as_save_IFS
;;
-@@ -19369,19 +15967,19 @@ esac
+@@ -20205,19 +16710,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -15004,7 +16569,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -19394,14 +15992,14 @@ for as_dir in $PATH
+@@ -20230,14 +16735,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15022,7 +16587,7 @@
IFS=$as_save_IFS
;;
-@@ -19409,18 +16007,16 @@ esac
+@@ -20245,18 +16750,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -15044,7 +16609,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -19542,9 +16138,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -20378,9 +16881,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -15056,7 +16621,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -19557,14 +16153,14 @@ for as_dir in $PATH
+@@ -20393,14 +16896,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15074,7 +16639,7 @@
IFS=$as_save_IFS
;;
-@@ -19572,19 +16168,19 @@ esac
+@@ -20408,19 +16911,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -15098,7 +16663,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -19597,14 +16193,14 @@ for as_dir in $PATH
+@@ -20433,14 +16936,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15116,7 +16681,7 @@
IFS=$as_save_IFS
;;
-@@ -19612,19 +16208,19 @@ esac
+@@ -20448,19 +16951,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -15140,7 +16705,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -19637,14 +16233,14 @@ for as_dir in $PATH
+@@ -20473,14 +16976,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15158,7 +16723,7 @@
IFS=$as_save_IFS
;;
-@@ -19652,19 +16248,19 @@ esac
+@@ -20488,19 +16991,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -15182,7 +16747,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -19677,14 +16273,14 @@ for as_dir in $PATH
+@@ -20513,14 +17016,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15200,7 +16765,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -19693,33 +16289,29 @@ esac
+@@ -20529,33 +17032,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -15240,7 +16805,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -19732,14 +16324,14 @@ for as_dir in $PATH
+@@ -20568,14 +17067,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15258,7 +16823,7 @@
IFS=$as_save_IFS
;;
-@@ -19747,180 +16339,63 @@ esac
+@@ -20583,180 +17082,63 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -15383,9 +16948,13 @@
-#else
-# include <assert.h>
-#endif
--
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
++ fi
++fi
+
-#undef bind_textdomain_codeset
--
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
-/* 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. */
@@ -15399,12 +16968,6 @@
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
-+ fi
-+fi
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
@@ -15467,7 +17030,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -19932,10 +16407,8 @@ fi
+@@ -20768,10 +17150,8 @@ fi
;;
esac
fi
@@ -15480,196 +17043,7 @@
fi
-@@ -19961,9 +16434,9 @@ fi
-
- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
- set dummy gtkdoc-check; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_CHECK in
-@@ -19976,14 +16449,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19991,10 +16464,10 @@ esac
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
- $as_echo "$GTKDOC_CHECK" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -20003,9 +16476,9 @@ fi
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_REBASE in
-@@ -20018,14 +16491,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -20033,10 +16506,10 @@ esac
- fi
- GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
- if test -n "$GTKDOC_REBASE"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
- $as_echo "$GTKDOC_REBASE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -20047,9 +16520,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
-
- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
- set dummy gtkdoc-mkpdf; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_MKPDF in
-@@ -20062,14 +16535,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -20077,10 +16550,10 @@ esac
- fi
- GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
- if test -n "$GTKDOC_MKPDF"; then
-- { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
- $as_echo "$GTKDOC_MKPDF" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -20088,7 +16561,7 @@ fi
-
-
- # Check whether --with-html-dir was given.
--if test "${with_html_dir+set}" = set; then
-+if test "${with_html_dir+set}" = set; then :
- withval=$with_html_dir;
- else
- with_html_dir='${datadir}/gtk-doc/html'
-@@ -20098,7 +16571,7 @@ fi
-
-
- # Check whether --enable-gtk-doc was given.
--if test "${enable_gtk_doc+set}" = set; then
-+if test "${enable_gtk_doc+set}" = set; then :
- enableval=$enable_gtk_doc;
- else
- enable_gtk_doc=no
-@@ -20107,33 +16580,31 @@ fi
-
- if test x$enable_gtk_doc = xyes; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.9") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
- :
- else
-- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" >&5
--$as_echo "$as_me: error: You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
- fi
- fi
-
-- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
-+ { $as_echo "$as_me:${as_lineno-$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 "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
- $as_echo "$enable_gtk_doc" >&6; }
-
- # Check whether --enable-gtk-doc-html was given.
--if test "${enable_gtk_doc_html+set}" = set; then
-+if test "${enable_gtk_doc_html+set}" = set; then :
- enableval=$enable_gtk_doc_html;
- else
- enable_gtk_doc_html=yes
- fi
-
- # Check whether --enable-gtk-doc-pdf was given.
--if test "${enable_gtk_doc_pdf+set}" = set; then
-+if test "${enable_gtk_doc_pdf+set}" = set; then :
- enableval=$enable_gtk_doc_pdf;
- else
- enable_gtk_doc_pdf=no
-@@ -20189,7 +16660,7 @@ fi
+@@ -20795,7 +17175,7 @@ fi
# Check whether --enable-schemas-install was given.
@@ -15678,7 +17052,7 @@
enableval=$enable_schemas_install;
fi
-@@ -20205,9 +16676,9 @@ fi
+@@ -20811,9 +17191,9 @@ fi
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -15690,7 +17064,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -20220,14 +16691,14 @@ for as_dir in $PATH
+@@ -20826,14 +17206,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15708,7 +17082,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -20236,18 +16707,16 @@ esac
+@@ -20842,18 +17222,16 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -15730,7 +17104,7 @@
fi
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-@@ -20258,13 +16727,13 @@ fi
+@@ -20864,13 +17242,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -15746,7 +17120,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -20273,22 +16742,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -20879,22 +17257,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -15773,7 +17147,7 @@
esac
fi
-@@ -20332,13 +16799,13 @@ _ACEOF
+@@ -20938,13 +17314,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -15789,7 +17163,7 @@
esac ;;
esac
done
-@@ -20346,8 +16813,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20952,8 +17328,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -15800,7 +17174,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20370,11 +16837,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20976,11 +17352,11 @@ $as_echo "$as_me: WARNING: cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -15814,7 +17188,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20394,8 +16861,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -21000,8 +17376,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
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.
@@ -15825,9 +17199,27 @@
done
LIBOBJS=$ac_libobjs
-@@ -20411,234 +16878,142 @@ else
- fi
-
+@@ -21017,234 +17393,142 @@ else
+ fi
+
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$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; }; }
++ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -15837,13 +17229,67 @@
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"AMDEP\" was never defined.
++ as_fn_error "conditional \"ENABLE_SK\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$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; }; }
++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$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; }; }
++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -15855,15 +17301,6 @@
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$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; }; }
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
if test -z "${HAVE_CAM_LIB_H_TRUE}" && test -z "${HAVE_CAM_LIB_H_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CAM_LIB_H\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -15900,69 +17337,6 @@
+ as_fn_error "conditional \"HAVE_SCSIIO_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$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; }; }
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$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; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_SK\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
if test -z "${BUILD_NAUTILUS_TRUE}" && test -z "${BUILD_NAUTILUS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_NAUTILUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -15990,6 +17364,15 @@
+ as_fn_error "conditional \"BUILD_CDRTOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${BUILD_CDRDAO_TRUE}" && test -z "${BUILD_CDRDAO_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRDAO\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_CDRDAO\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"BUILD_CDRDAO\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${BUILD_CDRKIT_TRUE}" && test -z "${BUILD_CDRKIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CDRKIT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -15999,6 +17382,15 @@
+ as_fn_error "conditional \"BUILD_CDRKIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${BUILD_GROWISOFS_TRUE}" && test -z "${BUILD_GROWISOFS_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GROWISOFS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_GROWISOFS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"BUILD_GROWISOFS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${BUILD_SEARCH_TRUE}" && test -z "${BUILD_SEARCH_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SEARCH\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16008,6 +17400,24 @@
+ as_fn_error "conditional \"BUILD_SEARCH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${BUILD_BEAGLE_TRUE}" && test -z "${BUILD_BEAGLE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_BEAGLE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_BEAGLE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"BUILD_BEAGLE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_TRACKER_TRUE}" && test -z "${BUILD_TRACKER_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TRACKER\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"BUILD_TRACKER\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"BUILD_TRACKER\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${BUILD_PLAYLIST_TRUE}" && test -z "${BUILD_PLAYLIST_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PLAYLIST\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16035,6 +17445,15 @@
+ as_fn_error "conditional \"BUILD_INOTIFY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INTROSPECTION\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_INTROSPECTION\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${UPDATE_CACHES_TRUE}" && test -z "${UPDATE_CACHES_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"UPDATE_CACHES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16048,51 +17467,6 @@
ac_config_commands="$ac_config_commands po/stamp-it"
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$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; }; }
-+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$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; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
if test -z "${SCHEMAS_INSTALL_TRUE}" && test -z "${SCHEMAS_INSTALL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16125,7 +17499,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20648,17 +17023,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -21254,17 +17538,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16151,7 +17525,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20666,23 +17042,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -21272,23 +17557,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16180,7 +17554,7 @@
as_nl='
'
export as_nl
-@@ -20690,7 +17058,13 @@ export as_nl
+@@ -21296,7 +17573,13 @@ export as_nl
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
@@ -16195,7 +17569,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20701,7 +17075,7 @@ else
+@@ -21307,7 +17590,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16204,7 +17578,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20724,13 +17098,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -21330,13 +17613,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -16218,7 +17592,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20740,15 +17107,15 @@ fi
+@@ -21346,15 +17622,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16237,7 +17611,7 @@
IFS=$as_save_IFS
;;
-@@ -20760,12 +17127,16 @@ if test "x$as_myself" = x; then
+@@ -21366,12 +17642,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -16258,7 +17632,7 @@
done
PS1='$ '
PS2='> '
-@@ -20777,7 +17148,89 @@ export LC_ALL
+@@ -21383,7 +17663,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -16349,7 +17723,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20791,8 +17244,12 @@ else
+@@ -21397,8 +17759,12 @@ else
as_basename=false
fi
@@ -16363,7 +17737,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20812,76 +17269,25 @@ $as_echo X/"$0" |
+@@ -21418,76 +17784,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -16451,7 +17825,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20910,8 +17316,56 @@ fi
+@@ -21516,8 +17831,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -16509,7 +17883,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20930,10 +17384,10 @@ else
+@@ -21536,10 +17899,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -16522,7 +17896,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20948,13 +17402,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -21554,13 +17917,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -16538,13 +17912,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by brasero $as_me 2.28.3, which was
+ This file was extended by brasero $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20986,13 +17446,15 @@ _ACEOF
+@@ -21592,13 +17961,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -16563,7 +17937,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -21011,16 +17473,17 @@ $config_headers
+@@ -21617,16 +17988,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -16574,7 +17948,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- brasero config.status 2.28.3
+ brasero config.status 2.30.1
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -16585,7 +17959,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21056,6 +17519,8 @@ do
+@@ -21662,6 +18034,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -16594,7 +17968,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -21063,20 +17528,19 @@ do
+@@ -21669,20 +18043,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -16619,7 +17993,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21084,11 +17548,10 @@ Try \`$0 --help' for more information."
+@@ -21690,11 +18063,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -16634,7 +18008,7 @@
ac_need_defaults=false ;;
esac
-@@ -21438,9 +17901,7 @@ do
+@@ -22045,9 +18417,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -16645,7 +18019,7 @@
esac
done
-@@ -21467,7 +17928,7 @@ $debug ||
+@@ -22074,7 +18444,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -16654,7 +18028,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21478,11 +17939,7 @@ $debug ||
+@@ -22085,11 +18455,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -16667,7 +18041,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21490,10 +17947,16 @@ $debug ||
+@@ -22097,10 +18463,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -16686,7 +18060,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21507,24 +17970,18 @@ _ACEOF
+@@ -22114,24 +18486,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -16714,7 +18088,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21546,7 +18003,7 @@ s/'"$ac_delim"'$//
+@@ -22153,7 +18519,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -16723,7 +18097,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -21560,7 +18017,7 @@ s/.\{148\}//
+@@ -22167,7 +18533,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -16732,7 +18106,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -21613,9 +18070,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -22220,9 +18586,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -16743,7 +18117,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21656,9 +18111,7 @@ for ac_last_try in false false :; do
+@@ -22263,9 +18627,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -16754,7 +18128,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21743,9 +18196,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22350,9 +18712,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -16765,7 +18139,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21758,9 +18209,7 @@ do
+@@ -22365,9 +18725,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -16776,7 +18150,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21788,12 +18237,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -22395,12 +18753,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -16791,7 +18165,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21804,7 +18251,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -22411,7 +18767,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -16800,7 +18174,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21817,9 +18264,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -22424,9 +18780,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -16811,7 +18185,7 @@
esac
;;
esac
-@@ -21847,47 +18292,7 @@ $as_echo X"$ac_file" |
+@@ -22454,47 +18808,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -16860,7 +18234,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21944,7 +18349,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -22551,7 +18865,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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=
@@ -16868,7 +18242,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21954,12 +18358,11 @@ ac_sed_dataroot='
+@@ -22561,12 +18874,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -16883,7 +18257,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21969,7 +18372,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -22576,7 +18888,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -16892,7 +18266,7 @@
esac
_ACEOF
-@@ -21998,14 +18401,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -22605,14 +18917,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -16909,7 +18283,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -22015,9 +18416,7 @@ which seems to be undefined. Please mak
+@@ -22622,9 +18932,7 @@ which seems to be undefined. Please mak
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -16920,7 +18294,7 @@
;;
:H)
#
-@@ -22028,25 +18427,19 @@ $as_echo "$as_me: error: could not creat
+@@ -22635,25 +18943,19 @@ $as_echo "$as_me: error: could not creat
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -16950,7 +18324,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22084,7 +18477,7 @@ $as_echo X"$_am_arg" |
+@@ -22691,7 +18993,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -16959,7 +18333,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22179,47 +18572,7 @@ $as_echo X"$file" |
+@@ -22786,47 +19088,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -17008,7 +18382,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22869,9 +19222,7 @@ _LT_EOF
+@@ -23476,9 +19738,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17019,7 +18393,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22894,15 +19245,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -23501,15 +19761,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -17037,7 +18411,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22923,10 +19271,10 @@ if test "$no_create" != yes; then
+@@ -23530,10 +19787,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -17050,17 +18424,17 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: brasero-2.28.3/data/Makefile.in
+Index: brasero-2.30.1/data/Makefile.in
===================================================================
---- brasero-2.28.3.orig/data/Makefile.in 2009-12-14 19:54:30.000000000 +0100
-+++ brasero-2.28.3/data/Makefile.in 2010-02-28 03:45:43.333027728 +0100
+--- brasero-2.30.1.orig/data/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/data/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -246,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -255,6 +255,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17068,7 +18442,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -485,7 +486,7 @@ uninstall-schemasDATA:
+@@ -494,7 +495,7 @@ uninstall-schemasDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -17077,7 +18451,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -510,7 +511,7 @@ $(RECURSIVE_TARGETS):
+@@ -519,7 +520,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -17086,17 +18460,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-Index: brasero-2.28.3/data/icons/Makefile.in
+Index: brasero-2.30.1/data/icons/Makefile.in
===================================================================
---- brasero-2.28.3.orig/data/icons/Makefile.in 2009-12-14 19:54:30.000000000 +0100
-+++ brasero-2.28.3/data/icons/Makefile.in 2010-02-28 03:45:43.453026503 +0100
+--- brasero-2.30.1.orig/data/icons/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/data/icons/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -179,6 +179,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17104,17 +18478,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: brasero-2.28.3/docs/Makefile.in
+Index: brasero-2.30.1/docs/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/Makefile.in 2009-12-14 19:54:30.000000000 +0100
-+++ brasero-2.28.3/docs/Makefile.in 2010-02-28 03:45:43.549027190 +0100
+--- brasero-2.30.1.orig/docs/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/docs/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -242,6 +242,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -251,6 +251,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17122,7 +18496,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -399,7 +400,7 @@ uninstall-man1:
+@@ -408,7 +409,7 @@ uninstall-man1:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -17131,7 +18505,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -424,7 +425,7 @@ $(RECURSIVE_TARGETS):
+@@ -433,7 +434,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -17140,17 +18514,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-Index: brasero-2.28.3/docs/reference/Makefile.in
+Index: brasero-2.30.1/docs/reference/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/Makefile.in 2009-12-14 19:54:30.000000000 +0100
-+++ brasero-2.28.3/docs/reference/Makefile.in 2010-02-28 03:45:43.637026714 +0100
+--- brasero-2.30.1.orig/docs/reference/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/docs/reference/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -217,6 +217,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -226,6 +226,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17158,7 +18532,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -335,7 +336,7 @@ clean-libtool:
+@@ -344,7 +345,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -17167,7 +18541,7 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -360,7 +361,7 @@ $(RECURSIVE_TARGETS):
+@@ -369,7 +370,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -17176,17 +18550,17 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-Index: brasero-2.28.3/docs/reference/libbrasero-burn/Makefile.in
+Index: brasero-2.30.1/docs/reference/libbrasero-burn/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/libbrasero-burn/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/docs/reference/libbrasero-burn/Makefile.in 2010-02-28 03:45:43.745029120 +0100
+--- brasero-2.30.1.orig/docs/reference/libbrasero-burn/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/docs/reference/libbrasero-burn/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -193,6 +193,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17194,17 +18568,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: brasero-2.28.3/docs/reference/libbrasero-media/Makefile.in
+Index: brasero-2.30.1/docs/reference/libbrasero-media/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/libbrasero-media/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/docs/reference/libbrasero-media/Makefile.in 2010-02-28 03:45:43.848526906 +0100
+--- brasero-2.30.1.orig/docs/reference/libbrasero-media/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/docs/reference/libbrasero-media/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -184,6 +184,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -193,6 +193,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17212,17 +18586,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: brasero-2.28.3/help/Makefile.in
+Index: brasero-2.30.1/help/Makefile.in
===================================================================
---- brasero-2.28.3.orig/help/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/help/Makefile.in 2010-02-28 03:45:43.989029196 +0100
+--- brasero-2.30.1.orig/help/Makefile.in 2010-04-27 01:29:13.000000000 +0200
++++ brasero-2.30.1/help/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -211,6 +211,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17230,17 +18604,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-Index: brasero-2.28.3/libbrasero-burn/Makefile.in
+Index: brasero-2.30.1/libbrasero-burn/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-burn/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/libbrasero-burn/Makefile.in 2010-02-28 03:45:44.149027890 +0100
+--- brasero-2.30.1.orig/libbrasero-burn/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/libbrasero-burn/Makefile.in 2010-05-03 15:56:49.464604045 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -318,6 +318,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -330,6 +330,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17248,7 +18622,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -398,7 +399,7 @@ INCLUDES = \
+@@ -410,7 +411,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17257,17 +18631,17 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GMODULE_CFLAGS) \
-Index: brasero-2.28.3/libbrasero-media/Makefile.in
+Index: brasero-2.30.1/libbrasero-media/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-media/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/libbrasero-media/Makefile.in 2010-02-28 03:45:44.309027052 +0100
+--- brasero-2.30.1.orig/libbrasero-media/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/libbrasero-media/Makefile.in 2010-05-03 15:56:49.468606579 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -302,6 +302,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -315,6 +315,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17275,7 +18649,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -378,7 +379,7 @@ INCLUDES = \
+@@ -391,7 +392,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17284,17 +18658,17 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-Index: brasero-2.28.3/libbrasero-utils/Makefile.in
+Index: brasero-2.30.1/libbrasero-utils/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-utils/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/libbrasero-utils/Makefile.in 2010-02-28 03:45:44.432527739 +0100
+--- brasero-2.30.1.orig/libbrasero-utils/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/libbrasero-utils/Makefile.in 2010-05-03 15:56:49.468606579 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -242,6 +242,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -251,6 +251,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17302,7 +18676,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -318,7 +319,7 @@ INCLUDES = \
+@@ -327,7 +328,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17311,10 +18685,10 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-Index: brasero-2.28.3/ltmain.sh
+Index: brasero-2.30.1/ltmain.sh
===================================================================
---- brasero-2.28.3.orig/ltmain.sh 2009-11-25 14:25:27.000000000 +0100
-+++ brasero-2.28.3/ltmain.sh 2010-02-28 03:45:31.676528658 +0100
+--- brasero-2.30.1.orig/ltmain.sh 2010-04-27 01:29:07.000000000 +0200
++++ brasero-2.30.1/ltmain.sh 2010-05-03 15:57:12.584108278 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -17344,6 +18718,26 @@
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -116,15 +116,15 @@ $lt_unset CDPATH
+
+ : ${CP="cp -f"}
+ : ${ECHO="echo"}
+-: ${EGREP="/usr/bin/grep -E"}
+-: ${FGREP="/usr/bin/grep -F"}
+-: ${GREP="/usr/bin/grep"}
++: ${EGREP="/bin/grep -E"}
++: ${FGREP="/bin/grep -F"}
++: ${GREP="/bin/grep"}
+ : ${LN_S="ln -s"}
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/opt/local/bin/gsed"}
++: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+
@@ -5033,7 +5033,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
@@ -17404,217 +18798,10 @@
esac
;;
no)
-Index: brasero-2.28.3/nautilus/Makefile.in
+Index: brasero-2.30.1/nautilus/Makefile.in
===================================================================
---- brasero-2.28.3.orig/nautilus/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/nautilus/Makefile.in 2010-02-28 03:45:44.585028345 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -243,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-Index: brasero-2.28.3/plugins/Makefile.in
-===================================================================
---- brasero-2.28.3.orig/plugins/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/Makefile.in 2010-02-28 03:45:44.697030357 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -221,6 +221,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -340,7 +341,7 @@ clean-libtool:
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -365,7 +366,7 @@ $(RECURSIVE_TARGETS):
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-Index: brasero-2.28.3/plugins/cdrdao/Makefile.in
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrdao/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/cdrdao/Makefile.in 2010-02-28 03:45:44.821028228 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -247,6 +247,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +327,7 @@ INCLUDES = \
- -DBRASERO_PREFIX=\"$(prefix)\" \
- -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
- -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
-- -DBRASERO_LIBDIR=\"$(libdir)\" \
-+ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(BRASERO_GLIB_CFLAGS) \
-@@ -334,7 +335,7 @@ INCLUDES = \
-
-
- #cdrdao
--cdrdaodir = $(libdir)/brasero/plugins
-+cdrdaodir = $(pkglibdir)/plugins
- cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
- libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c burn-cdrdao.h \
- burn-cdrdao-common.h
-@@ -343,7 +344,7 @@ libbrasero_cdrdao_la_LIBADD = $(BRASERO_
- libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
-
- #toc2cue
--toc2cuedir = $(libdir)/brasero/plugins
-+toc2cuedir = $(pkglibdir)/plugins
- toc2cue_LTLIBRARIES = libbrasero-toc2cue.la
- libbrasero_toc2cue_la_SOURCES = burn-toc2cue.c burn-toc2cue.h \
- burn-cdrdao-common.h
-Index: brasero-2.28.3/plugins/cdrkit/Makefile.in
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrkit/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/cdrkit/Makefile.in 2010-02-28 03:45:44.953029227 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -259,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -338,7 +339,7 @@ INCLUDES = \
- -DBRASERO_PREFIX=\"$(prefix)\" \
- -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
- -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
-- -DBRASERO_LIBDIR=\"$(libdir)\" \
-+ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(BRASERO_GLIB_CFLAGS) \
-@@ -346,7 +347,7 @@ INCLUDES = \
-
-
- #wodim
--wodimdir = $(libdir)/brasero/plugins
-+wodimdir = $(pkglibdir)/plugins
- wodim_LTLIBRARIES = libbrasero-wodim.la
- libbrasero_wodim_la_SOURCES = burn-wodim.c burn-wodim.h \
- burn-cdrkit.h
-@@ -355,7 +356,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
- libbrasero_wodim_la_LDFLAGS = -module -avoid-version
-
- #genisoimage
--genisoimagedir = $(libdir)/brasero/plugins
-+genisoimagedir = $(pkglibdir)/plugins
- genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
- libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c burn-genisoimage.h \
- burn-cdrkit.h
-@@ -364,7 +365,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
- libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
-
- #readom
--readomdir = $(libdir)/brasero/plugins
-+readomdir = $(pkglibdir)/plugins
- readom_LTLIBRARIES = libbrasero-readom.la
- libbrasero_readom_la_SOURCES = burn-readom.c burn-readom.h \
- burn-cdrkit.h
-Index: brasero-2.28.3/plugins/cdrtools/Makefile.in
-===================================================================
---- brasero-2.28.3.orig/plugins/cdrtools/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/cdrtools/Makefile.in 2010-02-28 03:45:45.085028275 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -258,6 +258,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -337,7 +338,7 @@ INCLUDES = \
- -DBRASERO_PREFIX=\"$(prefix)\" \
- -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
- -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
-- -DBRASERO_LIBDIR=\"$(libdir)\" \
-+ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(BRASERO_GLIB_CFLAGS) \
-@@ -345,7 +346,7 @@ INCLUDES = \
-
-
- #cdrecord
--cdrecorddir = $(libdir)/brasero/plugins
-+cdrecorddir = $(pkglibdir)/plugins
- cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
- libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c burn-cdrecord.h \
- burn-cdrtools.h
-@@ -354,7 +355,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
- libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
-
- #mkisofs
--mkisofsdir = $(libdir)/brasero/plugins
-+mkisofsdir = $(pkglibdir)/plugins
- mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
- libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c burn-mkisofs.h \
- burn-cdrtools.h
-@@ -363,7 +364,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
- libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
-
- #readcd
--readcddir = $(libdir)/brasero/plugins
-+readcddir = $(pkglibdir)/plugins
- readcd_LTLIBRARIES = libbrasero-readcd.la
- libbrasero_readcd_la_SOURCES = burn-readcd.c burn-readcd.h \
- burn-cdrtools.h
-Index: brasero-2.28.3/plugins/checksum/Makefile.in
-===================================================================
---- brasero-2.28.3.orig/plugins/checksum/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/checksum/Makefile.in 2010-02-28 03:45:45.213027710 +0100
+--- brasero-2.30.1.orig/nautilus/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/nautilus/Makefile.in 2010-05-03 15:56:49.468606579 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -17629,7 +18816,214 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -331,21 +332,21 @@ INCLUDES = \
+Index: brasero-2.30.1/plugins/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/plugins/Makefile.in 2010-05-03 15:56:49.468606579 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -232,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -351,7 +352,7 @@ clean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -376,7 +377,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: brasero-2.30.1/plugins/cdrdao/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrdao/Makefile.in 2010-04-27 01:29:14.000000000 +0200
++++ brasero-2.30.1/plugins/cdrdao/Makefile.in 2010-05-03 15:56:49.468606579 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -246,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -325,7 +326,7 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+@@ -333,7 +334,7 @@ INCLUDES = \
+
+
+ #cdrdao
+-cdrdaodir = $(libdir)/brasero/plugins
++cdrdaodir = $(pkglibdir)/plugins
+ cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
+ libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c
+ libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
+Index: brasero-2.30.1/plugins/cdrkit/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrkit/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/cdrkit/Makefile.in 2010-05-03 15:56:49.468606579 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -268,6 +268,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -347,7 +348,7 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+@@ -355,7 +356,7 @@ INCLUDES = \
+
+
+ #wodim
+-wodimdir = $(libdir)/brasero/plugins
++wodimdir = $(pkglibdir)/plugins
+ wodim_LTLIBRARIES = libbrasero-wodim.la
+ libbrasero_wodim_la_SOURCES = burn-wodim.c \
+ burn-cdrkit.h
+@@ -364,7 +365,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
+ libbrasero_wodim_la_LDFLAGS = -module -avoid-version
+
+ #genisoimage
+-genisoimagedir = $(libdir)/brasero/plugins
++genisoimagedir = $(pkglibdir)/plugins
+ genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
+ libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
+ burn-cdrkit.h
+@@ -373,7 +374,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
+ libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
+
+ #readom
+-readomdir = $(libdir)/brasero/plugins
++readomdir = $(pkglibdir)/plugins
+ readom_LTLIBRARIES = libbrasero-readom.la
+ libbrasero_readom_la_SOURCES = burn-readom.c \
+ burn-cdrkit.h
+Index: brasero-2.30.1/plugins/cdrtools/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/cdrtools/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/cdrtools/Makefile.in 2010-05-03 15:57:28.076109845 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -279,6 +279,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -358,7 +359,7 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+@@ -366,7 +367,7 @@ INCLUDES = \
+
+
+ #cdrecord
+-cdrecorddir = $(libdir)/brasero/plugins
++cdrecorddir = $(pkglibdir)/plugins
+ cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
+ libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
+ burn-cdrtools.h
+@@ -375,7 +376,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
+ libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
+
+ #mkisofs
+-mkisofsdir = $(libdir)/brasero/plugins
++mkisofsdir = $(pkglibdir)/plugins
+ mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
+ libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
+ burn-cdrtools.h
+@@ -384,7 +385,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
+ libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
+
+ #readcd
+-readcddir = $(libdir)/brasero/plugins
++readcddir = $(pkglibdir)/plugins
+ readcd_LTLIBRARIES = libbrasero-readcd.la
+ libbrasero_readcd_la_SOURCES = burn-readcd.c \
+ burn-cdrtools.h
+@@ -393,7 +394,7 @@ libbrasero_readcd_la_LIBADD = $(BRASERO_
+ libbrasero_readcd_la_LDFLAGS = -module -avoid-version
+
+ #cdda2wav
+-cdda2wavdir = $(libdir)/brasero/plugins
++cdda2wavdir = $(pkglibdir)/plugins
+ cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
+ libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h
+ libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
+Index: brasero-2.30.1/plugins/checksum/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/checksum/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/checksum/Makefile.in 2010-05-03 15:57:28.248606483 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -261,6 +261,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -340,19 +341,19 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17644,27 +19038,25 @@
-checksumdir = $(libdir)/brasero/plugins
+checksumdir = $(pkglibdir)/plugins
checksum_LTLIBRARIES = libbrasero-checksum.la
- libbrasero_checksum_la_SOURCES = burn-checksum-image.c \
- burn-checksum-image.h
-
+ libbrasero_checksum_la_SOURCES = burn-checksum-image.c
libbrasero_checksum_la_LDFLAGS = -module -avoid-version
libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
-checksumfiledir = $(libdir)/brasero/plugins
+checksumfiledir = $(pkglibdir)/plugins
checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c \
- burn-checksum-files.h\
-Index: brasero-2.28.3/plugins/dvdauthor/Makefile.in
+ burn-volume-read.c \
+Index: brasero-2.30.1/plugins/dvdauthor/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/dvdauthor/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/dvdauthor/Makefile.in 2010-02-28 03:45:45.329027359 +0100
+--- brasero-2.30.1.orig/plugins/dvdauthor/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/dvdauthor/Makefile.in 2010-05-03 15:56:49.472606669 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -236,6 +236,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -245,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17672,7 +19064,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -315,13 +316,13 @@ INCLUDES = \
+@@ -324,13 +325,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17686,19 +19078,19 @@
-dvdauthordir = $(libdir)/brasero/plugins
+dvdauthordir = $(pkglibdir)/plugins
dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
- libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c burn-dvdauthor.h
+ libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c
libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/plugins/dvdcss/Makefile.in
+Index: brasero-2.30.1/plugins/dvdcss/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/dvdcss/Makefile.in 2009-12-14 19:54:31.000000000 +0100
-+++ brasero-2.28.3/plugins/dvdcss/Makefile.in 2010-02-28 03:45:45.445028979 +0100
+--- brasero-2.30.1.orig/plugins/dvdcss/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/dvdcss/Makefile.in 2010-05-03 15:56:49.472606669 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -237,6 +237,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -246,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17706,7 +19098,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -306,7 +307,7 @@ target_alias = @target_alias@
+@@ -315,7 +316,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -17715,7 +19107,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-@@ -317,7 +318,7 @@ INCLUDES = \
+@@ -326,7 +327,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17724,17 +19116,17 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS)
-Index: brasero-2.28.3/plugins/growisofs/Makefile.in
+Index: brasero-2.30.1/plugins/growisofs/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/growisofs/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/plugins/growisofs/Makefile.in 2010-02-28 03:45:45.569027359 +0100
+--- brasero-2.30.1.orig/plugins/growisofs/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/growisofs/Makefile.in 2010-05-03 15:56:49.472606669 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -248,6 +248,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -257,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17742,7 +19134,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -327,7 +328,7 @@ INCLUDES = \
+@@ -336,7 +337,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17751,35 +19143,35 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -335,7 +336,7 @@ INCLUDES = \
+@@ -344,7 +345,7 @@ INCLUDES = \
#growisofs
-growisofsdir = $(libdir)/brasero/plugins
+growisofsdir = $(pkglibdir)/plugins
growisofs_LTLIBRARIES = libbrasero-growisofs.la
- libbrasero_growisofs_la_SOURCES = burn-growisofs.c burn-growisofs.h \
+ libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
burn-growisofs-common.h
-@@ -344,7 +345,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
+@@ -353,7 +354,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
#dvdrwformat
-dvdrwformatdir = $(libdir)/brasero/plugins
+dvdrwformatdir = $(pkglibdir)/plugins
dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
- libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c burn-dvd-rw-format.h
+ libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c
libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/plugins/libburnia/Makefile.in
+Index: brasero-2.30.1/plugins/libburnia/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/libburnia/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/plugins/libburnia/Makefile.in 2010-02-28 03:45:45.693028662 +0100
+--- brasero-2.30.1.orig/plugins/libburnia/Makefile.in 2010-04-27 01:29:15.000000000 +0200
++++ brasero-2.30.1/plugins/libburnia/Makefile.in 2010-05-03 15:56:49.472606669 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -247,6 +247,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -256,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17787,7 +19179,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +327,7 @@ INCLUDES = \
+@@ -335,7 +336,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17796,7 +19188,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_LIBISOFS_CFLAGS) \
-@@ -335,7 +336,7 @@ INCLUDES = \
+@@ -344,7 +345,7 @@ INCLUDES = \
#libburn
@@ -17804,27 +19196,27 @@
+libburndir = $(pkglibdir)/plugins
libburn_LTLIBRARIES = libbrasero-libburn.la
libbrasero_libburn_la_SOURCES = burn-libburn.c \
- burn-libburn.h \
-@@ -347,7 +348,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
+ burn-libburn-common.c \
+@@ -355,7 +356,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
libbrasero_libburn_la_LDFLAGS = -module -avoid-version
#libisofs (apparently libisofs needs one libburn function)
-libisofsdir = $(libdir)/brasero/plugins
+libisofsdir = $(pkglibdir)/plugins
libisofs_LTLIBRARIES = libbrasero-libisofs.la
- libbrasero_libisofs_la_SOURCES = burn-libisofs.c burn-libisofs.h \
+ libbrasero_libisofs_la_SOURCES = burn-libisofs.c \
burn-libburn-common.c burn-libburn-common.h \
-Index: brasero-2.28.3/plugins/local-track/Makefile.in
+Index: brasero-2.30.1/plugins/local-track/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/local-track/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/plugins/local-track/Makefile.in 2010-02-28 03:45:45.817029955 +0100
+--- brasero-2.30.1.orig/plugins/local-track/Makefile.in 2010-04-27 01:29:16.000000000 +0200
++++ brasero-2.30.1/plugins/local-track/Makefile.in 2010-05-03 15:57:28.996104977 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -247,6 +247,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -256,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17832,7 +19224,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +327,7 @@ INCLUDES = \
+@@ -335,7 +336,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17841,14 +19233,14 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -334,14 +335,14 @@ INCLUDES = \
+@@ -343,14 +344,14 @@ INCLUDES = \
#local-track
-local_trackdir = $(libdir)/brasero/plugins
+local_trackdir = $(pkglibdir)/plugins
local_track_LTLIBRARIES = libbrasero-local-track.la
- libbrasero_local_track_la_SOURCES = burn-local-image.c burn-local-image.h
+ libbrasero_local_track_la_SOURCES = burn-local-image.c
libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn.la
libbrasero_local_track_la_LDFLAGS = -module -avoid-version
@@ -17856,19 +19248,19 @@
-burn_uridir = $(libdir)/brasero/plugins
+burn_uridir = $(pkglibdir)/plugins
burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
- libbrasero_burn_uri_la_SOURCES = burn-uri.c burn-uri.h
+ libbrasero_burn_uri_la_SOURCES = burn-uri.c
libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/plugins/transcode/Makefile.in
+Index: brasero-2.30.1/plugins/transcode/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/transcode/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/plugins/transcode/Makefile.in 2010-02-28 03:45:45.957028688 +0100
+--- brasero-2.30.1.orig/plugins/transcode/Makefile.in 2010-04-27 01:29:16.000000000 +0200
++++ brasero-2.30.1/plugins/transcode/Makefile.in 2010-05-03 15:57:29.152606649 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -259,6 +259,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -268,6 +268,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17876,7 +19268,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -338,23 +339,23 @@ INCLUDES = \
+@@ -347,23 +348,23 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17890,7 +19282,7 @@
-transcodedir = $(libdir)/brasero/plugins
+transcodedir = $(pkglibdir)/plugins
transcode_LTLIBRARIES = libbrasero-transcode.la
- libbrasero_transcode_la_SOURCES = burn-transcode.c burn-transcode.h burn-normalize.h
+ libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h
libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
libbrasero_transcode_la_LDFLAGS = -module -avoid-version
-normalizedir = $(libdir)/brasero/plugins
@@ -17902,19 +19294,19 @@
-vobdir = $(libdir)/brasero/plugins
+vobdir = $(pkglibdir)/plugins
vob_LTLIBRARIES = libbrasero-vob.la
- libbrasero_vob_la_SOURCES = burn-vob.c burn-vob.h
+ libbrasero_vob_la_SOURCES = burn-vob.c
libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/plugins/vcdimager/Makefile.in
+Index: brasero-2.30.1/plugins/vcdimager/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/vcdimager/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/plugins/vcdimager/Makefile.in 2010-02-28 03:45:46.089027737 +0100
+--- brasero-2.30.1.orig/plugins/vcdimager/Makefile.in 2010-04-27 01:29:16.000000000 +0200
++++ brasero-2.30.1/plugins/vcdimager/Makefile.in 2010-05-03 15:56:49.472606669 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -236,6 +236,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -245,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17922,7 +19314,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -315,13 +316,13 @@ INCLUDES = \
+@@ -324,13 +325,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -17936,12 +19328,39 @@
-vcdimagerdir = $(libdir)/brasero/plugins
+vcdimagerdir = $(pkglibdir)/plugins
vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
- libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c burn-vcdimager.h
+ libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c
libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
-Index: brasero-2.28.3/src/Makefile.in
+Index: brasero-2.30.1/src/Makefile.in
===================================================================
---- brasero-2.28.3.orig/src/Makefile.in 2009-12-14 19:54:32.000000000 +0100
-+++ brasero-2.28.3/src/Makefile.in 2010-02-28 03:45:46.233029482 +0100
+--- brasero-2.30.1.orig/src/Makefile.in 2010-04-27 01:29:16.000000000 +0200
++++ brasero-2.30.1/src/Makefile.in 2010-05-03 15:56:49.472606669 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -320,6 +320,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -401,7 +402,7 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+Index: brasero-2.30.1/plugins/audio2cue/Makefile.in
+===================================================================
+--- brasero-2.30.1.orig/plugins/audio2cue/Makefile.in 2010-05-03 15:57:41.228604711 +0200
++++ brasero-2.30.1/plugins/audio2cue/Makefile.in 2010-05-03 15:57:27.612604988 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -17956,12 +19375,20 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +327,7 @@ INCLUDES = \
- -DBRASERO_PREFIX=\"$(prefix)\" \
- -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
- -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
-- -DBRASERO_LIBDIR=\"$(libdir)\" \
-+ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
+@@ -324,14 +325,14 @@ INCLUDES = \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+- -DBRASERO_LIBDIR=\"$(libdir)\" \
++ -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\" \
$(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED) \
- $(BRASERO_GLIB_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS)
+
+
+ #audio2cue
+-audio2cuedir = $(libdir)/brasero/plugins
++audio2cuedir = $(pkglibdir)/plugins
+ audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
+ libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
+ libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Modified: desktop/unstable/brasero/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/rules?rev=24192&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/rules [utf-8] (original)
+++ desktop/unstable/brasero/debian/rules [utf-8] Mon May 3 14:02:46 2010
@@ -12,7 +12,7 @@
DEB_DESTDIR := $(CURDIR)/debian/tmp/
SOVERSION := $(shell sed -rn 's/^Package:[[:space:]]*libbrasero-media([0-9]+)[[:space:]]*$$/\1/p' debian/control)
-SHLIBS := 2.27.92
+SHLIBS := 2.30
DEB_DH_MAKESHLIBS_ARGS_libbrasero-media$(SOVERSION) += -V 'libbrasero-media$(SOVERSION) (>= $(SHLIBS))' -Xplugins
DEB_DH_MAKESHLIBS_ARGS_brasero += --no-act
@@ -21,7 +21,9 @@
DEB_CONFIGURE_EXTRA_FLAGS += \
--disable-cdrtools \
--disable-scrollkeeper \
- --disable-caches
+ --disable-caches \
+ --enable-search=tracker \
+ --disable-introspection
DEB_MAKE_EXTRA_ARGS += pkglibdir=/usr/lib/brasero-$(SOVERSION)
More information about the pkg-gnome-commits
mailing list