r23160 - in /desktop/unstable/brasero/debian: changelog patches/31_link_libice.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Feb 28 02:46:15 UTC 2010
Author: joss
Date: Sun Feb 28 02:46:13 2010
New Revision: 23160
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23160
Log:
* 31_link_libice.patch: new patch. Explicitly link to libice.
Closes: #554057.
* 90_relibtoolize.patch: updated accordingly.
Added:
desktop/unstable/brasero/debian/patches/31_link_libice.patch
Modified:
desktop/unstable/brasero/debian/changelog
desktop/unstable/brasero/debian/patches/90_relibtoolize.patch
desktop/unstable/brasero/debian/patches/series
Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=23160&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Sun Feb 28 02:46:13 2010
@@ -1,3 +1,11 @@
+brasero (2.28.3-4) UNRELEASED; urgency=low
+
+ * 31_link_libice.patch: new patch. Explicitly link to libice.
+ Closes: #554057.
+ * 90_relibtoolize.patch: updated accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 28 Feb 2010 03:44:08 +0100
+
brasero (2.28.3-3) unstable; urgency=low
* Enable cdrkit again, but in a separate package brasero-cdrkit that
Added: 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=23160&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/31_link_libice.patch (added)
+++ desktop/unstable/brasero/debian/patches/31_link_libice.patch [utf-8] Sun Feb 28 02:46:13 2010
@@ -1,0 +1,16 @@
+Debian #554057
+GNOME #600591 (upstream refuses to include the fix)
+
+Index: brasero-2.28.3/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)
+ AC_SUBST(BRASERO_DBUS_LIBS)
+
+ PKG_CHECK_MODULES(BRASERO_SM, \
+- sm)
++ ice sm)
+
+ AC_SUBST(BRASERO_SM_CFLAGS)
+ AC_SUBST(BRASERO_SM_LIBS)
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=23160&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/90_relibtoolize.patch [utf-8] Sun Feb 28 02:46:13 2010
@@ -8,8 +8,14 @@
Index: brasero-2.28.3/Makefile.in
===================================================================
---- brasero-2.28.3.orig/Makefile.in 2010-01-13 20:05:02.278720352 +0100
-+++ brasero-2.28.3/Makefile.in 2010-01-13 20:04:42.110713539 +0100
+--- 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
+@@ -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,
@@ -42,8 +42,8 @@ DIST_COMMON = README $(am__configure_dep
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libbrasero-burn.pc.in \
@@ -21,16 +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) \
-@@ -216,8 +216,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -267,6 +265,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -267,6 +267,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38,10 +35,66 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -464,7 +465,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):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -489,7 +490,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]*);; \
+@@ -656,7 +657,8 @@ distdir: $(DISTFILES)
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -700,17 +702,17 @@ dist dist-all: distdir
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
Index: brasero-2.28.3/aclocal.m4
===================================================================
---- brasero-2.28.3.orig/aclocal.m4 2010-01-13 20:05:02.570714179 +0100
-+++ brasero-2.28.3/aclocal.m4 2010-01-13 20:03:23.318714054 +0100
+--- 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
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -53,55 +106,7 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -757,12 +757,6 @@ AC_DEFUN([GTK_DOC_CHECK],
- [
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
--
-- dnl check for tools we added during development
-- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
--
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-@@ -781,32 +775,16 @@ AC_DEFUN([GTK_DOC_CHECK],
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
- fi
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
-- dnl enable/disable output formats
-- AC_ARG_ENABLE([gtk-doc-html],
-- AS_HELP_STRING([--enable-gtk-doc-html],
-- [build documentation in html format [[default=yes]]]),,
-- [enable_gtk_doc_html=yes])
-- AC_ARG_ENABLE([gtk-doc-pdf],
-- AS_HELP_STRING([--enable-gtk-doc-pdf],
-- [build documentation in pdf format [[default=no]]]),,
-- [enable_gtk_doc_pdf=no])
--
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
--
-+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
-
-
-@@ -3444,7 +3422,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -3444,7 +3444,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -110,7 +115,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -3469,13 +3447,10 @@ linux* | k*bsd*-gnu)
+@@ -3469,13 +3469,10 @@ linux* | k*bsd*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
@@ -125,7 +130,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3487,6 +3462,18 @@ linux* | k*bsd*-gnu)
+@@ -3487,6 +3484,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -144,7 +149,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4074,11 +4061,11 @@ irix5* | irix6* | nonstopux*)
+@@ -4074,11 +4083,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -158,7 +163,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 +4682,7 @@ m4_if([$1], [CXX], [
+@@ -4695,7 +4704,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -167,7 +172,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -4759,7 +4746,7 @@ m4_if([$1], [CXX], [
+@@ -4759,7 +4768,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -176,7 +181,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4979,7 +4966,7 @@ m4_if([$1], [CXX], [
+@@ -4979,7 +4988,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -185,7 +190,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -5184,6 +5171,9 @@ m4_if([$1], [CXX], [
+@@ -5184,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'
;;
@@ -195,7 +200,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5248,6 +5238,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -5248,6 +5260,9 @@ dnl Note also adjust exclude_expsyms for
openbsd*)
with_gnu_ld=no
;;
@@ -205,7 +210,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5269,6 +5262,7 @@ dnl Note also adjust exclude_expsyms for
+@@ -5269,6 +5284,7 @@ dnl Note also adjust exclude_expsyms for
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -213,7 +218,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 +5354,7 @@ _LT_EOF
+@@ -5360,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'
;;
@@ -222,7 +227,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -5430,7 +5424,7 @@ _LT_EOF
+@@ -5430,7 +5446,7 @@ _LT_EOF
fi
;;
@@ -231,7 +236,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 +5599,7 @@ _LT_EOF
+@@ -5605,6 +5621,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -239,7 +244,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5843,7 +5838,7 @@ _LT_EOF
+@@ -5843,7 +5860,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -248,7 +253,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 +6834,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6839,7 +6856,7 @@ if test "$_lt_caught_CXX_error" != yes;
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
@@ -257,7 +262,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -8846,15 +8841,15 @@ m4_define([lt_dict_filter],
+@@ -8846,15 +8863,15 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
@@ -278,7 +283,7 @@
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-@@ -9052,14 +9047,16 @@ fi])
+@@ -9052,14 +9069,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -303,7 +308,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -9103,9 +9100,9 @@ See the pkg-config man page for more det
+@@ -9103,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
@@ -315,10 +320,28 @@
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],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -9171,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],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Index: brasero-2.28.3/config.guess
===================================================================
---- brasero-2.28.3.orig/config.guess 2010-01-13 20:05:02.474713003 +0100
-+++ brasero-2.28.3/config.guess 2010-01-13 20:04:39.099216268 +0100
+--- 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
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -450,8 +473,8 @@
SM[BE]S:UNIX_SV:*:*)
Index: brasero-2.28.3/config.h.in
===================================================================
---- brasero-2.28.3.orig/config.h.in 2010-01-13 20:05:02.182718703 +0100
-+++ brasero-2.28.3/config.h.in 2010-01-13 20:04:50.034714627 +0100
+--- 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 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -464,8 +487,8 @@
Index: brasero-2.28.3/config.sub
===================================================================
---- brasero-2.28.3.orig/config.sub 2010-01-13 20:05:02.378719167 +0100
-+++ brasero-2.28.3/config.sub 2010-01-13 20:04:39.103215868 +0100
+--- 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
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -520,8 +543,8 @@
-beos*)
Index: brasero-2.28.3/configure
===================================================================
---- brasero-2.28.3.orig/configure 2010-01-13 20:05:02.070714246 +0100
-+++ brasero-2.28.3/configure 2010-01-13 20:04:53.127212004 +0100
+--- 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
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -604,7 +627,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -78,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -760,6 +783,18 @@
-
-if as_func_ret_success; then
- :
+-else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
@@ -779,23 +814,11 @@
+ as_have_required=yes
else
- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
+- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
- else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
--
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
@@ -805,7 +828,7 @@
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
--else
+ else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -992,7 +1015,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -1028,7 +1051,7 @@
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -1335,30 +1358,7 @@
ac_unique_file="src/main.c"
# Factoring default headers for most tests.
-@@ -898,21 +854,13 @@ ENABLE_SK_TRUE
- DOC_USER_FORMATS
- OMF_DIR
- HELP_DIR
--GTK_DOC_USE_REBASE_FALSE
--GTK_DOC_USE_REBASE_TRUE
- GTK_DOC_USE_LIBTOOL_FALSE
- GTK_DOC_USE_LIBTOOL_TRUE
--GTK_DOC_BUILD_PDF_FALSE
--GTK_DOC_BUILD_PDF_TRUE
--GTK_DOC_BUILD_HTML_FALSE
--GTK_DOC_BUILD_HTML_TRUE
- ENABLE_GTK_DOC_FALSE
- ENABLE_GTK_DOC_TRUE
-+GTKDOC_CHECK
- PKG_CONFIG
- HTML_DIR
--GTKDOC_MKPDF
--GTKDOC_REBASE
--GTKDOC_CHECK
- HAVE_SCSIIO_H_FALSE
- HAVE_SCSIIO_H_TRUE
- HAVE_USCSI_H_FALSE
-@@ -1035,6 +983,7 @@ bindir
+@@ -1035,6 +991,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -1366,16 +1366,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1061,8 +1010,6 @@ enable_libtool_lock
- enable_largefile
- with_html_dir
- enable_gtk_doc
--enable_gtk_doc_html
--enable_gtk_doc_pdf
- with_help_dir
- with_omf_dir
- with_help_formats
-@@ -1232,8 +1179,7 @@ do
+@@ -1232,8 +1189,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 &&
@@ -1385,7 +1376,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1259,8 +1205,7 @@ do
+@@ -1259,8 +1215,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 &&
@@ -1395,7 +1386,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1464,8 +1409,7 @@ do
+@@ -1464,8 +1419,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 &&
@@ -1405,7 +1396,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1481,8 +1425,7 @@ do
+@@ -1481,8 +1435,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 &&
@@ -1415,7 +1406,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1512,17 +1455,17 @@ do
+@@ -1512,17 +1465,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1439,7 +1430,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1539,15 +1482,13 @@ done
+@@ -1539,15 +1492,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1457,7 +1448,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1570,8 +1511,7 @@ do
+@@ -1570,8 +1521,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1467,7 +1458,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1601,11 +1541,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1601,11 +1551,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 .` ||
@@ -1481,7 +1472,7 @@
# Find the source files, if location was not specified.
-@@ -1644,13 +1582,11 @@ else
+@@ -1644,13 +1592,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1497,7 +1488,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1773,22 +1709,20 @@ Optional Features:
+@@ -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
@@ -1505,6 +1496,8 @@
- --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-nautilus Build Nautilus extension [default=yes]
- --enable-libburnia Build libburnia plugins [default=yes]
@@ -1530,7 +1523,7 @@
--disable-nls do not use Native Language Support
--disable-schemas-install
Disable installation of the gconf schemas
-@@ -1818,7 +1752,7 @@ Some influential environment variables:
+@@ -1818,7 +1764,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>
@@ -1539,7 +1532,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1891,6 +1825,7 @@ Some influential environment variables:
+@@ -1891,6 +1837,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.
@@ -1547,84 +1540,21 @@
_ACEOF
ac_status=$?
fi
-@@ -1903,72 +1838,477 @@ if test "$ac_init_help" = "recursive"; t
- continue
- ac_builddir=.
-
--case "$ac_dir" in
--.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
--*)
-- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-- case $ac_top_builddir_sub in
-- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-- esac ;;
--esac
--ac_abs_top_builddir=$ac_pwd
--ac_abs_builddir=$ac_pwd$ac_dir_suffix
--# for backward compatibility:
--ac_top_builddir=$ac_top_build_prefix
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+ .) # We are building in place.
-+ ac_srcdir=.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
-+ else
-+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+brasero configure 2.28.3
+@@ -1954,21 +1901,426 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ brasero configure 2.28.3
+-generated by GNU Autoconf 2.63
+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. ##
@@ -1941,20 +1871,7 @@
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
-
--case $srcdir in
-- .) # We are building in place.
-- ac_srcdir=.
-- ac_top_srcdir=$ac_top_builddir_sub
-- ac_abs_top_srcdir=$ac_pwd ;;
-- [\\/]* | ?:[\\/]* ) # Absolute name.
-- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir
-- ac_abs_top_srcdir=$srcdir ;;
-- *) # Relative name.
-- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_build_prefix$srcdir
-- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
@@ -1975,22 +1892,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
- esac
--ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
--
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-- done
++esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -2001,20 +1903,11 @@
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
- fi
++fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--brasero configure 2.28.3
--generated by GNU Autoconf 2.63
++
+} # 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
@@ -2039,8 +1932,7 @@
+ ;
+ return 0;
+}
- _ACEOF
-- exit
++_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -2058,7 +1950,7 @@
+
+else
+ eval "$3=yes"
- fi
++fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -2079,7 +1971,7 @@
$ $0 $@
-@@ -2004,8 +2344,8 @@ for as_dir in $PATH
+@@ -2004,8 +2356,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2090,7 +1982,7 @@
IFS=$as_save_IFS
} >&5
-@@ -2042,9 +2382,9 @@ do
+@@ -2042,9 +2394,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -2102,7 +1994,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2060,13 +2400,13 @@ do
+@@ -2060,13 +2412,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -2119,7 +2011,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2091,13 +2431,13 @@ _ASBOX
+@@ -2091,13 +2443,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -2135,7 +2027,7 @@
esac ;;
esac
done
-@@ -2169,39 +2509,41 @@ _ASBOX
+@@ -2169,39 +2521,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2182,7 +2074,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 +2561,8 @@ fi
+@@ -2219,8 +2573,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -2193,7 +2085,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2228,10 +2570,10 @@ $as_echo "$as_me: loading site script $a
+@@ -2228,10 +2582,10 @@ $as_echo "$as_me: loading site script $a
done
if test -r "$cache_file"; then
@@ -2208,7 +2100,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2239,7 +2581,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2239,7 +2593,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -2217,7 +2109,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2254,11 +2596,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2254,11 +2608,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,)
@@ -2231,7 +2123,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2268,17 +2610,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2268,17 +2622,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
@@ -2253,7 +2145,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2290,43 +2632,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2290,43 +2644,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2304,7 +2196,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2385,24 +2704,16 @@ am__api_version='1.11'
+@@ -2385,24 +2716,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2337,7 +2229,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2428,10 +2739,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2428,10 +2751,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.
@@ -2350,7 +2242,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2439,11 +2750,11 @@ for as_dir in $PATH
+@@ -2439,11 +2762,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2366,7 +2258,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2480,7 +2791,7 @@ case $as_dir/ in
+@@ -2480,7 +2803,7 @@ case $as_dir/ in
;;
esac
@@ -2375,7 +2267,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2496,7 +2807,7 @@ fi
+@@ -2496,7 +2819,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -2384,7 +2276,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2507,7 +2818,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2507,7 +2830,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2393,7 +2285,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2518,15 +2829,11 @@ am_lf='
+@@ -2518,15 +2841,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2411,7 +2303,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2548,11 +2855,8 @@ if (
+@@ -2548,11 +2867,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".
@@ -2425,7 +2317,7 @@
fi
test "$2" = conftest.file
-@@ -2561,13 +2865,10 @@ then
+@@ -2561,13 +2877,10 @@ then
# Ok.
:
else
@@ -2442,7 +2334,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2595,7 +2896,7 @@ if eval "$MISSING --run true"; then
+@@ -2595,7 +2908,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2451,7 +2343,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2616,9 +2917,9 @@ if test "$cross_compiling" != no; then
+@@ -2616,9 +2929,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
@@ -2463,7 +2355,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2629,24 +2930,24 @@ for as_dir in $PATH
+@@ -2629,24 +2942,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2493,7 +2385,7 @@
$as_echo "no" >&6; }
fi
-@@ -2656,9 +2957,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2656,9 +2969,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
@@ -2505,7 +2397,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2669,24 +2970,24 @@ for as_dir in $PATH
+@@ -2669,24 +2982,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2535,7 +2427,7 @@
$as_echo "no" >&6; }
fi
-@@ -2695,7 +2996,7 @@ fi
+@@ -2695,7 +3008,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2544,7 +2436,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2708,10 +3009,10 @@ fi
+@@ -2708,10 +3021,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2557,7 +2449,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2719,7 +3020,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2719,7 +3032,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2566,7 +2458,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 +3032,12 @@ do
+@@ -2731,11 +3044,12 @@ do
esac
done
done
@@ -2580,7 +2472,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2743,11 +3045,10 @@ fi
+@@ -2743,11 +3057,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.
@@ -2593,7 +2485,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2760,9 +3061,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2760,9 +3073,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
@@ -2605,7 +2497,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2773,24 +3074,24 @@ for as_dir in $PATH
+@@ -2773,24 +3086,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2635,7 +2527,7 @@
$as_echo "no" >&6; }
fi
-@@ -2798,11 +3099,11 @@ fi
+@@ -2798,11 +3111,11 @@ fi
test -n "$AWK" && break
done
@@ -2649,7 +2541,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2820,11 +3121,11 @@ esac
+@@ -2820,11 +3133,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2663,7 +2555,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2844,9 +3145,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2844,9 +3157,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
@@ -2674,7 +2566,7 @@
fi
fi
-@@ -2904,7 +3203,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2904,7 +3215,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -2683,7 +2575,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2920,16 +3219,16 @@ ac_config_headers="$ac_config_headers co
+@@ -2920,16 +3231,16 @@ ac_config_headers="$ac_config_headers co
@@ -2703,7 +2595,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2957,7 +3256,7 @@ am__doit:
+@@ -2957,7 +3268,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2712,7 +2604,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2985,12 +3284,12 @@ if test "$am__include" = "#"; then
+@@ -2985,12 +3296,12 @@ if test "$am__include" = "#"; then
fi
@@ -2727,7 +2619,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3015,9 +3314,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3015,9 +3326,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
@@ -2739,7 +2631,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3028,24 +3327,24 @@ for as_dir in $PATH
+@@ -3028,24 +3339,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2769,7 +2661,7 @@
$as_echo "no" >&6; }
fi
-@@ -3055,9 +3354,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3055,9 +3366,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
@@ -2781,7 +2673,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3068,24 +3367,24 @@ for as_dir in $PATH
+@@ -3068,24 +3379,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2811,7 +2703,7 @@
$as_echo "no" >&6; }
fi
-@@ -3094,7 +3393,7 @@ fi
+@@ -3094,7 +3405,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2820,7 +2712,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3108,9 +3407,9 @@ if test -z "$CC"; then
+@@ -3108,9 +3419,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
@@ -2832,7 +2724,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3121,24 +3420,24 @@ for as_dir in $PATH
+@@ -3121,24 +3432,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2862,7 +2754,7 @@
$as_echo "no" >&6; }
fi
-@@ -3148,9 +3447,9 @@ fi
+@@ -3148,9 +3459,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
@@ -2874,7 +2766,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3162,18 +3461,18 @@ for as_dir in $PATH
+@@ -3162,18 +3473,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2896,7 +2788,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3192,10 +3491,10 @@ fi
+@@ -3192,10 +3503,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2909,7 +2801,7 @@
$as_echo "no" >&6; }
fi
-@@ -3207,9 +3506,9 @@ if test -z "$CC"; then
+@@ -3207,9 +3518,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
@@ -2921,7 +2813,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3220,24 +3519,24 @@ for as_dir in $PATH
+@@ -3220,24 +3531,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2951,7 +2843,7 @@
$as_echo "no" >&6; }
fi
-@@ -3251,9 +3550,9 @@ if test -z "$CC"; then
+@@ -3251,9 +3562,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
@@ -2963,7 +2855,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3264,24 +3563,24 @@ for as_dir in $PATH
+@@ -3264,24 +3575,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2993,7 +2885,7 @@
$as_echo "no" >&6; }
fi
-@@ -3294,7 +3593,7 @@ done
+@@ -3294,7 +3605,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3002,7 +2894,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3305,57 +3604,37 @@ fi
+@@ -3305,57 +3616,37 @@ fi
fi
@@ -3080,7 +2972,7 @@
/* end confdefs.h. */
int
-@@ -3371,8 +3650,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3371,8 +3662,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.
@@ -3091,7 +2983,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3388,17 +3667,17 @@ do
+@@ -3388,17 +3679,17 @@ do
done
rm -f $ac_rmfiles
@@ -3114,7 +3006,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 +3694,7 @@ do
+@@ -3415,7 +3706,7 @@ do
# certainly right.
break;;
*.* )
@@ -3123,7 +3015,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3434,84 +3713,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3434,84 +3725,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -3229,23 +3121,32 @@
# 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 +3763,83 @@ for ac_file in conftest.exe conftest con
+@@ -3526,32 +3775,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
-+fi
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
@@ -3293,29 +3194,16 @@
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
- fi
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-
--rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--$as_echo "$ac_cv_exeext" >&6; }
--
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
@@ -3333,7 +3221,7 @@
/* end confdefs.h. */
int
-@@ -3563,17 +3851,17 @@ main ()
+@@ -3563,17 +3863,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3356,7 +3244,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3586,31 +3874,23 @@ else
+@@ -3586,31 +3886,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3395,7 +3283,7 @@
/* end confdefs.h. */
int
-@@ -3624,37 +3904,16 @@ main ()
+@@ -3624,37 +3916,16 @@ main ()
return 0;
}
_ACEOF
@@ -3436,7 +3324,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3663,20 +3922,16 @@ else
+@@ -3663,20 +3934,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3460,7 +3348,7 @@
/* end confdefs.h. */
int
-@@ -3687,35 +3942,11 @@ main ()
+@@ -3687,35 +3954,11 @@ main ()
return 0;
}
_ACEOF
@@ -3499,7 +3387,7 @@
/* end confdefs.h. */
int
-@@ -3726,36 +3957,12 @@ main ()
+@@ -3726,36 +3969,12 @@ main ()
return 0;
}
_ACEOF
@@ -3540,7 +3428,7 @@
/* end confdefs.h. */
int
-@@ -3766,42 +3973,17 @@ main ()
+@@ -3766,42 +3985,17 @@ main ()
return 0;
}
_ACEOF
@@ -3585,7 +3473,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3818,18 +4000,14 @@ else
+@@ -3818,18 +4012,14 @@ else
CFLAGS=
fi
fi
@@ -3607,7 +3495,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3886,32 +4064,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3886,32 +4076,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3641,7 +3529,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3922,17 +4077,19 @@ fi
+@@ -3922,17 +4089,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3664,7 +3552,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3942,9 +4099,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3942,9 +4111,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -3676,7 +3564,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4052,7 +4209,7 @@ else
+@@ -4052,7 +4221,7 @@ else
fi
fi
@@ -3685,7 +3573,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4071,7 +4228,7 @@ fi
+@@ -4071,7 +4240,7 @@ fi
# Check whether --enable-compile-warnings was given.
@@ -3694,7 +3582,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -4102,13 +4259,9 @@ fi
+@@ -4102,13 +4271,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -3710,7 +3598,7 @@
/* end confdefs.h. */
int
-@@ -4119,35 +4272,14 @@ main ()
+@@ -4119,35 +4284,14 @@ main ()
return 0;
}
_ACEOF
@@ -3749,7 +3637,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -4161,26 +4293,24 @@ $as_echo "$has_option" >&6; }
+@@ -4161,26 +4305,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -3781,7 +3669,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -4195,7 +4325,7 @@ $as_echo_n "checking what language compl
+@@ -4195,7 +4337,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -3790,7 +3678,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -4203,14 +4333,14 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -4203,14 +4345,14 @@ $as_echo "$complCFLAGS" >&6; }
# Check whether --enable-cxx-warnings was given.
@@ -3807,7 +3695,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -4230,18 +4360,18 @@ $as_echo_n "checking what warning flags
+@@ -4230,18 +4372,18 @@ $as_echo_n "checking what warning flags
fi
fi
fi
@@ -3829,7 +3717,7 @@
$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 +4387,7 @@ $as_echo_n "checking what language compl
+@@ -4257,7 +4399,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -3838,7 +3726,7 @@
$as_echo "$complCXXFLAGS" >&6; }
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -4281,7 +4411,7 @@ $as_echo "$complCXXFLAGS" >&6; }
+@@ -4281,7 +4423,7 @@ $as_echo "$complCXXFLAGS" >&6; }
# Check whether --enable-static was given.
@@ -3847,7 +3735,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -4313,14 +4443,14 @@ fi
+@@ -4313,14 +4455,14 @@ fi
case `pwd` in
*\ * | *\ *)
@@ -3865,7 +3753,7 @@
-@@ -4338,35 +4468,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -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 ||
@@ -3908,7 +3796,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -4382,28 +4504,24 @@ IFS=$ac_save_IFS
+@@ -4382,28 +4516,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -3942,7 +3830,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -4419,9 +4537,9 @@ IFS=$ac_save_IFS
+@@ -4419,9 +4549,9 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -3954,7 +3842,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -4429,7 +4547,7 @@ else
+@@ -4429,7 +4559,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -3963,7 +3851,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 +4556,7 @@ for as_dir in $PATH
+@@ -4438,7 +4568,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3972,7 +3860,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 +4576,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -4458,7 +4588,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
@@ -3981,7 +3869,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 +4591,17 @@ esac
+@@ -4473,19 +4603,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -4004,7 +3892,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -4503,9 +4619,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -4503,9 +4631,9 @@ Xsed="$SED -e 1s/^X//"
@@ -4016,7 +3904,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4516,7 +4632,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4516,7 +4644,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4025,7 +3913,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 +4652,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4536,7 +4664,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
@@ -4034,7 +3922,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 +4667,24 @@ esac
+@@ -4551,26 +4679,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -4066,7 +3954,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4584,7 +4698,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4584,7 +4710,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4075,7 +3963,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 +4718,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4604,7 +4730,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
@@ -4084,7 +3972,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 +4733,10 @@ esac
+@@ -4619,12 +4745,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -4099,7 +3987,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4632,14 +4744,14 @@ fi
+@@ -4632,14 +4756,14 @@ fi
fi
fi
@@ -4117,7 +4005,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4653,7 +4765,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4653,7 +4777,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4126,7 +4014,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 +4785,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -4673,7 +4797,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
@@ -4135,7 +4023,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 +4800,10 @@ esac
+@@ -4688,12 +4812,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -4150,7 +4038,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -4701,7 +4811,7 @@ fi
+@@ -4701,7 +4823,7 @@ fi
fi
fi
@@ -4159,7 +4047,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -4727,7 +4837,7 @@ test -z "$GREP" && GREP=grep
+@@ -4727,7 +4849,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -4168,7 +4056,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -4736,7 +4846,7 @@ fi
+@@ -4736,7 +4858,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -4177,7 +4065,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -4766,13 +4876,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -4766,13 +4888,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -4194,7 +4082,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -4803,18 +4913,16 @@ fi
+@@ -4803,18 +4925,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -4218,7 +4106,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4827,7 +4935,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -4827,7 +4947,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -4227,7 +4115,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -4839,9 +4947,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -4839,9 +4959,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -4239,7 +4127,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -4888,7 +4996,7 @@ else
+@@ -4888,7 +5008,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -4248,7 +4136,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -4899,9 +5007,9 @@ else
+@@ -4899,9 +5019,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
@@ -4260,7 +4148,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -4912,24 +5020,24 @@ for as_dir in $PATH
+@@ -4912,24 +5032,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4290,7 +4178,7 @@
$as_echo "no" >&6; }
fi
-@@ -4943,9 +5051,9 @@ if test -z "$DUMPBIN"; then
+@@ -4943,9 +5063,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
@@ -4302,7 +4190,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -4956,24 +5064,24 @@ for as_dir in $PATH
+@@ -4956,24 +5076,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4332,7 +4220,7 @@
$as_echo "no" >&6; }
fi
-@@ -4986,7 +5094,7 @@ done
+@@ -4986,7 +5106,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4341,7 +4229,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5006,44 +5114,44 @@ test -z "$NM" && NM=nm
+@@ -5006,44 +5126,44 @@ test -z "$NM" && NM=nm
@@ -4355,15 +4243,15 @@
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:5124: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5136: $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:5127: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5139: $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:5130: output\"" >&5)
++ (eval echo "\"\$as_me:5142: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4397,7 +4285,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5161,10 +5269,10 @@ else
+@@ -5161,10 +5281,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -4410,7 +4298,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -5178,7 +5286,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -5178,7 +5298,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -4419,7 +4307,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -5188,17 +5296,17 @@ xsi_shell=no
+@@ -5188,17 +5308,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -4440,7 +4328,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -5233,14 +5341,14 @@ esac
+@@ -5233,14 +5353,14 @@ esac
@@ -4458,7 +4346,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -5269,9 +5377,9 @@ esac
+@@ -5269,9 +5389,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
@@ -4470,7 +4358,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5282,24 +5390,24 @@ for as_dir in $PATH
+@@ -5282,24 +5402,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4500,7 +4388,7 @@
$as_echo "no" >&6; }
fi
-@@ -5309,9 +5417,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -5309,9 +5429,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
@@ -4512,7 +4400,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5322,24 +5430,24 @@ for as_dir in $PATH
+@@ -5322,24 +5442,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4542,7 +4430,7 @@
$as_echo "no" >&6; }
fi
-@@ -5348,7 +5456,7 @@ fi
+@@ -5348,7 +5468,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4551,7 +4439,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5368,9 +5476,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5368,9 +5488,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -4563,7 +4451,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5485,11 +5593,11 @@ irix5* | irix6* | nonstopux*)
+@@ -5485,11 +5605,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -4577,7 +4465,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 +5672,7 @@ tpf*)
+@@ -5564,7 +5684,7 @@ tpf*)
esac
fi
@@ -4586,7 +4474,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 +5692,9 @@ test -z "$deplibs_check_method" && depli
+@@ -5584,9 +5704,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
@@ -4598,7 +4486,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -5597,24 +5705,24 @@ for as_dir in $PATH
+@@ -5597,24 +5717,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4628,7 +4516,7 @@
$as_echo "no" >&6; }
fi
-@@ -5624,9 +5732,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -5624,9 +5744,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
@@ -4640,7 +4528,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -5637,24 +5745,24 @@ for as_dir in $PATH
+@@ -5637,24 +5757,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4670,7 +4558,7 @@
$as_echo "no" >&6; }
fi
-@@ -5663,7 +5771,7 @@ fi
+@@ -5663,7 +5783,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4679,7 +4567,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5689,9 +5797,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -5689,9 +5809,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
@@ -4691,7 +4579,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -5702,24 +5810,24 @@ for as_dir in $PATH
+@@ -5702,24 +5822,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4721,7 +4609,7 @@
$as_echo "no" >&6; }
fi
-@@ -5729,9 +5837,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -5729,9 +5849,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
@@ -4733,7 +4621,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -5742,24 +5850,24 @@ for as_dir in $PATH
+@@ -5742,24 +5862,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4763,7 +4651,7 @@
$as_echo "no" >&6; }
fi
-@@ -5768,7 +5876,7 @@ fi
+@@ -5768,7 +5888,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4772,7 +4660,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5788,9 +5896,9 @@ test -z "$STRIP" && STRIP=:
+@@ -5788,9 +5908,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
@@ -4784,7 +4672,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -5801,24 +5909,24 @@ for as_dir in $PATH
+@@ -5801,24 +5921,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4814,7 +4702,7 @@
$as_echo "no" >&6; }
fi
-@@ -5828,9 +5936,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -5828,9 +5948,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
@@ -4826,7 +4714,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -5841,24 +5949,24 @@ for as_dir in $PATH
+@@ -5841,24 +5961,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4856,7 +4744,7 @@
$as_echo "no" >&6; }
fi
-@@ -5867,7 +5975,7 @@ fi
+@@ -5867,7 +5987,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4865,7 +4753,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5945,9 +6053,9 @@ compiler=$CC
+@@ -5945,9 +6065,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4877,7 +4765,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -6063,18 +6171,18 @@ void nm_test_func(void){}
+@@ -6063,18 +6183,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -4902,7 +4790,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -6127,11 +6235,11 @@ _LT_EOF
+@@ -6127,11 +6247,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -4917,7 +4805,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -6165,10 +6273,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -6165,10 +6285,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
@@ -4930,7 +4818,7 @@
$as_echo "ok" >&6; }
fi
-@@ -6194,7 +6302,7 @@ fi
+@@ -6194,7 +6314,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -4939,7 +4827,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -6206,11 +6314,11 @@ case $host in
+@@ -6206,11 +6326,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -4954,13 +4842,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -6224,12 +6332,12 @@ ia64-*-hpux*)
+@@ -6224,12 +6344,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6227 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 6335 "configure"' > conftest.$ac_ext
++ echo '#line 6347 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4971,7 +4859,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -6263,11 +6371,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -6263,11 +6383,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
@@ -4986,7 +4874,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -6316,9 +6424,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -6316,9 +6436,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"
@@ -4998,7 +4886,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6327,11 +6435,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -6327,11 +6447,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
@@ -5011,7 +4899,7 @@
/* end confdefs.h. */
int
-@@ -6342,38 +6446,13 @@ main ()
+@@ -6342,38 +6458,13 @@ main ()
return 0;
}
_ACEOF
@@ -5054,7 +4942,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6381,7 +6460,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6381,7 +6472,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -5063,7 +4951,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 +6470,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -6391,11 +6482,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5078,7 +4966,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -6421,9 +6500,9 @@ need_locks="$enable_libtool_lock"
+@@ -6421,9 +6512,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
@@ -5090,7 +4978,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -6434,24 +6513,24 @@ for as_dir in $PATH
+@@ -6434,24 +6525,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5120,7 +5008,7 @@
$as_echo "no" >&6; }
fi
-@@ -6461,9 +6540,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -6461,9 +6552,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
@@ -5132,7 +5020,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -6474,24 +6553,24 @@ for as_dir in $PATH
+@@ -6474,24 +6565,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5162,7 +5050,7 @@
$as_echo "no" >&6; }
fi
-@@ -6500,7 +6579,7 @@ fi
+@@ -6500,7 +6591,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5171,7 +5059,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6513,9 +6592,9 @@ fi
+@@ -6513,9 +6604,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
@@ -5183,7 +5071,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -6526,24 +6605,24 @@ for as_dir in $PATH
+@@ -6526,24 +6617,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5213,7 +5101,7 @@
$as_echo "no" >&6; }
fi
-@@ -6553,9 +6632,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -6553,9 +6644,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
@@ -5225,7 +5113,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -6566,24 +6645,24 @@ for as_dir in $PATH
+@@ -6566,24 +6657,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5255,7 +5143,7 @@
$as_echo "no" >&6; }
fi
-@@ -6592,7 +6671,7 @@ fi
+@@ -6592,7 +6683,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5264,7 +5152,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6605,9 +6684,9 @@ fi
+@@ -6605,9 +6696,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
@@ -5276,7 +5164,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -6618,24 +6697,24 @@ for as_dir in $PATH
+@@ -6618,24 +6709,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5306,7 +5194,7 @@
$as_echo "no" >&6; }
fi
-@@ -6645,9 +6724,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -6645,9 +6736,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
@@ -5318,7 +5206,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -6658,24 +6737,24 @@ for as_dir in $PATH
+@@ -6658,24 +6749,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5348,7 +5236,7 @@
$as_echo "no" >&6; }
fi
-@@ -6684,7 +6763,7 @@ fi
+@@ -6684,7 +6775,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5357,7 +5245,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6697,9 +6776,9 @@ fi
+@@ -6697,9 +6788,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
@@ -5369,7 +5257,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -6710,24 +6789,24 @@ for as_dir in $PATH
+@@ -6710,24 +6801,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5399,7 +5287,7 @@
$as_echo "no" >&6; }
fi
-@@ -6737,9 +6816,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -6737,9 +6828,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
@@ -5411,7 +5299,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -6750,24 +6829,24 @@ for as_dir in $PATH
+@@ -6750,24 +6841,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5441,7 +5329,7 @@
$as_echo "no" >&6; }
fi
-@@ -6776,7 +6855,7 @@ fi
+@@ -6776,7 +6867,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5450,7 +5338,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6789,9 +6868,9 @@ fi
+@@ -6789,9 +6880,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
@@ -5462,7 +5350,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -6802,24 +6881,24 @@ for as_dir in $PATH
+@@ -6802,24 +6893,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5492,7 +5380,7 @@
$as_echo "no" >&6; }
fi
-@@ -6829,9 +6908,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -6829,9 +6920,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
@@ -5504,7 +5392,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -6842,24 +6921,24 @@ for as_dir in $PATH
+@@ -6842,24 +6933,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5534,7 +5422,7 @@
$as_echo "no" >&6; }
fi
-@@ -6868,7 +6947,7 @@ fi
+@@ -6868,7 +6959,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5543,7 +5431,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6904,9 +6983,9 @@ fi
+@@ -6904,9 +6995,9 @@ fi
@@ -5555,7 +5443,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -6931,22 +7010,18 @@ else
+@@ -6931,22 +7022,18 @@ else
rm -f conftest.*
fi
fi
@@ -5582,7 +5470,7 @@
/* end confdefs.h. */
int
-@@ -6957,42 +7032,17 @@ main ()
+@@ -6957,42 +7044,17 @@ main ()
return 0;
}
_ACEOF
@@ -5630,7 +5518,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -7034,14 +7084,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -7034,14 +7096,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
@@ -5647,7 +5535,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7056,11 +7106,7 @@ do
+@@ -7056,11 +7118,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.
@@ -5660,7 +5548,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7069,78 +7115,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7069,78 +7127,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5744,7 +5632,7 @@
break
fi
-@@ -7152,7 +7154,7 @@ fi
+@@ -7152,7 +7166,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -5753,7 +5641,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -7163,11 +7165,7 @@ do
+@@ -7163,11 +7177,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.
@@ -5766,7 +5654,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7176,87 +7174,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7176,87 +7186,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -5800,16 +5688,17 @@
-
rm -f conftest.err conftest.$ac_ext
-- # OK, works on sane cases. Now check whether nonexistent headers
-- # can be detected and how.
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -5827,12 +5716,6 @@
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-+ # OK, works on sane cases. Now check whether nonexistent headers
-+ # can be detected and how.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
@@ -5868,7 +5751,7 @@
fi
ac_ext=c
-@@ -7266,16 +7217,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -7266,16 +7229,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5888,7 +5771,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -7290,48 +7237,23 @@ main ()
+@@ -7290,48 +7249,23 @@ main ()
return 0;
}
_ACEOF
@@ -5942,7 +5825,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7341,18 +7263,14 @@ fi
+@@ -7341,18 +7275,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5964,7 +5847,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -7362,14 +7280,10 @@ fi
+@@ -7362,14 +7292,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.
@@ -5981,7 +5864,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -7396,118 +7310,34 @@ main ()
+@@ -7396,118 +7322,34 @@ main ()
return 0;
}
_ACEOF
@@ -6113,7 +5996,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -7517,62 +7347,13 @@ fi
+@@ -7517,62 +7359,13 @@ fi
done
@@ -6181,7 +6064,7 @@
_ACEOF
fi
-@@ -7592,7 +7373,7 @@ done
+@@ -7592,7 +7385,7 @@ done
# Check whether --enable-shared was given.
@@ -6190,7 +6073,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -7625,7 +7406,7 @@ fi
+@@ -7625,7 +7418,7 @@ fi
# Check whether --with-pic was given.
@@ -6199,7 +6082,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -7641,7 +7422,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -7641,7 +7434,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -6208,7 +6091,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -7722,9 +7503,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -7722,9 +7515,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -6220,7 +6103,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7737,7 +7518,7 @@ else
+@@ -7737,7 +7530,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -6229,7 +6112,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -7830,9 +7611,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -7830,9 +7623,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -6241,7 +6124,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7883,10 +7664,10 @@ fi
+@@ -7883,10 +7676,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6254,7 +6137,7 @@
$as_echo "no" >&6; }
fi
-@@ -7896,9 +7677,9 @@ fi
+@@ -7896,9 +7689,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -6266,7 +6149,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7949,10 +7730,10 @@ fi
+@@ -7949,10 +7742,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -6279,7 +6162,7 @@
$as_echo "no" >&6; }
fi
-@@ -8029,9 +7810,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -8029,9 +7822,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -6291,21 +6174,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8047,11 +7828,11 @@ else
+@@ -8047,11 +7840,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:7831: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7843: $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:7835: \$? = $ac_status" >&5
++ echo "$as_me:7847: \$? = $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 +7845,7 @@ else
+@@ -8064,7 +7857,7 @@ else
$RM conftest*
fi
@@ -6314,7 +6197,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -8084,7 +7865,7 @@ fi
+@@ -8084,7 +7877,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -6323,7 +6206,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8216,7 +7997,7 @@ $as_echo_n "checking for $compiler optio
+@@ -8216,7 +8009,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -6332,7 +6215,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -8356,7 +8137,7 @@ case $host_os in
+@@ -8356,7 +8149,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -6341,7 +6224,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -8368,9 +8149,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -8368,9 +8161,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
@@ -6353,21 +6236,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8386,11 +8167,11 @@ else
+@@ -8386,11 +8179,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:8170: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8182: $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:8174: \$? = $ac_status" >&5
++ echo "$as_me:8186: \$? = $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 +8184,7 @@ else
+@@ -8403,7 +8196,7 @@ else
$RM conftest*
fi
@@ -6376,7 +6259,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -8427,9 +8208,9 @@ fi
+@@ -8427,9 +8220,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\"
@@ -6388,7 +6271,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8455,7 +8236,7 @@ else
+@@ -8455,7 +8248,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -6397,7 +6280,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -8470,9 +8251,9 @@ fi
+@@ -8470,9 +8263,9 @@ fi
@@ -6409,21 +6292,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8491,11 +8272,11 @@ else
+@@ -8491,11 +8284,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:8275: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8287: $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:8279: \$? = $ac_status" >&5
++ echo "$as_me:8291: \$? = $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 +8298,7 @@ else
+@@ -8517,7 +8310,7 @@ else
$RM conftest*
fi
@@ -6432,7 +6315,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8525,9 +8306,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -8525,9 +8318,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -6444,21 +6327,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8546,11 +8327,11 @@ else
+@@ -8546,11 +8339,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:8330: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8342: $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:8334: \$? = $ac_status" >&5
++ echo "$as_me:8346: \$? = $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 +8353,7 @@ else
+@@ -8572,7 +8365,7 @@ else
$RM conftest*
fi
@@ -6467,7 +6350,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -8581,7 +8362,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -8581,7 +8374,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
@@ -6476,7 +6359,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -8589,10 +8370,10 @@ $as_echo_n "checking if we can lock with
+@@ -8589,10 +8382,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
@@ -6489,7 +6372,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 +8386,7 @@ fi
+@@ -8605,7 +8398,7 @@ fi
@@ -6498,7 +6381,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -8665,6 +8446,9 @@ $as_echo_n "checking whether the $compil
+@@ -8665,6 +8458,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -6508,7 +6391,7 @@
esac
ld_shlibs=yes
-@@ -8686,6 +8470,7 @@ $as_echo_n "checking whether the $compil
+@@ -8686,6 +8482,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -6516,7 +6399,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 +8562,7 @@ _LT_EOF
+@@ -8777,7 +8574,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'
;;
@@ -6525,7 +6408,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -8847,7 +8632,7 @@ _LT_EOF
+@@ -8847,7 +8644,7 @@ _LT_EOF
fi
;;
@@ -6534,7 +6417,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9022,6 +8807,7 @@ _LT_EOF
+@@ -9022,6 +8819,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -6542,7 +6425,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9047,11 +8833,7 @@ _LT_EOF
+@@ -9047,11 +8845,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6555,7 +6438,7 @@
/* end confdefs.h. */
int
-@@ -9062,27 +8844,7 @@ main ()
+@@ -9062,27 +8856,7 @@ main ()
return 0;
}
_ACEOF
@@ -6584,7 +6467,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9096,16 +8858,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -9096,16 +8870,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
@@ -6603,7 +6486,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9118,11 +8873,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9118,11 +8885,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -6616,7 +6499,7 @@
/* end confdefs.h. */
int
-@@ -9133,27 +8884,7 @@ main ()
+@@ -9133,27 +8896,7 @@ main ()
return 0;
}
_ACEOF
@@ -6645,7 +6528,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9167,16 +8898,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -9167,16 +8910,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
@@ -6664,7 +6547,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9388,42 +9112,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9388,42 +9124,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"
@@ -6712,7 +6595,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 +9134,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9436,7 +9146,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -6721,7 +6604,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 +9377,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9679,7 +9389,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -6730,7 +6613,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -9716,16 +9414,16 @@ x|xyes)
+@@ -9716,16 +9426,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.
@@ -6751,7 +6634,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -9739,11 +9437,11 @@ $as_echo_n "checking whether -lc should
+@@ -9739,11 +9449,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -6766,7 +6649,7 @@
then
archive_cmds_need_lc=no
else
-@@ -9754,7 +9452,7 @@ $as_echo_n "checking whether -lc should
+@@ -9754,7 +9464,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -6775,7 +6658,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -9918,7 +9616,7 @@ esac
+@@ -9918,7 +9628,7 @@ esac
@@ -6784,7 +6667,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -10326,7 +10024,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -10326,7 +10036,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -6793,7 +6676,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10340,11 +10038,7 @@ linux* | k*bsd*-gnu)
+@@ -10340,11 +10050,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -6806,7 +6689,7 @@
/* end confdefs.h. */
int
-@@ -10355,41 +10049,13 @@ main ()
+@@ -10355,41 +10061,13 @@ main ()
return 0;
}
_ACEOF
@@ -6852,7 +6735,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -10398,13 +10064,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10398,13 +10076,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -6867,7 +6750,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10416,6 +10079,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10416,6 +10091,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6886,7 +6769,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10604,7 +10279,7 @@ uts4*)
+@@ -10604,7 +10291,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -6895,7 +6778,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -10706,7 +10381,7 @@ fi
+@@ -10706,7 +10393,7 @@ fi
@@ -6904,7 +6787,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10731,7 +10406,7 @@ else
+@@ -10731,7 +10418,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -6913,32 +6796,109 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -10767,120 +10442,24 @@ else
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
-- ;;
--
-- cygwin*)
-- lt_cv_dlopen="dlopen"
-- lt_cv_dlopen_libs=
-- ;;
--
-- darwin*)
-- # if libdl is installed we need to link against it
+@@ -10776,18 +10463,14 @@ else
+
+ darwin*)
+ # if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++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
+-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_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
+-
+-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_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; }
+-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
+ ;;
+
+ *)
+- { $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
+- $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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); 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 shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -6946,11 +6906,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char dlopen ();
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
-int
-main ()
-{
--return dlopen ();
+-return shl_load ();
- ;
- return 0;
-}
@@ -6976,154 +6943,21 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
+- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dl_dlopen=no
+- ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$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
--
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
--
--fi
-+ ;;
-
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
- ;;
-
-- *)
-- { $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
-+ 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
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); 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 shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -10888,72 +10467,51 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_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
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-+
-+ ;;
-+
-+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
@@ -7146,7 +6980,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -10971,145 +10529,32 @@ return shl_load ();
+@@ -10971,145 +10541,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -7303,7 +7137,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11127,57 +10572,28 @@ return dlopen ();
+@@ -11127,57 +10584,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7370,7 +7204,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11195,57 +10611,28 @@ return dlopen ();
+@@ -11195,57 +10623,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -7437,7 +7271,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11263,43 +10650,18 @@ return dld_link ();
+@@ -11263,43 +10662,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -7487,7 +7321,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -11338,9 +10700,9 @@ fi
+@@ -11338,9 +10712,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -7499,16 +7333,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11349,7 +10711,7 @@ else
+@@ -11349,7 +10723,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 10714 "configure"
++#line 10726 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11408,11 +10770,11 @@ int main ()
+@@ -11408,11 +10782,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7523,7 +7357,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11429,14 +10791,14 @@ rm -fr conftest*
+@@ -11429,14 +10803,14 @@ rm -fr conftest*
fi
@@ -7541,16 +7375,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11445,7 +10807,7 @@ else
+@@ -11445,7 +10819,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 10810 "configure"
++#line 10822 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11504,11 +10866,11 @@ int main ()
+@@ -11504,11 +10878,11 @@ int main ()
return status;
}
_LT_EOF
@@ -7565,7 +7399,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -11525,7 +10887,7 @@ rm -fr conftest*
+@@ -11525,7 +10899,7 @@ rm -fr conftest*
fi
@@ -7574,7 +7408,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -11564,12 +10926,12 @@ fi
+@@ -11564,12 +10938,12 @@ fi
striplib=
old_striplib=
@@ -7589,7 +7423,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -11578,15 +10940,15 @@ else
+@@ -11578,15 +10952,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -7608,7 +7442,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -11604,12 +10966,12 @@ fi
+@@ -11604,12 +10978,12 @@ fi
# Report which library types will actually be built
@@ -7624,7 +7458,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -11630,14 +10992,14 @@ $as_echo_n "checking whether to build sh
+@@ -11630,14 +11004,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -7642,7 +7476,7 @@
$as_echo "$enable_static" >&6; }
-@@ -11681,9 +11043,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -11681,9 +11055,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
@@ -7654,7 +7488,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11694,24 +11056,24 @@ for as_dir in $PATH
+@@ -11694,24 +11068,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7684,7 +7518,7 @@
$as_echo "no" >&6; }
fi
-@@ -11721,9 +11083,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -11721,9 +11095,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
@@ -7696,7 +7530,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11734,24 +11096,24 @@ for as_dir in $PATH
+@@ -11734,24 +11108,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7726,7 +7560,7 @@
$as_echo "no" >&6; }
fi
-@@ -11760,7 +11122,7 @@ fi
+@@ -11760,7 +11134,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7735,7 +7569,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11774,9 +11136,9 @@ if test -z "$CC"; then
+@@ -11774,9 +11148,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
@@ -7747,7 +7581,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11787,24 +11149,24 @@ for as_dir in $PATH
+@@ -11787,24 +11161,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7777,7 +7611,7 @@
$as_echo "no" >&6; }
fi
-@@ -11814,9 +11176,9 @@ fi
+@@ -11814,9 +11188,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
@@ -7789,7 +7623,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11828,18 +11190,18 @@ for as_dir in $PATH
+@@ -11828,18 +11202,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7811,7 +7645,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -11858,10 +11220,10 @@ fi
+@@ -11858,10 +11232,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7824,7 +7658,7 @@
$as_echo "no" >&6; }
fi
-@@ -11873,9 +11235,9 @@ if test -z "$CC"; then
+@@ -11873,9 +11247,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
@@ -7836,7 +7670,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -11886,24 +11248,24 @@ for as_dir in $PATH
+@@ -11886,24 +11260,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7866,7 +7700,7 @@
$as_echo "no" >&6; }
fi
-@@ -11917,9 +11279,9 @@ if test -z "$CC"; then
+@@ -11917,9 +11291,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
@@ -7878,7 +7712,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -11930,24 +11292,24 @@ for as_dir in $PATH
+@@ -11930,24 +11304,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7908,7 +7742,7 @@
$as_echo "no" >&6; }
fi
-@@ -11960,7 +11322,7 @@ done
+@@ -11960,7 +11334,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7917,7 +7751,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -11971,62 +11333,42 @@ fi
+@@ -11971,62 +11345,42 @@ fi
fi
@@ -7949,17 +7783,6 @@
- $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
@@ -7968,11 +7791,22 @@
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
@@ -8002,7 +7836,7 @@
/* end confdefs.h. */
int
-@@ -12040,37 +11382,16 @@ main ()
+@@ -12040,37 +11394,16 @@ main ()
return 0;
}
_ACEOF
@@ -8043,7 +7877,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -12079,20 +11400,16 @@ else
+@@ -12079,20 +11412,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8067,7 +7901,7 @@
/* end confdefs.h. */
int
-@@ -12103,75 +11420,27 @@ main ()
+@@ -12103,35 +11432,11 @@ main ()
return 0;
}
_ACEOF
@@ -8106,13 +7940,10 @@
/* end confdefs.h. */
int
- main ()
- {
-
-- ;
-- return 0;
--}
--_ACEOF
+@@ -12142,36 +11447,12 @@ main ()
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8135,10 +7966,6 @@
-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_c_werror_flag=$ac_save_c_werror_flag
@@ -8154,7 +7981,7 @@
/* end confdefs.h. */
int
-@@ -12182,42 +11451,17 @@ main ()
+@@ -12182,42 +11463,17 @@ main ()
return 0;
}
_ACEOF
@@ -8199,7 +8026,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -12234,18 +11478,14 @@ else
+@@ -12234,18 +11490,14 @@ else
CFLAGS=
fi
fi
@@ -8221,7 +8048,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -12302,32 +11542,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -12302,32 +11554,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8255,7 +8082,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -12338,17 +11555,19 @@ fi
+@@ -12338,17 +11567,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8278,7 +8105,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -12358,9 +11577,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -12358,9 +11589,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8290,7 +8117,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -12468,7 +11687,7 @@ else
+@@ -12468,7 +11699,7 @@ else
fi
fi
@@ -8299,7 +8126,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -12483,16 +11702,12 @@ else
+@@ -12483,16 +11714,12 @@ else
fi
@@ -8319,7 +8146,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -12507,48 +11722,23 @@ main ()
+@@ -12507,48 +11734,23 @@ main ()
return 0;
}
_ACEOF
@@ -8373,7 +8200,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -12558,18 +11748,14 @@ fi
+@@ -12558,18 +11760,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8395,7 +8222,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -12579,14 +11765,10 @@ fi
+@@ -12579,14 +11777,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.
@@ -8412,7 +8239,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -12613,567 +11795,119 @@ main ()
+@@ -12613,51 +11807,22 @@ main ()
return 0;
}
_ACEOF
@@ -8443,47 +8270,38 @@
- $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
--fi
++else
++ ac_cv_header_stdc=no
+ fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+-
+ fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
++{ $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
+
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
--
--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/"
++$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/"
-_ACEOF
-
- else
@@ -8642,8 +8460,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+if ac_fn_c_try_run "$LINENO"; then :
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -8652,10 +8469,9 @@
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- has_cam="yes"
- else
+-else
- has_cam="no"
-+ ac_cv_header_stdc=no
- fi
+-fi
-
-done
-
@@ -8744,47 +8560,32 @@
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_sg_io_hdr_t=yes
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-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
-+{ $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
-
+-
+-
+-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
-+if test "x${datadir}" = 'x${prefix}/share'; then
-+ if test "x${prefix}" = "xNONE"; then
-
- cat >>confdefs.h <<_ACEOF
+-
+-cat >>confdefs.h <<_ACEOF
-#define HAVE_SG_IO_HDR_T 1
-+#define PACKAGE_DATA_DIR "${ac_default_prefix}/share/"
- _ACEOF
-
+-_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
@@ -8793,20 +8594,13 @@
- ac_cv_type_scsireq_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+ 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
+-_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 ()
-{
@@ -8815,11 +8609,7 @@
- ;
- return 0;
-}
-+ else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATA_DIR "${prefix}/share/"
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8840,19 +8630,13 @@
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+
-+ fi
-+ else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATA_DIR "${datarootdir}/"
- _ACEOF
+-_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 ()
-{
@@ -8861,12 +8645,7 @@
- ;
- return 0;
-}
-+ fi
-+ else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATA_DIR "${datadir}/"
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8889,50 +8668,44 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++_ACEOF
- ac_cv_type_scsireq_t=yes
- fi
+-fi
++ else
-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
-+ has_cam="yes"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ has_cam="no"
-+fi
-
-+done
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_DATA_DIR "${prefix}/share/"
++_ACEOF
+
++ fi
++ else
-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
-+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 :
++ fi
++ else
cat >>confdefs.h <<_ACEOF
-#define HAVE_SCSIREQ_T 1
-+#define HAVE_SG_IO_HDR_T 1
++#define PACKAGE_DATA_DIR "${datadir}/"
_ACEOF
-has_scsiio="yes"
-+has_sg="yes"
- else
+-else
- has_scsiio="no"
-+ has_sg="no"
fi
@@ -8944,16 +8717,22 @@
- ac_cv_type_struct_uscsi_cmd=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
- #include <sys/scsi/impl/uscsi.h>
-+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 :
++ has_cam="yes"
++else
++ has_cam="no"
++fi
-int
-main ()
@@ -8984,14 +8763,13 @@
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SCSIREQ_T 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>
++done
-int
-main ()
@@ -9001,7 +8779,15 @@
- ;
- return 0;
-}
--_ACEOF
++
++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
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -9021,28 +8807,41 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-+has_scsiio="yes"
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_cv_type_struct_uscsi_cmd=yes
-+ has_scsiio="no"
++has_sg="yes"
++else
++ has_sg="no"
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
--
+
++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
--fi
++has_scsiio="yes"
++else
++ has_scsiio="no"
+ 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>
+"
@@ -9050,7 +8849,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_USCSI_CMD 1
-@@ -13194,9 +11928,7 @@ elif test x"$has_scsiio" = x"yes"; then
+@@ -13194,9 +11940,7 @@ elif test x"$has_scsiio" = x"yes"; then
elif test x"$has_uscsi" = x"yes"; then
:
else
@@ -9061,7 +8860,7 @@
fi
if test x"$has_cam" = "xyes"; then
-@@ -13234,15 +11966,15 @@ fi
+@@ -13234,15 +11978,15 @@ fi
# Check whether --enable-largefile was given.
@@ -9080,7 +8879,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -13251,11 +11983,7 @@ else
+@@ -13251,11 +11995,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.
@@ -9093,7 +8892,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13274,60 +12002,14 @@ main ()
+@@ -13274,60 +12014,14 @@ main ()
return 0;
}
_ACEOF
@@ -9156,7 +8955,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -13335,23 +12017,19 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -13335,23 +12029,19 @@ rm -f core conftest.err conftest.$ac_obj
rm -f conftest.$ac_ext
fi
fi
@@ -9184,7 +8983,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13370,38 +12048,11 @@ main ()
+@@ -13370,38 +12060,11 @@ main ()
return 0;
}
_ACEOF
@@ -9225,7 +9024,7 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -13421,38 +12072,15 @@ main ()
+@@ -13421,38 +12084,15 @@ main ()
return 0;
}
_ACEOF
@@ -9266,7 +9065,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -13464,17 +12092,13 @@ _ACEOF
+@@ -13464,17 +12104,13 @@ _ACEOF
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -9287,7 +9086,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13493,38 +12117,11 @@ main ()
+@@ -13493,38 +12129,11 @@ main ()
return 0;
}
_ACEOF
@@ -9328,7 +9127,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -13544,38 +12141,15 @@ main ()
+@@ -13544,38 +12153,15 @@ main ()
return 0;
}
_ACEOF
@@ -9369,7 +9168,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -13609,9 +12183,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -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
@@ -9381,7 +9180,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13624,14 +12198,14 @@ for as_dir in $PATH
+@@ -13624,14 +12210,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9399,7 +9198,7 @@
IFS=$as_save_IFS
;;
-@@ -13639,10 +12213,10 @@ esac
+@@ -13639,10 +12225,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -9412,7 +9211,7 @@
$as_echo "no" >&6; }
fi
-@@ -13652,9 +12226,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -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
@@ -9424,7 +9223,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13667,14 +12241,14 @@ for as_dir in $PATH
+@@ -13667,14 +12253,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9442,7 +9241,7 @@
IFS=$as_save_IFS
;;
-@@ -13682,10 +12256,10 @@ esac
+@@ -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
@@ -9455,7 +9254,7 @@
$as_echo "no" >&6; }
fi
-@@ -13694,7 +12268,7 @@ fi
+@@ -13694,7 +12280,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9464,7 +9263,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13707,13 +12281,13 @@ fi
+@@ -13707,13 +12293,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -9481,81 +9280,50 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13721,58 +12295,54 @@ $as_echo "no" >&6; }
- fi
-
-
-- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
--set dummy gtkdoc-check; ac_word=$2
+@@ -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_n "checking for $ac_word... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+# Check whether --with-html-dir was given.
-+if test "${with_html_dir+set}" = set; then :
-+ withval=$with_html_dir;
- else
-- case $GTKDOC_CHECK in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++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
-- 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"
++ 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
-- break 2
-- fi
++ $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
-+ with_html_dir='${datadir}/gtk-doc/html'
-+fi
-
-- ;;
--esac
-+ HTML_DIR="$with_html_dir"
-+
-+
-+ # Check whether --enable-gtk-doc was given.
-+if test "${enable_gtk_doc+set}" = set; then :
-+ enableval=$enable_gtk_doc;
-+else
-+ enable_gtk_doc=no
- fi
--GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
--if test -n "$GTKDOC_CHECK"; then
++ 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 "$GTKDOC_CHECK" >&6; }
-+
-+
-+ if test x$enable_gtk_doc = xyes; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ :
++ { $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 "no" >&6; }
-+ as_fn_error "You need to have gtk-doc >= 1.3 installed to build gtk-doc" "$LINENO" 5
- fi
-+ fi
-
-+ { $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:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-+$as_echo "$enable_gtk_doc" >&6; }
-
-- for ac_prog in gtkdoc-rebase
-+ for ac_prog in gtkdoc-check
++ { $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
@@ -9563,27 +9331,19 @@
+{ $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_CHECK+set}" = set; then :
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- case $GTKDOC_REBASE in
-+ case $GTKDOC_CHECK in
- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
-+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -13780,131 +12350,31 @@ for as_dir in $PATH
+ 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"
+ 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
-+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -9593,165 +9353,123 @@
IFS=$as_save_IFS
;;
- esac
- fi
--GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
--if test -n "$GTKDOC_REBASE"; then
+@@ -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 "$GTKDOC_REBASE" >&6; }
-+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-+if test -n "$GTKDOC_CHECK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
++ { $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
-
-- test -n "$GTKDOC_REBASE" && break
--done
--test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
--
-- # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
--set dummy gtkdoc-mkpdf; ac_word=$2
+@@ -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_n "checking for $ac_word... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_MKPDF in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++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
-- 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"
++ 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
-- break 2
-- fi
-+ test -n "$GTKDOC_CHECK" && break
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
-done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
--if test -n "$GTKDOC_MKPDF"; then
++ 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 "$GTKDOC_MKPDF" >&6; }
--else
++ { $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 "no" >&6; }
--fi
--
--
--
--
--# Check whether --with-html-dir was given.
++ { $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
-- withval=$with_html_dir;
--else
-- with_html_dir='${datadir}/gtk-doc/html'
--fi
--
-- HTML_DIR="$with_html_dir"
--
--
-- # Check whether --enable-gtk-doc was given.
++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
-- enableval=$enable_gtk_doc;
--else
-- enable_gtk_doc=no
--fi
--
--
-- if test x$enable_gtk_doc = xyes; then
-- if test -n "$PKG_CONFIG" && \
++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
-- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.3") 2>&5
-- ac_status=$?
++ { { $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
-- :
--else
++ $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; }; }
--fi
-- fi
--
++ 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_n "checking whether to build gtk-doc documentation... " >&6; }
++ { $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 "$enable_gtk_doc" >&6; }
--
-- # Check whether --enable-gtk-doc-html was given.
++ { $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
-- 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_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
-- enableval=$enable_gtk_doc_pdf;
--else
-- enable_gtk_doc_pdf=no
--fi
--
--
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
-
-
- if test x$enable_gtk_doc = xyes; then
-@@ -13915,22 +12385,6 @@ else
- ENABLE_GTK_DOC_FALSE=
- fi
-
-- if test x$enable_gtk_doc_html = xyes; then
-- GTK_DOC_BUILD_HTML_TRUE=
-- GTK_DOC_BUILD_HTML_FALSE='#'
--else
-- GTK_DOC_BUILD_HTML_TRUE='#'
-- GTK_DOC_BUILD_HTML_FALSE=
--fi
--
-- if test x$enable_gtk_doc_pdf = xyes; then
-- GTK_DOC_BUILD_PDF_TRUE=
-- GTK_DOC_BUILD_PDF_FALSE='#'
--else
-- GTK_DOC_BUILD_PDF_TRUE='#'
-- GTK_DOC_BUILD_PDF_FALSE=
--fi
--
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -13939,47 +12393,37 @@ else
- GTK_DOC_USE_LIBTOOL_FALSE=
- fi
-
-- if test -n "$GTKDOC_REBASE"; then
-- GTK_DOC_USE_REBASE_TRUE=
-- GTK_DOC_USE_REBASE_FALSE='#'
--else
-- GTK_DOC_USE_REBASE_TRUE='#'
-- GTK_DOC_USE_REBASE_FALSE=
--fi
--
-
++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
@@ -9795,7 +9513,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -13990,7 +12434,7 @@ HELP_DIR="$with_help_dir"
+@@ -13990,7 +12572,7 @@ HELP_DIR="$with_help_dir"
# Check whether --with-omf-dir was given.
@@ -9804,7 +9522,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -14001,7 +12445,7 @@ OMF_DIR="$with_omf_dir"
+@@ -14001,7 +12583,7 @@ OMF_DIR="$with_omf_dir"
# Check whether --with-help-formats was given.
@@ -9813,7 +9531,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -14011,7 +12455,7 @@ DOC_USER_FORMATS="$with_help_formats"
+@@ -14011,7 +12593,7 @@ DOC_USER_FORMATS="$with_help_formats"
# Check whether --enable-scrollkeeper was given.
@@ -9822,7 +9540,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -14042,24 +12486,25 @@ fi
+@@ -14042,24 +12624,25 @@ fi
pkg_failed=no
@@ -9857,7 +9575,7 @@
pkg_cv_BRASERO_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "\
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
-@@ -14067,24 +12512,26 @@ if test -n "$BRASERO_GSTREAMER_CFLAGS";
+@@ -14067,24 +12650,26 @@ if test -n "$BRASERO_GSTREAMER_CFLAGS";
else
pkg_failed=yes
fi
@@ -9894,7 +9612,7 @@
pkg_cv_BRASERO_GSTREAMER_LIBS=`$PKG_CONFIG --libs "\
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
-@@ -14092,8 +12539,9 @@ if test -n "$BRASERO_GSTREAMER_LIBS"; th
+@@ -14092,8 +12677,9 @@ if test -n "$BRASERO_GSTREAMER_LIBS"; th
else
pkg_failed=yes
fi
@@ -9906,7 +9624,7 @@
fi
-@@ -14106,20 +12554,20 @@ else
+@@ -14106,34 +12692,20 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -9928,28 +9646,28 @@
echo "$BRASERO_GSTREAMER_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
+- gstreamer-0.10 >= $GSTREAMER_REQUIRED \
+- gstreamer-interfaces-0.10 \
+- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
+-
+-$BRASERO_GSTREAMER_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_GSTREAMER_CFLAGS
+-and BRASERO_GSTREAMER_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 (\
gstreamer-0.10 >= $GSTREAMER_REQUIRED \
gstreamer-interfaces-0.10 \
gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
-@@ -14132,36 +12580,11 @@ installed software in a non-standard pre
+@@ -14146,22 +12718,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.
--" >&5
--$as_echo "$as_me: error: Package requirements (\
-- gstreamer-0.10 >= $GSTREAMER_REQUIRED \
-- gstreamer-interfaces-0.10 \
-- gstreamer-plugins-base-0.10 >= $GSTREAMER_BASE_REQUIRED) were not met:
--
--$BRASERO_GSTREAMER_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_GSTREAMER_CFLAGS
--and BRASERO_GSTREAMER_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
@@ -9972,7 +9690,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14170,12 +12593,11 @@ and BRASERO_GSTREAMER_LIBS to avoid the
+@@ -14170,12 +12731,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/>.
@@ -9987,7 +9705,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14187,46 +12609,50 @@ BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAM
+@@ -14187,46 +12747,50 @@ BRASERO_GSTREAMER_LIBS="$BRASERO_GSTREAM
pkg_failed=no
@@ -10059,7 +9777,7 @@
fi
-@@ -14239,28 +12665,16 @@ else
+@@ -14239,28 +12803,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10075,7 +9793,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:
-
@@ -10089,11 +9807,12 @@
-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 +12685,11 @@ installed software in a non-standard pre
+@@ -14271,22 +12823,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.
@@ -10119,7 +9838,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14295,12 +12698,11 @@ and BRASERO_GIO_LIBS to avoid the need t
+@@ -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/>.
@@ -10134,7 +9853,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14310,46 +12712,50 @@ fi
+@@ -14310,46 +12850,50 @@ fi
pkg_failed=no
@@ -10206,7 +9925,7 @@
fi
-@@ -14362,28 +12768,16 @@ else
+@@ -14362,28 +12906,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10240,7 +9959,7 @@
libxml-2.0 >= $LIBXML2_REQUIRED) were not met:
$BRASERO_LIBXML_PKG_ERRORS
-@@ -14394,22 +12788,11 @@ installed software in a non-standard pre
+@@ -14394,22 +12926,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.
@@ -10266,7 +9985,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14418,12 +12801,11 @@ and BRASERO_LIBXML_LIBS to avoid the nee
+@@ -14418,12 +12939,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/>.
@@ -10281,7 +10000,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14433,46 +12815,50 @@ fi
+@@ -14433,46 +12953,50 @@ fi
pkg_failed=no
@@ -10353,7 +10072,7 @@
fi
-@@ -14485,28 +12871,16 @@ else
+@@ -14485,28 +13009,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10387,7 +10106,7 @@
unique-1.0 >= $LIBUNIQUE_REQUIRED) were not met:
$BRASERO_LIBUNIQUE_PKG_ERRORS
-@@ -14517,12 +12891,11 @@ installed software in a non-standard pre
+@@ -14517,22 +13029,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.
@@ -10399,24 +10118,24 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
+-and BRASERO_LIBUNIQUE_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.
-@@ -14531,22 +12904,11 @@ and BRASERO_LIBUNIQUE_LIBS to avoid the
+@@ -14541,12 +13042,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/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables BRASERO_LIBUNIQUE_CFLAGS
--and BRASERO_LIBUNIQUE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -10428,7 +10147,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14556,46 +12918,50 @@ fi
+@@ -14556,46 +13056,50 @@ fi
pkg_failed=no
@@ -10500,7 +10219,7 @@
fi
-@@ -14608,28 +12974,16 @@ else
+@@ -14608,28 +13112,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10534,7 +10253,7 @@
gthread-2.0 >= $GTHREAD_REQUIRED) were not met:
$BRASERO_GTHREAD_PKG_ERRORS
-@@ -14640,22 +12994,11 @@ installed software in a non-standard pre
+@@ -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.
@@ -10560,7 +10279,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14664,12 +13007,11 @@ and BRASERO_GTHREAD_LIBS to avoid the ne
+@@ -14664,12 +13145,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/>.
@@ -10575,7 +10294,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14679,52 +13021,56 @@ fi
+@@ -14679,52 +13159,56 @@ fi
pkg_failed=no
@@ -10653,7 +10372,7 @@
fi
-@@ -14737,31 +13083,18 @@ else
+@@ -14737,31 +13221,18 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10690,7 +10409,7 @@
gobject-2.0 >= $GLIB_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED) were not met:
-@@ -14773,22 +13106,11 @@ installed software in a non-standard pre
+@@ -14773,22 +13244,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.
@@ -10716,7 +10435,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14797,12 +13119,11 @@ and BRASERO_GLIB_LIBS to avoid the need
+@@ -14797,12 +13257,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/>.
@@ -10731,7 +10450,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14812,46 +13133,50 @@ fi
+@@ -14812,46 +13271,50 @@ fi
pkg_failed=no
@@ -10803,7 +10522,7 @@
fi
-@@ -14864,28 +13189,16 @@ else
+@@ -14864,28 +13327,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10837,7 +10556,7 @@
gconf-2.0 >= $GCONF_REQUIRED) were not met:
$BRASERO_GCONF_PKG_ERRORS
-@@ -14896,22 +13209,11 @@ installed software in a non-standard pre
+@@ -14896,22 +13347,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.
@@ -10863,7 +10582,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14920,12 +13222,11 @@ and BRASERO_GCONF_LIBS to avoid the need
+@@ -14920,12 +13360,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/>.
@@ -10878,7 +10597,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14935,46 +13236,50 @@ fi
+@@ -14935,46 +13374,50 @@ fi
pkg_failed=no
@@ -10950,7 +10669,7 @@
fi
-@@ -14987,28 +13292,16 @@ else
+@@ -14987,16 +13430,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -10968,6 +10687,16 @@
echo "$BRASERO_GMODULE_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: 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
+ 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
@@ -10978,16 +10707,6 @@
-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
-@@ -15019,22 +13312,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.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -11010,7 +10729,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15043,12 +13325,11 @@ and BRASERO_GMODULE_LIBS to avoid the ne
+@@ -15043,12 +13463,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/>.
@@ -11025,7 +10744,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15058,52 +13339,56 @@ fi
+@@ -15058,52 +13477,56 @@ fi
pkg_failed=no
@@ -11103,7 +10822,7 @@
fi
-@@ -15116,31 +13401,18 @@ else
+@@ -15116,31 +13539,18 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11140,7 +10859,7 @@
gdk-2.0 >= $GDK_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED) were not met:
-@@ -15152,22 +13424,11 @@ installed software in a non-standard pre
+@@ -15152,22 +13562,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.
@@ -11166,7 +10885,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15176,12 +13437,11 @@ and BRASERO_GTK_LIBS to avoid the need t
+@@ -15176,12 +13575,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/>.
@@ -11181,7 +10900,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15191,46 +13451,50 @@ fi
+@@ -15191,46 +13589,50 @@ fi
pkg_failed=no
@@ -11253,7 +10972,7 @@
fi
-@@ -15243,16 +13507,16 @@ else
+@@ -15243,28 +13645,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11271,26 +10990,26 @@
echo "$BRASERO_DBUS_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (\
+- dbus-glib-1 >= $DBUS_REQUIRED) were not met:
+-
+-$BRASERO_DBUS_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_DBUS_CFLAGS
+-and BRASERO_DBUS_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 (\
dbus-glib-1 >= $DBUS_REQUIRED) were not met:
$BRASERO_DBUS_PKG_ERRORS
-@@ -15263,34 +13527,11 @@ installed software in a non-standard pre
+@@ -15275,22 +13665,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.
--" >&5
--$as_echo "$as_me: error: Package requirements (\
-- dbus-glib-1 >= $DBUS_REQUIRED) were not met:
--
--$BRASERO_DBUS_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_DBUS_CFLAGS
--and BRASERO_DBUS_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
@@ -11313,7 +11032,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15299,12 +13540,11 @@ and BRASERO_DBUS_LIBS to avoid the need
+@@ -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/>.
@@ -11328,7 +11047,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15314,46 +13554,50 @@ fi
+@@ -15314,46 +13692,50 @@ fi
pkg_failed=no
@@ -11348,16 +11067,18 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-+ sm\""; } >&5
++ ice sm\""; } >&5
($PKG_CONFIG --exists --print-errors "\
- sm") 2>&5
+- sm") 2>&5
++ ice sm") 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_SM_CFLAGS=`$PKG_CONFIG --cflags "\
- sm" 2>/dev/null`
+- sm" 2>/dev/null`
++ ice sm" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11379,16 +11100,18 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-+ sm\""; } >&5
++ ice sm\""; } >&5
($PKG_CONFIG --exists --print-errors "\
- sm") 2>&5
+- sm") 2>&5
++ ice sm") 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_SM_LIBS=`$PKG_CONFIG --libs "\
- sm" 2>/dev/null`
+- sm" 2>/dev/null`
++ ice sm" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11400,23 +11123,20 @@
fi
-@@ -15366,28 +13610,16 @@ else
+@@ -15365,30 +13747,18 @@ if $PKG_CONFIG --atleast-pkgconfig-versi
+ 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`
-+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-+ sm"`
- else
+- else
- BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
- sm" 2>&1`
-+ BRASERO_SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-+ sm"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BRASERO_SM_PKG_ERRORS" >&5
-
+- 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:
-
@@ -11424,17 +11144,28 @@
-
-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.
-" >&5
-$as_echo "$as_me: error: Package requirements (\
+- sm) were not met:
+ as_fn_error "Package requirements (\
- sm) were not met:
++ ice sm) were not met:
$BRASERO_SM_PKG_ERRORS
-@@ -15398,22 +13630,11 @@ installed software in a non-standard pre
+
+@@ -15398,22 +13768,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.
@@ -11460,7 +11191,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -15422,12 +13643,11 @@ and BRASERO_SM_LIBS to avoid the need to
+@@ -15422,12 +13781,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/>.
@@ -11475,7 +11206,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -15438,7 +13658,7 @@ fi
+@@ -15438,7 +13796,7 @@ fi
NAUTILUS_REQUIRED=2.22.2
# Check whether --enable-nautilus was given.
@@ -11484,7 +11215,7 @@
enableval=$enable_nautilus; enable_nautilus=$enableval
else
enable_nautilus="yes"
-@@ -15447,7 +13667,7 @@ fi
+@@ -15447,7 +13805,7 @@ fi
# Check whether --with-nautilusdir was given.
@@ -11493,7 +11224,7 @@
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
else
ac_with_nautilusdir=""
-@@ -15457,40 +13677,44 @@ fi
+@@ -15457,40 +13815,44 @@ fi
if test x"$enable_nautilus" = "xyes"; then
pkg_failed=no
@@ -11557,7 +11288,7 @@
fi
-@@ -15503,14 +13727,14 @@ else
+@@ -15503,14 +13865,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11575,7 +11306,7 @@
$as_echo "no" >&6; }
build_nautilus=no
elif test $pkg_failed = untried; then
-@@ -15518,7 +13742,7 @@ 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
@@ -11584,23 +11315,17 @@
$as_echo "yes" >&6; }
build_nautilus=yes
fi
-@@ -15527,159 +13751,25 @@ else
- 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
--
+@@ -15534,152 +13896,18 @@ if test x"$build_nautilus" = "xyes"; the
+ 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: installing plugin in ${ac_with_nautilusdir}" >&6;}
-- NAUTILUSDIR=${ac_with_nautilusdir}
--
--
--
++ { $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}
+
+
+
-
-for ac_header in locale.h
-do
@@ -11690,22 +11415,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
-+ NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
-
+-
- ac_header_preproc=no
-fi
-+ if test "${ac_with_nautilusdir}" = ""; then
-+ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
-+ fi
-
+-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&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}
-
+-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
@@ -11728,7 +11445,7 @@
-$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;}
-
+-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -11742,7 +11459,7 @@
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
+-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
@@ -11757,7 +11474,7 @@
_ACEOF
fi
-@@ -15687,16 +13777,12 @@ fi
+@@ -15687,16 +13915,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -11777,7 +11494,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -15707,46 +13793,19 @@ return LC_MESSAGES
+@@ -15707,46 +13931,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -11830,7 +11547,7 @@
fi
fi
-@@ -15759,150 +13818,20 @@ _ACEOF
+@@ -15759,150 +13956,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -11986,7 +11703,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -15915,54 +13844,25 @@ return !ngettext ("","", 1)
+@@ -15915,201 +13982,57 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -12034,22 +11751,213 @@
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
- $as_echo_n "checking for dgettext in libc... " >&6; }
+-$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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. */
- #include <libintl.h>
-@@ -15975,141 +13875,26 @@ return !dgettext ("","")
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16153,55 +14072,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -12075,13 +11983,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_dgettext_libc=yes
+ ac_cv_lib_intl_bindtextdomain=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_dgettext_libc=no
+- ac_cv_lib_intl_bindtextdomain=no
++ ac_cv_lib_intl_bindtextdomain=no
fi
-
-rm -rf conftest.dSYM
@@ -12089,14 +11997,293 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
- 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
+ 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
-
-for ac_func in bind_textdomain_codeset
-do
@@ -12191,7 +12378,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 :
@@ -12201,367 +12388,42 @@
_ACEOF
fi
-@@ -16124,18 +13909,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 :
+@@ -16613,15 +14301,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_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+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 +13934,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
- 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 +13971,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 +14008,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 +14029,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.
-@@ -16359,60 +14053,31 @@ char ngettext ();
- int
- main ()
- {
--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
-+return ngettext ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+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 +14095,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 +14128,12 @@ fi
+ 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
glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
+ 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
@@ -12654,100 +12516,122 @@
-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 dcgettext
+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 :
++ 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_BIND_TEXTDOMAIN_CODESET 1
++#define HAVE_DCGETTEXT 1
_ACEOF
fi
-@@ -16613,15 +14163,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
+ 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
-{ $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 :
+-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 "$MSGFMT" in
-@@ -16646,118 +14194,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; }
+ 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; }
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
- 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
+
+
+ # 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; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
+- { $as_echo "$as_me:$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
-/* 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 ()
-{
--return $ac_func ();
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
- ;
- return 0;
-}
@@ -12773,140 +12657,70 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- eval "$as_ac_var=yes"
--else
+- CATOBJEXT=.gmo
+- DATADIRNAME=share
++if test "$XGETTEXT" != ":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
++$as_echo "$XGETTEXT" >&6; }
+ 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
-
-@@ -16772,14 +14230,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 +14245,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
-@@ -16802,14 +14260,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 +14276,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
-
-
- # 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
-@@ -16855,18 +14313,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
++$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
-/* 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
-@@ -16878,121 +14332,14 @@ extern int _nl_msg_cat_cntr;
+ main ()
+ {
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
+ ;
return 0;
}
_ACEOF
@@ -12931,89 +12745,11 @@
- 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
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -13027,12 +12763,14 @@
-{ $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 +14354,8 @@ fi
+@@ -17007,10 +14492,8 @@ fi
;;
esac
fi
@@ -13045,7 +12783,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -17024,9 +14369,7 @@ fi
+@@ -17024,9 +14507,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -13056,7 +12794,7 @@
fi
-@@ -17034,7 +14377,7 @@ _ACEOF
+@@ -17034,7 +14515,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -13065,7 +12803,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -17067,7 +14410,7 @@ $as_echo "found xgettext program is not
+@@ -17067,7 +14548,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -13074,7 +12812,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -17092,7 +14435,7 @@ $as_echo_n "checking for catalogs to be
+@@ -17092,7 +14573,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -13083,7 +12821,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -17159,7 +14502,7 @@ LIBBURN_REQUIRED=0.4.0
+@@ -17159,7 +14640,7 @@ LIBBURN_REQUIRED=0.4.0
LIBISOFS_REQUIRED=0.6.4
# Check whether --enable-libburnia was given.
@@ -13092,7 +12830,7 @@
enableval=$enable_libburnia; enable_libburnia=$enableval
else
enable_libburnia="yes"
-@@ -17169,40 +14512,44 @@ fi
+@@ -17169,40 +14650,44 @@ fi
if test x"$enable_libburnia" = "xyes"; then
pkg_failed=no
@@ -13156,7 +12894,7 @@
fi
-@@ -17215,14 +14562,14 @@ else
+@@ -17215,14 +14700,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13174,7 +12912,7 @@
$as_echo "no" >&6; }
build_libburnia=no
elif test $pkg_failed = untried; then
-@@ -17230,7 +14577,7 @@ elif test $pkg_failed = untried; then
+@@ -17230,7 +14715,7 @@ elif test $pkg_failed = untried; then
else
LIBBURNIA_CFLAGS=$pkg_cv_LIBBURNIA_CFLAGS
LIBBURNIA_LIBS=$pkg_cv_LIBBURNIA_LIBS
@@ -13183,7 +12921,7 @@
$as_echo "yes" >&6; }
build_libburnia=yes
fi
-@@ -17245,9 +14592,7 @@ if test x"$build_libburnia" = "xyes"; th
+@@ -17245,9 +14730,7 @@ if test x"$build_libburnia" = "xyes"; th
BRASERO_LIBBURNIA_CFLAGS="$LIBBURNIA_CFLAGS"
BRASERO_LIBBURNIA_LIBS="$LIBBURNIA_LIBS"
@@ -13194,7 +12932,7 @@
fi
if test x"$build_libburnia" = "xyes"; then
-@@ -17260,7 +14605,7 @@ fi
+@@ -17260,7 +14743,7 @@ fi
# Check whether --enable-cdrtools was given.
@@ -13203,7 +12941,7 @@
enableval=$enable_cdrtools; build_cdrtools=$enableval
else
build_cdrtools="yes"
-@@ -17269,9 +14614,7 @@ fi
+@@ -17269,9 +14752,7 @@ fi
if test x"$build_cdrtools" = "xyes"; then
@@ -13214,7 +12952,7 @@
else
build_cdrtools="no"
-@@ -17286,7 +14629,7 @@ fi
+@@ -17286,7 +14767,7 @@ fi
# Check whether --enable-cdrkit was given.
@@ -13223,7 +12961,7 @@
enableval=$enable_cdrkit; build_cdrkit=$enableval
else
build_cdrkit="yes"
-@@ -17295,9 +14638,7 @@ fi
+@@ -17295,9 +14776,7 @@ fi
if test x"$build_cdrkit" = "xyes"; then
@@ -13234,7 +12972,7 @@
else
build_cdrkit="no"
-@@ -17318,7 +14659,7 @@ fi
+@@ -17318,7 +14797,7 @@ fi
BEAGLE_REQUIRED=0.3.0
# Check whether --enable-search was given.
@@ -13243,7 +12981,7 @@
enableval=$enable_search; enable_search=$enableval
else
enable_search="yes"
-@@ -17328,40 +14669,44 @@ fi
+@@ -17328,40 +14807,44 @@ fi
if test x"$enable_search" = "xyes"; then
pkg_failed=no
@@ -13307,7 +13045,7 @@
fi
-@@ -17374,14 +14719,14 @@ else
+@@ -17374,14 +14857,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13325,7 +13063,7 @@
$as_echo "no" >&6; }
build_beagle=no
elif test $pkg_failed = untried; then
-@@ -17389,7 +14734,7 @@ 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
@@ -13334,7 +13072,7 @@
$as_echo "yes" >&6; }
build_beagle=yes
fi
-@@ -17399,9 +14744,7 @@ fi
+@@ -17399,9 +14882,7 @@ fi
if test x"$build_beagle" = "xyes"; then
@@ -13345,7 +13083,7 @@
-@@ -17420,7 +14763,7 @@ fi
+@@ -17420,7 +14901,7 @@ fi
TOTEM_REQUIRED=2.22.0
# Check whether --enable-playlist was given.
@@ -13354,7 +13092,7 @@
enableval=$enable_playlist; enable_playlist=$enableval
else
enable_playlist="yes"
-@@ -17430,40 +14773,44 @@ fi
+@@ -17430,40 +14911,44 @@ fi
if test x"$enable_playlist" = "xyes"; then
pkg_failed=no
@@ -13418,7 +13156,7 @@
fi
-@@ -17476,14 +14823,14 @@ else
+@@ -17476,14 +14961,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13436,7 +13174,7 @@
$as_echo "no" >&6; }
build_totem=no
elif test $pkg_failed = untried; then
-@@ -17491,7 +14838,7 @@ elif test $pkg_failed = untried; then
+@@ -17491,7 +14976,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
@@ -13445,7 +13183,7 @@
$as_echo "yes" >&6; }
build_totem=yes
fi
-@@ -17501,9 +14848,7 @@ fi
+@@ -17501,9 +14986,7 @@ fi
if test x"$build_totem" = "xyes"; then
@@ -13456,7 +13194,7 @@
fi
-@@ -17521,7 +14866,7 @@ fi
+@@ -17521,7 +15004,7 @@ fi
GSTREAMER_MODULE_REQUIRED=0.10.0
# Check whether --enable-preview was given.
@@ -13465,7 +13203,7 @@
enableval=$enable_preview; enable_preview=$enableval
else
enable_preview="yes"
-@@ -17531,40 +14876,44 @@ fi
+@@ -17531,40 +15014,44 @@ fi
if test x"$enable_preview" = "xyes"; then
pkg_failed=no
@@ -13529,7 +13267,7 @@
fi
-@@ -17577,14 +14926,14 @@ else
+@@ -17577,14 +15064,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13547,7 +13285,7 @@
$as_echo "no" >&6; }
build_preview=no
elif test $pkg_failed = untried; then
-@@ -17592,7 +14941,7 @@ elif test $pkg_failed = untried; then
+@@ -17592,7 +15079,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
@@ -13556,7 +13294,7 @@
$as_echo "yes" >&6; }
build_preview=yes
fi
-@@ -17602,9 +14951,7 @@ fi
+@@ -17602,9 +15089,7 @@ fi
if test x"$build_preview" = "xyes"; then
@@ -13567,7 +13305,7 @@
fi
-@@ -17621,7 +14968,7 @@ fi
+@@ -17621,7 +15106,7 @@ fi
# Check whether --enable-inotify was given.
@@ -13576,7 +13314,7 @@
enableval=$enable_inotify; enable_inotify=$enableval
else
enable_inotify="yes"
-@@ -17630,9 +14977,7 @@ fi
+@@ -17630,9 +15115,7 @@ fi
if test x"$enable_inotify" = "xyes"; then
@@ -13587,7 +13325,7 @@
fi
if test x"$enable_inotify" = "xyes"; then
-@@ -17645,7 +14990,7 @@ fi
+@@ -17645,7 +15128,7 @@ fi
# Check whether --enable-caches was given.
@@ -13596,7 +13334,7 @@
enableval=$enable_caches; enable_caches=$enableval
else
enable_caches="yes"
-@@ -17670,146 +15015,12 @@ _ACEOF
+@@ -17670,146 +15153,12 @@ _ACEOF
@@ -13748,7 +13486,7 @@
_ACEOF
fi
-@@ -17817,16 +15028,12 @@ fi
+@@ -17817,16 +15166,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -13768,7 +13506,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17837,46 +15044,19 @@ return LC_MESSAGES
+@@ -17837,202 +15182,45 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -13821,10 +13559,15 @@
fi
fi
-@@ -17889,150 +15069,20 @@ _ACEOF
- XGETTEXT=:
- INTLLIBS=
-
+ USE_NLS=yes
+
+
+- gt_cv_have_gettext=no
+-
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
+-
- if test "${ac_cv_header_libintl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
@@ -13953,6 +13696,12 @@
-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
++ gt_cv_have_gettext=no
++
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
++
+ 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"
@@ -13977,7 +13726,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -18045,201 +15095,57 @@ return !ngettext ("","", 1)
+@@ -18045,54 +15233,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -14028,25 +13777,22 @@
+ { $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
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include <libintl.h>
+@@ -18105,141 +15264,26 @@ return !dgettext ("","")
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14068,24 +13814,29 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- gt_cv_func_dgettext_libc=yes
--else
++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
-
- gt_cv_func_dgettext_libc=no
--fi
++ 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
++rm -f core conftest.err conftest.$ac_objext \
++ 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
++{ $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
@@ -14093,9 +13844,8 @@
-{ $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
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -14166,32 +13916,14 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <libintl.h>
-
+-
- eval "$as_ac_var=no"
-+int
-+main ()
-+{
-+return !dgettext ("","")
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gt_cv_func_dgettext_libc=yes
-+else
-+ gt_cv_func_dgettext_libc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
+-fi
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -14199,11 +13931,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"
@@ -14214,7 +13941,7 @@
_ACEOF
fi
-@@ -18254,18 +15160,14 @@ done
+@@ -18254,18 +15298,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -14236,7 +13963,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18283,55 +15185,26 @@ return bindtextdomain ();
+@@ -18283,55 +15323,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -14301,7 +14028,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18349,55 +15222,26 @@ return ngettext ();
+@@ -18349,55 +15360,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -14366,7 +14093,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18415,43 +15259,18 @@ return dgettext ();
+@@ -18415,43 +15397,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -14416,7 +14143,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18461,22 +15280,18 @@ fi
+@@ -18461,22 +15418,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -14444,7 +14171,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18494,55 +15309,26 @@ return ngettext ();
+@@ -18494,55 +15447,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -14509,10 +14236,14 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18560,43 +15346,18 @@ return dcgettext ();
- return 0;
- }
- _ACEOF
+@@ -18556,164 +15480,49 @@ int
+ main ()
+ {
+ return dcgettext ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14534,37 +14265,216 @@
- 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
+- 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
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+- gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv
+-else
+- :
+-fi
+-
+-else
+- :
+-fi
+-
+- fi
+-
+- #
+- # If we found libintl, then check in it for bind_textdomain_codeset();
+- # we'll prefer libc if neither have bind_textdomain_codeset(),
+- # and both have dgettext and ngettext
+- #
+- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+- glib_save_LIBS="$LIBS"
+- 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
+-$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
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- 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"
++ ;
++ return 0;
++}
++_ACEOF
++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
+-
+- eval "$as_ac_var=no"
++ ac_cv_lib_intl_dcgettext=no
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++LIBS=$ac_check_lib_save_LIBS
++fi
+{ $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
++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -18618,102 +15379,12 @@ fi
++ gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv
++else
++ :
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++else
++ :
+ 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
++
++ fi
++
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_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 :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -18743,15 +15552,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_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGFMT" in
+@@ -18776,118 +15583,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
glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
+ 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
@@ -14657,144 +14567,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 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
-@@ -18743,15 +15414,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_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case "$MSGFMT" in
-@@ -18776,118 +15445,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
- 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
-- 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 ()
--{
--return $ac_func ();
-- ;
-- 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"
--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"
@@ -14813,7 +14585,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18902,14 +15481,14 @@ msgstr ""
+@@ -18902,14 +15619,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -14833,7 +14605,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18917,9 +15496,9 @@ fi
+@@ -18917,9 +15634,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -14845,7 +14617,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18932,14 +15511,14 @@ for as_dir in $PATH
+@@ -18932,14 +15649,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14863,7 +14635,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18948,19 +15527,19 @@ esac
+@@ -18948,19 +15665,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14887,702 +14659,29 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18975,154 +15554,43 @@ else
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-- ;;
--esac
--fi
--XGETTEXT="$ac_cv_path_XGETTEXT"
--if test "$XGETTEXT" != ":"; then
+@@ -18985,18 +15702,14 @@ esac
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--$as_echo "$XGETTEXT" >&6; }
--else
++ { $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 "no" >&6; }
--fi
--
++ { $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
--/* end confdefs.h. */
--
--int
--main ()
--{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- CATOBJEXT=.gmo
-- DATADIRNAME=share
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+ ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test "$XGETTEXT" != ":"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&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
-/* 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
- ;
- 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
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ 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
-@@ -19137,10 +15605,8 @@ fi
- ;;
- esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
-@@ -19154,9 +15620,7 @@ fi
-
- if test "$gt_cv_have_gettext" = "yes" ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_NLS 1
--_ACEOF
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
- fi
-
-@@ -19164,7 +15628,7 @@ _ACEOF
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
-- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
- $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
-@@ -19197,7 +15661,7 @@ $as_echo "found xgettext program is not
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
-- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
- $as_echo_n "checking for catalogs to be installed... " >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
-@@ -19222,7 +15686,7 @@ $as_echo_n "checking for catalogs to be
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
- $as_echo "$LINGUAS" >&6; }
- fi
-
-@@ -19256,16 +15720,16 @@ $as_echo "$LINGUAS" >&6; }
-
-
-
-- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- $as_echo_n "checking whether NLS is requested... " >&6; }
- # Check whether --enable-nls was given.
--if test "${enable_nls+set}" = set; then
-+if test "${enable_nls+set}" = set; then :
- enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
- fi
-
-- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
- $as_echo "$USE_NLS" >&6; }
-
-
-@@ -19273,35 +15737,31 @@ $as_echo "$USE_NLS" >&6; }
-
- case "$am__api_version" in
- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
- esac
-
- if test -n "0.35.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
- $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
-@@ -19314,14 +15774,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19329,19 +15789,19 @@ esac
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
-@@ -19354,14 +15814,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19369,19 +15829,19 @@ esac
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
-@@ -19394,14 +15854,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19409,18 +15869,16 @@ esac
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -19542,9 +16000,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- # Check the gettext tools to make sure they are GNU
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
-@@ -19557,14 +16015,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19572,19 +16030,19 @@ esac
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
-@@ -19597,14 +16055,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19612,19 +16070,19 @@ esac
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
-@@ -19637,14 +16095,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19652,19 +16110,19 @@ esac
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -19677,14 +16135,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"
-@@ -19693,33 +16151,29 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
-@@ -19732,14 +16186,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -19747,41 +16201,35 @@ esac
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
--$as_echo "$as_me: error: perl not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
- $as_echo_n "checking for perl >= 5.8.1... " >&6; }
- $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
- if test $? -ne 0; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
--$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
- else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
- $as_echo "$IT_PERL_VERSION" >&6; }
- fi
- if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -19791,11 +16239,7 @@ fi
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -19807,120 +16251,13 @@ extern int _nl_msg_cat_cntr;
+@@ -19008,121 +15721,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -15608,15 +14707,16 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
+ 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
+ *-*-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
@@ -15702,14 +14802,14 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- DATADIRNAME=share
- else
- DATADIRNAME=lib
-@@ -19932,10 +16269,8 @@ fi
- ;;
- esac
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -19137,10 +15743,8 @@ fi
+ ;;
+ esac
fi
-
-rm -rf conftest.dSYM
@@ -15717,148 +14817,808 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- fi
-
-
-@@ -19959,136 +16294,8 @@ fi
-
-
-
-- # Extract the first word of "gtkdoc-check", so it can be a program name with args.
--set dummy gtkdoc-check; ac_word=$2
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+@@ -19154,9 +15758,7 @@ fi
+
+ if test "$gt_cv_have_gettext" = "yes" ; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ fi
+
+@@ -19164,7 +15766,7 @@ _ACEOF
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+@@ -19197,7 +15799,7 @@ $as_echo "found xgettext program is not
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+ $as_echo_n "checking for catalogs to be installed... " >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+@@ -19222,7 +15824,7 @@ $as_echo_n "checking for catalogs to be
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+ $as_echo "$LINGUAS" >&6; }
+ fi
+
+@@ -19256,16 +15858,16 @@ $as_echo "$LINGUAS" >&6; }
+
+
+
+- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then
++if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+ else
+ USE_NLS=yes
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+ $as_echo "$USE_NLS" >&6; }
+
+
+@@ -19273,35 +15875,31 @@ $as_echo "$USE_NLS" >&6; }
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+ esac
+
+ if test -n "0.35.0"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
+ $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -19314,14 +15912,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19329,19 +15927,19 @@ esac
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -19354,14 +15952,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19369,19 +15967,19 @@ esac
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -19394,14 +15992,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19409,18 +16007,16 @@ esac
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -19542,9 +16138,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -19557,14 +16153,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19572,19 +16168,19 @@ esac
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -19597,14 +16193,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19612,19 +16208,19 @@ esac
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -19637,14 +16233,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19652,19 +16248,19 @@ esac
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -19677,14 +16273,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"
+@@ -19693,33 +16289,29 @@ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -19732,14 +16324,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -19747,180 +16339,63 @@ esac
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- 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)
+-if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- DATADIRNAME=share
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- 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
-- case $GTKDOC_CHECK in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
+- 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
++ 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)
++if test -z "$DATADIRNAME"; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++ 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 :
+ DATADIRNAME=share
+ else
+ DATADIRNAME=lib
+@@ -19932,10 +16407,8 @@ fi
+ ;;
+ esac
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+
+
+@@ -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
-- 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"
++ 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
-- break 2
-- fi
++ $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
--IFS=$as_save_IFS
--
-- ;;
--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 "$GTKDOC_CHECK" >&6; }
--else
++ 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 "no" >&6; }
--fi
--
--
-- for ac_prog in gtkdoc-rebase
--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:${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_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_REBASE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
++{ $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
-- 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"
++ 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
-- break 2
-- fi
++ $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
--
-- ;;
--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 "$GTKDOC_REBASE" >&6; }
--else
++ 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 "no" >&6; }
--fi
--
--
-- test -n "$GTKDOC_REBASE" && break
--done
--test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
--
-- # 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_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $GTKDOC_MKPDF in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--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 "$GTKDOC_MKPDF" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
--
++ { $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 +16305,7 @@ fi
+@@ -20098,7 +16571,7 @@ fi
# Check whether --enable-gtk-doc was given.
@@ -15867,7 +15627,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -20107,42 +16314,66 @@ fi
+@@ -20107,33 +16580,31 @@ fi
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -15884,7 +15644,7 @@
- { { $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 gtk-doc" "$LINENO" 5
++ as_fn_error "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
fi
@@ -15895,101 +15655,21 @@
+ { $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.
+ # Check whether --enable-gtk-doc-html was given.
-if test "${enable_gtk_doc_html+set}" = set; then
-- enableval=$enable_gtk_doc_html;
-+ for ac_prog in gtkdoc-check
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $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 :
-+ $as_echo_n "(cached) " >&6
- else
-- enable_gtk_doc_html=yes
--fi
-+ case $GTKDOC_CHECK in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-- # Check whether --enable-gtk-doc-pdf was given.
++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
-- enableval=$enable_gtk_doc_pdf;
-+ ;;
-+esac
-+fi
-+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-+if test -n "$GTKDOC_CHECK"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-+$as_echo "$GTKDOC_CHECK" >&6; }
- else
-- enable_gtk_doc_pdf=no
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-
-- if test -z "$GTKDOC_MKPDF"; then
-- enable_gtk_doc_pdf=no
-- fi
-+ test -n "$GTKDOC_CHECK" && break
-+done
-
-
- if test x$enable_gtk_doc = xyes; then
-@@ -20153,22 +16384,6 @@ else
- ENABLE_GTK_DOC_FALSE=
- fi
-
-- if test x$enable_gtk_doc_html = xyes; then
-- GTK_DOC_BUILD_HTML_TRUE=
-- GTK_DOC_BUILD_HTML_FALSE='#'
--else
-- GTK_DOC_BUILD_HTML_TRUE='#'
-- GTK_DOC_BUILD_HTML_FALSE=
--fi
--
-- if test x$enable_gtk_doc_pdf = xyes; then
-- GTK_DOC_BUILD_PDF_TRUE=
-- GTK_DOC_BUILD_PDF_FALSE='#'
--else
-- GTK_DOC_BUILD_PDF_TRUE='#'
-- GTK_DOC_BUILD_PDF_FALSE=
--fi
--
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -20177,19 +16392,11 @@ else
- GTK_DOC_USE_LIBTOOL_FALSE=
- fi
-
-- if test -n "$GTKDOC_REBASE"; then
-- GTK_DOC_USE_REBASE_TRUE=
-- GTK_DOC_USE_REBASE_FALSE='#'
--else
-- GTK_DOC_USE_REBASE_TRUE='#'
-- GTK_DOC_USE_REBASE_FALSE=
--fi
--
-
++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
# Check whether --enable-schemas-install was given.
@@ -15998,7 +15678,7 @@
enableval=$enable_schemas_install;
fi
-@@ -20205,9 +16412,9 @@ fi
+@@ -20205,9 +16676,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
@@ -16010,7 +15690,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -20220,14 +16427,14 @@ for as_dir in $PATH
+@@ -20220,14 +16691,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16028,7 +15708,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -20236,18 +16443,16 @@ esac
+@@ -20236,18 +16707,16 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -16050,7 +15730,7 @@
fi
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-@@ -20258,13 +16463,13 @@ fi
+@@ -20258,13 +16727,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -16066,7 +15746,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 +16478,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -20273,22 +16742,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -16093,7 +15773,7 @@
esac
fi
-@@ -20332,13 +16535,13 @@ _ACEOF
+@@ -20332,13 +16799,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16109,7 +15789,7 @@
esac ;;
esac
done
-@@ -20346,8 +16549,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20346,8 +16813,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16120,7 +15800,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20370,11 +16573,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20370,11 +16837,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" &&
@@ -16134,7 +15814,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -20394,8 +16597,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -20394,8 +16861,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.
@@ -16145,7 +15825,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -20411,234 +16614,118 @@ else
+@@ -20411,234 +16878,142 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -16226,21 +15906,25 @@
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ 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; }; }
--fi
--if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ 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 \"ENABLE_GTK_DOC\" was never defined.
++ 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
@@ -16249,14 +15933,16 @@
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ 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_LIBTOOL\" was never defined.
++ 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
@@ -16368,21 +16054,25 @@
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ 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; }; }
--fi
--if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ 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 \"ENABLE_GTK_DOC\" was never defined.
++ 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
@@ -16391,14 +16081,16 @@
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
--fi
--if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ 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_LIBTOOL\" was never defined.
++ 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
@@ -16433,7 +16125,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -20648,17 +16735,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -20648,17 +17023,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16459,7 +16151,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20666,23 +16754,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -20666,23 +17042,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16488,7 +16180,7 @@
as_nl='
'
export as_nl
-@@ -20690,7 +16770,13 @@ export as_nl
+@@ -20690,7 +17058,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
@@ -16503,7 +16195,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -20701,7 +16787,7 @@ else
+@@ -20701,7 +17075,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16512,7 +16204,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20724,13 +16810,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -20724,13 +17098,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -16526,7 +16218,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -20740,15 +16819,15 @@ fi
+@@ -20740,15 +17107,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16545,7 +16237,7 @@
IFS=$as_save_IFS
;;
-@@ -20760,12 +16839,16 @@ if test "x$as_myself" = x; then
+@@ -20760,12 +17127,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
@@ -16566,7 +16258,7 @@
done
PS1='$ '
PS2='> '
-@@ -20777,7 +16860,89 @@ export LC_ALL
+@@ -20777,7 +17148,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -16657,7 +16349,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -20791,8 +16956,12 @@ else
+@@ -20791,8 +17244,12 @@ else
as_basename=false
fi
@@ -16671,7 +16363,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -20812,76 +16981,25 @@ $as_echo X/"$0" |
+@@ -20812,76 +17269,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -16759,7 +16451,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -20910,8 +17028,56 @@ fi
+@@ -20910,8 +17316,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -16817,7 +16509,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -20930,10 +17096,10 @@ else
+@@ -20930,10 +17384,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -16830,7 +16522,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -20948,13 +17114,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -20948,13 +17402,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -16852,7 +16544,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -20986,13 +17158,15 @@ _ACEOF
+@@ -20986,13 +17446,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -16871,7 +16563,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -21011,16 +17185,17 @@ $config_headers
+@@ -21011,16 +17473,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -16893,7 +16585,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -21056,6 +17231,8 @@ do
+@@ -21056,6 +17519,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -16902,7 +16594,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -21063,20 +17240,19 @@ do
+@@ -21063,20 +17528,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -16927,7 +16619,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -21084,11 +17260,10 @@ Try \`$0 --help' for more information."
+@@ -21084,11 +17548,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -16942,7 +16634,7 @@
ac_need_defaults=false ;;
esac
-@@ -21438,9 +17613,7 @@ do
+@@ -21438,9 +17901,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -16953,7 +16645,7 @@
esac
done
-@@ -21467,7 +17640,7 @@ $debug ||
+@@ -21467,7 +17928,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -16962,7 +16654,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -21478,11 +17651,7 @@ $debug ||
+@@ -21478,11 +17939,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -16975,7 +16667,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -21490,10 +17659,16 @@ $debug ||
+@@ -21490,10 +17947,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -16994,7 +16686,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -21507,24 +17682,18 @@ _ACEOF
+@@ -21507,24 +17970,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17022,7 +16714,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21546,7 +17715,7 @@ s/'"$ac_delim"'$//
+@@ -21546,7 +18003,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -17031,7 +16723,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -21560,7 +17729,7 @@ s/.\{148\}//
+@@ -21560,7 +18017,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -17040,7 +16732,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -21613,9 +17782,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -21613,9 +18070,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17051,7 +16743,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21656,9 +17823,7 @@ for ac_last_try in false false :; do
+@@ -21656,9 +18111,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17062,7 +16754,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -21743,9 +17908,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21743,9 +18196,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17073,7 +16765,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -21758,9 +17921,7 @@ do
+@@ -21758,9 +18209,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17084,7 +16776,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -21788,12 +17949,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -21788,12 +18237,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17099,7 +16791,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21804,7 +17963,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -21804,7 +18251,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17108,7 +16800,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -21817,9 +17976,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -21817,9 +18264,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17119,7 +16811,7 @@
esac
;;
esac
-@@ -21847,47 +18004,7 @@ $as_echo X"$ac_file" |
+@@ -21847,47 +18292,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -17168,7 +16860,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -21944,7 +18061,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -21944,7 +18349,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=
@@ -17176,7 +16868,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -21954,12 +18070,11 @@ ac_sed_dataroot='
+@@ -21954,12 +18358,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17191,7 +16883,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 +18084,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21969,7 +18372,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17200,7 +16892,7 @@
esac
_ACEOF
-@@ -21998,14 +18113,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -21998,14 +18401,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 \
@@ -17217,7 +16909,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 +18128,7 @@ which seems to be undefined. Please mak
+@@ -22015,9 +18416,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 \
@@ -17228,7 +16920,7 @@
;;
:H)
#
-@@ -22028,25 +18139,19 @@ $as_echo "$as_me: error: could not creat
+@@ -22028,25 +18427,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" \
@@ -17258,7 +16950,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -22084,7 +18189,7 @@ $as_echo X"$_am_arg" |
+@@ -22084,7 +18477,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17267,7 +16959,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -22179,47 +18284,7 @@ $as_echo X"$file" |
+@@ -22179,47 +18572,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -17316,7 +17008,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -22869,9 +18934,7 @@ _LT_EOF
+@@ -22869,9 +19222,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17327,7 +17019,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -22894,15 +18957,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -22894,15 +19245,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -17345,7 +17037,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -22923,10 +18983,10 @@ if test "$no_create" != yes; then
+@@ -22923,10 +19271,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.
@@ -17360,18 +17052,15 @@
Index: brasero-2.28.3/data/Makefile.in
===================================================================
---- brasero-2.28.3.orig/data/Makefile.in 2010-01-13 20:05:04.163215671 +0100
-+++ brasero-2.28.3/data/Makefile.in 2010-01-13 20:04:39.270718011 +0100
-@@ -195,8 +195,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -246,6 +244,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
@@ -17379,20 +17068,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -485,7 +486,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):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -510,7 +511,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/data/icons/Makefile.in
===================================================================
---- brasero-2.28.3.orig/data/icons/Makefile.in 2010-01-13 20:05:04.255216250 +0100
-+++ brasero-2.28.3/data/icons/Makefile.in 2010-01-13 20:04:39.371212070 +0100
-@@ -128,8 +128,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -179,6 +177,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17402,18 +17106,15 @@
PKG_CONFIG = @PKG_CONFIG@
Index: brasero-2.28.3/docs/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/Makefile.in 2010-01-13 20:05:06.343213538 +0100
-+++ brasero-2.28.3/docs/Makefile.in 2010-01-13 20:04:39.475212929 +0100
-@@ -191,8 +191,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -242,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17421,20 +17122,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -399,7 +400,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):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -424,7 +425,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/docs/reference/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/Makefile.in 2010-01-13 20:05:06.435221463 +0100
-+++ brasero-2.28.3/docs/reference/Makefile.in 2010-01-13 20:04:39.590712952 +0100
-@@ -166,8 +166,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -217,6 +215,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17442,20 +17158,35 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -335,7 +336,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]*);; \
+@@ -360,7 +361,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/docs/reference/libbrasero-burn/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/libbrasero-burn/Makefile.in 2010-01-13 20:05:06.526715081 +0100
-+++ brasero-2.28.3/docs/reference/libbrasero-burn/Makefile.in 2010-01-13 20:04:39.698712917 +0100
-@@ -133,8 +133,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -184,6 +182,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17463,217 +17194,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -370,10 +369,10 @@ INCLUDES = \
-
- GTKDOC_LIBS = $(top_builddir)/libbrasero-media/libbrasero-media.la $(top_builddir)/libbrasero-burn/libbrasero-burn.la
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -392,9 +391,7 @@ EXTRA_DIST = $(content_files) $(HTML_IMA
- $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
- version.xml.in
- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- pdf-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-- $(srcdir)/pdf.stamp
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -409,10 +406,6 @@ REPORT_FILES = \
- $(DOC_MODULE)-unused.txt
-
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
- all: all-am
-
- .SUFFIXES:
-@@ -608,10 +601,10 @@ uninstall-am: uninstall-local
- uninstall-local
-
-
-- at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+ at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
- @ENABLE_GTK_DOC_FALSE at all-local:
-
--docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+docs: html-build.stamp
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -620,9 +613,9 @@ $(REPORT_FILES): sgml-build.stamp
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -630,7 +623,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
- test -f $$i || touch $$i ; \
- done \
- fi
-- @touch scan-build.stamp
-+ touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -640,23 +633,23 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- @touch tmpl-build.stamp
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--$(srcdir)/tmpl/*.sgml:
-+tmpl/*.sgml:
- @true
-
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- @touch sgml-build.stamp
-+ touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -666,37 +659,18 @@ sgml.stamp: sgml-build.stamp
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/html
-- @mkdir $(srcdir)/html
-- @mkhtml_options=""; \
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi; \
-- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- @touch html-build.stamp
--
--#### pdf ####
--
--pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-- @echo 'gtk-doc: Building PDF'
-- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-- @mkpdf_imgdirs=""; \
-- if test "x$(HTML_IMAGES)" != "x"; then \
-- for img in $(HTML_IMAGES); do \
-- part=`dirname $$img`; \
-- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-- if test $$? != 0; then \
-- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-- fi; \
-- done; \
-- fi; \
-- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-- @touch pdf-build.stamp
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-
- ##############
-
-@@ -706,14 +680,14 @@ clean-local:
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- @installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -733,11 +707,12 @@ install-data-local:
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
- uninstall-local:
-- @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -754,14 +729,16 @@ uninstall-local:
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-
Index: brasero-2.28.3/docs/reference/libbrasero-media/Makefile.in
===================================================================
---- brasero-2.28.3.orig/docs/reference/libbrasero-media/Makefile.in 2010-01-13 20:05:06.883216319 +0100
-+++ brasero-2.28.3/docs/reference/libbrasero-media/Makefile.in 2010-01-13 20:04:39.803211944 +0100
-@@ -133,8 +133,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -184,6 +182,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17681,423 +17212,17 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -367,10 +366,10 @@ INCLUDES = \
-
- GTKDOC_LIBS = $(top_builddir)/libbrasero-media/libbrasero-media.la
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -389,9 +388,7 @@ EXTRA_DIST = $(content_files) $(HTML_IMA
- $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
- version.xml.in
- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- pdf-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-- $(srcdir)/pdf.stamp
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -406,10 +403,6 @@ REPORT_FILES = \
- $(DOC_MODULE)-unused.txt
-
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
-- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
- all: all-am
-
- .SUFFIXES:
-@@ -605,10 +598,10 @@ uninstall-am: uninstall-local
- uninstall-local
-
-
-- at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+ at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
- @ENABLE_GTK_DOC_FALSE at all-local:
-
--docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+docs: html-build.stamp
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -617,9 +610,9 @@ $(REPORT_FILES): sgml-build.stamp
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -627,7 +620,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
- test -f $$i || touch $$i ; \
- done \
- fi
-- @touch scan-build.stamp
-+ touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -637,23 +630,23 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- @touch tmpl-build.stamp
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--$(srcdir)/tmpl/*.sgml:
-+tmpl/*.sgml:
- @true
-
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- @touch sgml-build.stamp
-+ touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -663,37 +656,18 @@ sgml.stamp: sgml-build.stamp
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/html
-- @mkdir $(srcdir)/html
-- @mkhtml_options=""; \
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi; \
-- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- @touch html-build.stamp
--
--#### pdf ####
--
--pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-- @echo 'gtk-doc: Building PDF'
-- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-- @mkpdf_imgdirs=""; \
-- if test "x$(HTML_IMAGES)" != "x"; then \
-- for img in $(HTML_IMAGES); do \
-- part=`dirname $$img`; \
-- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-- if test $$? != 0; then \
-- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-- fi; \
-- done; \
-- fi; \
-- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-- @touch pdf-build.stamp
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-
- ##############
-
-@@ -703,14 +677,14 @@ clean-local:
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- @installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -730,11 +704,12 @@ install-data-local:
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
- uninstall-local:
-- @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -751,14 +726,16 @@ uninstall-local:
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-
-Index: brasero-2.28.3/gtk-doc.make
-===================================================================
---- brasero-2.28.3.orig/gtk-doc.make 2010-01-13 20:05:07.518716717 +0100
-+++ brasero-2.28.3/gtk-doc.make 2010-01-13 20:04:22.678720708 +0100
-@@ -5,13 +5,13 @@
- ####################################
-
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- GTKDOC_RUN = $(LIBTOOL) --mode=execute
- else
- GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
--GTKDOC_RUN =
-+GTKDOC_RUN = sh -c
- endif
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -31,9 +31,7 @@ EXTRA_DIST = \
- $(DOC_MODULE)-overrides.txt
-
- DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-- pdf-build.stamp \
-- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-- $(srcdir)/pdf.stamp
-+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
- SCANOBJ_FILES = \
- $(DOC_MODULE).args \
-@@ -50,23 +48,12 @@ REPORT_FILES = \
- CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
- if ENABLE_GTK_DOC
--if GTK_DOC_BUILD_HTML
--HTML_BUILD_STAMP=html-build.stamp
--else
--HTML_BUILD_STAMP=
--endif
--if GTK_DOC_BUILD_PDF
--PDF_BUILD_STAMP=pdf-build.stamp
--else
--PDF_BUILD_STAMP=
--endif
--
--all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+all-local: html-build.stamp
- else
- all-local:
- endif
-
--docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-+docs: html-build.stamp
-
- $(REPORT_FILES): sgml-build.stamp
-
-@@ -75,9 +62,9 @@ $(REPORT_FILES): sgml-build.stamp
- scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
-@@ -85,7 +72,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
- test -f $$i || touch $$i ; \
- done \
- fi
-- @touch scan-build.stamp
-+ touch scan-build.stamp
-
- $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-@@ -95,23 +82,24 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES)
- tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-- @touch tmpl-build.stamp
-+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-+ touch tmpl-build.stamp
-
- tmpl.stamp: tmpl-build.stamp
- @true
-
--$(srcdir)/tmpl/*.sgml:
-+tmpl/*.sgml:
- @true
-
-+
- #### xml ####
-
--sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
-- @cd $(srcdir) && \
-+ cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-- @touch sgml-build.stamp
-+ touch sgml-build.stamp
-
- sgml.stamp: sgml-build.stamp
- @true
-@@ -121,37 +109,18 @@ sgml.stamp: sgml-build.stamp
- html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/html
-- @mkdir $(srcdir)/html
-- @mkhtml_options=""; \
-+ rm -rf $(srcdir)/html
-+ mkdir $(srcdir)/html
-+ mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
-- fi; \
-- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-+ fi
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
-- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-- @touch html-build.stamp
--
--#### pdf ####
--
--pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-- @echo 'gtk-doc: Building PDF'
-- @-chmod -R u+w $(srcdir)
-- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
-- @mkpdf_imgdirs=""; \
-- if test "x$(HTML_IMAGES)" != "x"; then \
-- for img in $(HTML_IMAGES); do \
-- part=`dirname $$img`; \
-- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
-- if test $$? != 0; then \
-- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
-- fi; \
-- done; \
-- fi; \
-- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-- @touch pdf-build.stamp
-+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ touch html-build.stamp
-
- ##############
-
-@@ -161,14 +130,14 @@ clean-local:
-
- distclean-local:
- cd $(srcdir) && \
-- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-+ rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
- maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- @installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -188,11 +157,12 @@ install-data-local:
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
- uninstall-local:
-- @if test -n "$(DOC_MODULE_VERSION)"; then \
-+ if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -212,13 +182,15 @@ endif
-
- dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
-+ mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
Index: brasero-2.28.3/help/Makefile.in
===================================================================
---- brasero-2.28.3.orig/help/Makefile.in 2010-01-13 20:05:07.250712676 +0100
-+++ brasero-2.28.3/help/Makefile.in 2010-01-13 20:04:39.927212275 +0100
-@@ -151,8 +151,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -202,6 +200,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18107,18 +17232,15 @@
PKG_CONFIG = @PKG_CONFIG@
Index: brasero-2.28.3/libbrasero-burn/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-burn/Makefile.in 2010-01-13 20:05:05.374714261 +0100
-+++ brasero-2.28.3/libbrasero-burn/Makefile.in 2010-01-13 20:04:40.090712393 +0100
-@@ -267,8 +267,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -318,6 +316,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18126,7 +17248,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -398,7 +397,7 @@ INCLUDES = \
+@@ -398,7 +399,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18137,18 +17259,15 @@
$(BRASERO_GMODULE_CFLAGS) \
Index: brasero-2.28.3/libbrasero-media/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-media/Makefile.in 2010-01-13 20:05:05.930716422 +0100
-+++ brasero-2.28.3/libbrasero-media/Makefile.in 2010-01-13 20:04:40.226712981 +0100
-@@ -251,8 +251,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -302,6 +300,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18156,7 +17275,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -378,7 +377,7 @@ INCLUDES = \
+@@ -378,7 +379,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18167,18 +17286,15 @@
$(BRASERO_GLIB_CFLAGS) \
Index: brasero-2.28.3/libbrasero-utils/Makefile.in
===================================================================
---- brasero-2.28.3.orig/libbrasero-utils/Makefile.in 2010-01-13 20:05:08.371215841 +0100
-+++ brasero-2.28.3/libbrasero-utils/Makefile.in 2010-01-13 20:04:40.346712237 +0100
-@@ -191,8 +191,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -242,6 +240,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18186,7 +17302,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -318,7 +317,7 @@ INCLUDES = \
+@@ -318,7 +319,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18197,8 +17313,8 @@
$(BRASERO_GLIB_CFLAGS) \
Index: brasero-2.28.3/ltmain.sh
===================================================================
---- brasero-2.28.3.orig/ltmain.sh 2010-01-13 20:05:02.666716324 +0100
-+++ brasero-2.28.3/ltmain.sh 2010-01-13 20:03:03.522713592 +0100
+--- 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
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -18290,18 +17406,15 @@
no)
Index: brasero-2.28.3/nautilus/Makefile.in
===================================================================
---- brasero-2.28.3.orig/nautilus/Makefile.in 2010-01-13 20:05:07.126718715 +0100
-+++ brasero-2.28.3/nautilus/Makefile.in 2010-01-13 20:04:40.470713055 +0100
-@@ -192,8 +192,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -243,6 +241,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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@
@@ -18311,18 +17424,15 @@
PKG_CONFIG = @PKG_CONFIG@
Index: brasero-2.28.3/plugins/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/Makefile.in 2010-01-13 20:05:02.786718507 +0100
-+++ brasero-2.28.3/plugins/Makefile.in 2010-01-13 20:04:40.558713563 +0100
-@@ -170,8 +170,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -221,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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@
@@ -18330,20 +17440,35 @@
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 2010-01-13 20:05:03.446716640 +0100
-+++ brasero-2.28.3/plugins/cdrdao/Makefile.in 2010-01-13 20:04:40.682716333 +0100
-@@ -196,8 +196,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -247,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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@
@@ -18351,7 +17476,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +325,7 @@ INCLUDES = \
+@@ -326,7 +327,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18360,7 +17485,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -334,7 +333,7 @@ INCLUDES = \
+@@ -334,7 +335,7 @@ INCLUDES = \
#cdrdao
@@ -18369,7 +17494,7 @@
cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c burn-cdrdao.h \
burn-cdrdao-common.h
-@@ -343,7 +342,7 @@ libbrasero_cdrdao_la_LIBADD = $(BRASERO_
+@@ -343,7 +344,7 @@ libbrasero_cdrdao_la_LIBADD = $(BRASERO_
libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
#toc2cue
@@ -18380,18 +17505,15 @@
burn-cdrdao-common.h
Index: brasero-2.28.3/plugins/cdrkit/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/cdrkit/Makefile.in 2010-01-13 20:05:03.922713589 +0100
-+++ brasero-2.28.3/plugins/cdrkit/Makefile.in 2010-01-13 20:04:40.810713316 +0100
-@@ -208,8 +208,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -259,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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@
@@ -18399,7 +17521,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -338,7 +337,7 @@ INCLUDES = \
+@@ -338,7 +339,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18408,7 +17530,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -346,7 +345,7 @@ INCLUDES = \
+@@ -346,7 +347,7 @@ INCLUDES = \
#wodim
@@ -18417,7 +17539,7 @@
wodim_LTLIBRARIES = libbrasero-wodim.la
libbrasero_wodim_la_SOURCES = burn-wodim.c burn-wodim.h \
burn-cdrkit.h
-@@ -355,7 +354,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
+@@ -355,7 +356,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
libbrasero_wodim_la_LDFLAGS = -module -avoid-version
#genisoimage
@@ -18426,7 +17548,7 @@
genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c burn-genisoimage.h \
burn-cdrkit.h
-@@ -364,7 +363,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
+@@ -364,7 +365,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
#readom
@@ -18437,18 +17559,15 @@
burn-cdrkit.h
Index: brasero-2.28.3/plugins/cdrtools/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/cdrtools/Makefile.in 2010-01-13 20:05:03.210714791 +0100
-+++ brasero-2.28.3/plugins/cdrtools/Makefile.in 2010-01-13 20:04:40.938713737 +0100
-@@ -207,8 +207,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -258,6 +256,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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@
@@ -18456,7 +17575,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -337,7 +336,7 @@ INCLUDES = \
+@@ -337,7 +338,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18465,7 +17584,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -345,7 +344,7 @@ INCLUDES = \
+@@ -345,7 +346,7 @@ INCLUDES = \
#cdrecord
@@ -18474,7 +17593,7 @@
cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c burn-cdrecord.h \
burn-cdrtools.h
-@@ -354,7 +353,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
+@@ -354,7 +355,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
#mkisofs
@@ -18483,7 +17602,7 @@
mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c burn-mkisofs.h \
burn-cdrtools.h
-@@ -363,7 +362,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
+@@ -363,7 +364,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
#readcd
@@ -18494,18 +17613,15 @@
burn-cdrtools.h
Index: brasero-2.28.3/plugins/checksum/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/checksum/Makefile.in 2010-01-13 20:05:03.094720026 +0100
-+++ brasero-2.28.3/plugins/checksum/Makefile.in 2010-01-13 20:04:41.058713493 +0100
-@@ -201,8 +201,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -252,6 +250,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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,
+@@ -252,6 +252,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18513,7 +17629,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -331,21 +330,21 @@ INCLUDES = \
+@@ -331,21 +332,21 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18540,18 +17656,15 @@
burn-checksum-files.h\
Index: brasero-2.28.3/plugins/dvdauthor/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/dvdauthor/Makefile.in 2010-01-13 20:05:02.991215384 +0100
-+++ brasero-2.28.3/plugins/dvdauthor/Makefile.in 2010-01-13 20:04:41.170713062 +0100
-@@ -185,8 +185,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -236,6 +234,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18559,7 +17672,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -315,13 +314,13 @@ INCLUDES = \
+@@ -315,13 +316,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18577,18 +17690,15 @@
libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Index: brasero-2.28.3/plugins/dvdcss/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/dvdcss/Makefile.in 2010-01-13 20:05:04.043220322 +0100
-+++ brasero-2.28.3/plugins/dvdcss/Makefile.in 2010-01-13 20:04:41.282715066 +0100
-@@ -186,8 +186,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -237,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18596,7 +17706,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -306,7 +305,7 @@ target_alias = @target_alias@
+@@ -306,7 +307,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -18605,7 +17715,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libbrasero-media/ \
-@@ -317,7 +316,7 @@ INCLUDES = \
+@@ -317,7 +318,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18616,18 +17726,15 @@
$(BRASERO_GLIB_CFLAGS)
Index: brasero-2.28.3/plugins/growisofs/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/growisofs/Makefile.in 2010-01-13 20:05:03.562718262 +0100
-+++ brasero-2.28.3/plugins/growisofs/Makefile.in 2010-01-13 20:04:41.398712773 +0100
-@@ -197,8 +197,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -248,6 +246,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18635,7 +17742,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -327,7 +326,7 @@ INCLUDES = \
+@@ -327,7 +328,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18644,7 +17751,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -335,7 +334,7 @@ INCLUDES = \
+@@ -335,7 +336,7 @@ INCLUDES = \
#growisofs
@@ -18653,7 +17760,7 @@
growisofs_LTLIBRARIES = libbrasero-growisofs.la
libbrasero_growisofs_la_SOURCES = burn-growisofs.c burn-growisofs.h \
burn-growisofs-common.h
-@@ -344,7 +343,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
+@@ -344,7 +345,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
#dvdrwformat
@@ -18664,18 +17771,15 @@
libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Index: brasero-2.28.3/plugins/libburnia/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/libburnia/Makefile.in 2010-01-13 20:05:03.674713430 +0100
-+++ brasero-2.28.3/plugins/libburnia/Makefile.in 2010-01-13 20:04:41.518713505 +0100
-@@ -196,8 +196,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -247,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
@@ -18683,7 +17787,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +325,7 @@ INCLUDES = \
+@@ -326,7 +327,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18692,7 +17796,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_LIBISOFS_CFLAGS) \
-@@ -335,7 +334,7 @@ INCLUDES = \
+@@ -335,7 +336,7 @@ INCLUDES = \
#libburn
@@ -18701,7 +17805,7 @@
libburn_LTLIBRARIES = libbrasero-libburn.la
libbrasero_libburn_la_SOURCES = burn-libburn.c \
burn-libburn.h \
-@@ -347,7 +346,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
+@@ -347,7 +348,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
libbrasero_libburn_la_LDFLAGS = -module -avoid-version
#libisofs (apparently libisofs needs one libburn function)
@@ -18712,18 +17816,15 @@
burn-libburn-common.c burn-libburn-common.h \
Index: brasero-2.28.3/plugins/local-track/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/local-track/Makefile.in 2010-01-13 20:05:02.874722920 +0100
-+++ brasero-2.28.3/plugins/local-track/Makefile.in 2010-01-13 20:04:41.638712278 +0100
-@@ -196,8 +196,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -247,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
@@ -18731,7 +17832,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +325,7 @@ INCLUDES = \
+@@ -326,7 +327,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18740,7 +17841,7 @@
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
-@@ -334,14 +333,14 @@ INCLUDES = \
+@@ -334,14 +335,14 @@ INCLUDES = \
#local-track
@@ -18759,18 +17860,15 @@
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
===================================================================
---- brasero-2.28.3.orig/plugins/transcode/Makefile.in 2010-01-13 20:05:03.791215168 +0100
-+++ brasero-2.28.3/plugins/transcode/Makefile.in 2010-01-13 20:04:41.766713173 +0100
-@@ -208,8 +208,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -259,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
@@ -18778,7 +17876,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -338,23 +337,23 @@ INCLUDES = \
+@@ -338,23 +339,23 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18808,18 +17906,15 @@
libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Index: brasero-2.28.3/plugins/vcdimager/Makefile.in
===================================================================
---- brasero-2.28.3.orig/plugins/vcdimager/Makefile.in 2010-01-13 20:05:03.334717556 +0100
-+++ brasero-2.28.3/plugins/vcdimager/Makefile.in 2010-01-13 20:04:41.878712744 +0100
-@@ -185,8 +185,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -236,6 +234,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18827,7 +17922,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -315,13 +314,13 @@ INCLUDES = \
+@@ -315,13 +316,13 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
@@ -18845,18 +17940,15 @@
libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn.la
Index: brasero-2.28.3/src/Makefile.in
===================================================================
---- brasero-2.28.3.orig/src/Makefile.in 2010-01-13 20:05:07.947213700 +0100
-+++ brasero-2.28.3/src/Makefile.in 2010-01-13 20:04:42.006712676 +0100
-@@ -194,8 +194,6 @@ GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
--GTKDOC_MKPDF = @GTKDOC_MKPDF@
--GTKDOC_REBASE = @GTKDOC_REBASE@
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -245,6 +243,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -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,
+@@ -245,6 +245,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18864,7 +17956,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -326,7 +325,7 @@ INCLUDES = \
+@@ -326,7 +327,7 @@ INCLUDES = \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
-DBRASERO_DATADIR=\"$(datadir)/brasero\" \
Modified: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=23160&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/series [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/series [utf-8] Sun Feb 28 02:46:13 2010
@@ -1,3 +1,4 @@
01_pkglibdir.patch
11_nautilus_menu_no_display.patch
+31_link_libice.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list