diff options
Diffstat (limited to 'http/kazehakase/50_autoreconf.dpatch')
| -rw-r--r-- | http/kazehakase/50_autoreconf.dpatch | 6699 |
1 files changed, 6699 insertions, 0 deletions
diff --git a/http/kazehakase/50_autoreconf.dpatch b/http/kazehakase/50_autoreconf.dpatch new file mode 100644 index 0000000000..0f78b67d35 --- /dev/null +++ b/http/kazehakase/50_autoreconf.dpatch @@ -0,0 +1,6699 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_autoreconf.dpatch by Yavor Doganov <yavor@gnu.org> +## +## DP: Regenerate the build system with ./autogen.sh. + +@DPATCH@ +diff -urNad kazehakase-0.5.8~/Makefile.in kazehakase-0.5.8/Makefile.in +--- kazehakase-0.5.8~/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/Makefile.in 2009-12-07 21:19:59.000000000 +0200 +@@ -134,14 +134,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -168,19 +162,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -198,9 +191,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/aclocal.m4 kazehakase-0.5.8/aclocal.m4 +--- kazehakase-0.5.8~/aclocal.m4 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/aclocal.m4 2009-12-07 21:19:42.000000000 +0200 +@@ -13,156 +13,223 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-AC_DEFUN([AC_CHECK_COVERAGE], +-[ +- dnl ************************************************************** +- dnl Configure for coverage. +- dnl ************************************************************** +- +- AC_ARG_ENABLE([coverage], +- AS_HELP_STRING([--enable-coverage], +- [Enable coverage]), +- [ac_cv_enable_coverage=$enableval], +- [ac_cv_enable_coverage=no]) +- if test "x$GCC" != "xyes"; then +- ac_cv_enable_coverage=no +- fi ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 + +- cutter_has_lcov=no +- ltp_version_list="1.6 1.7" +- AC_CHECK_PROG(LCOV, lcov, lcov) +- AC_CHECK_PROG(GENHTML, genhtml, genhtml) ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, ++dnl gthread, or gio is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN([AM_PATH_GLIB_2_0], ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) + +- if test "$LCOV"; then +- AC_CACHE_CHECK([for ltp version], cutter_cv_ltp_version, [ +- cutter_cv_ltp_version=invalid +- ltp_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` +- for ltp_check_version in $ltp_version_list; do +- if test "$ltp_version" = "$ltp_check_version"; then +- cutter_cv_ltp_version="$ltp_check_version (ok)" +- fi +- done +- ]) +- fi ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; ++ esac ++ done + +- case $cutter_cv_ltp_version in +- ""|invalid[)] +- ;; +- *) +- cutter_has_lcov=yes +- ;; +- esac ++ PKG_PROG_PKG_CONFIG([0.16]) + +- if test "x$cutter_has_lcov" != "xyes"; then +- ac_cv_enable_coverage=no +- fi ++ no_glib="" + +- COVERAGE_CFLAGS= +- if test "x$ac_cv_enable_coverage" = "xyes"; then +- COVERAGE_CFLAGS="--coverage" ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no + fi +- AC_SUBST(COVERAGE_CFLAGS) +- AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$ac_cv_enable_coverage" = "xyes"]) + +- COVERAGE_INFO_FILE="coverage.info" +- AC_SUBST(COVERAGE_INFO_FILE) ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + +- COVERAGE_REPORT_DIR="coverage" +- AC_SUBST(COVERAGE_REPORT_DIR) ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi + +- if test "$GENHTML_OPTIONS" = ""; then +- GENHTML_OPTIONS="" ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi + fi +- AC_SUBST(GENHTML_OPTIONS) +- +- if test "x$ac_cv_enable_coverage" = "xyes"; then +- AC_CONFIG_COMMANDS([coverage], [ +- if grep '^coverage:' Makefile > /dev/null; then +- : # do nothing +- else +- cat >>Makefile <<EOS + +-coverage-clean: +- \$(LCOV) --compat-libtool --zerocounters --directory . \\ +- --output-file \$(COVERAGE_INFO_FILE) ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + +-coverage: coverage-clean check +- \$(LCOV) --compat-libtool --directory . \\ +- --capture --output-file \$(COVERAGE_INFO_FILE) +- \$(LCOV) --compat-libtool --directory . \\ +- --extract \$(COVERAGE_INFO_FILE) "\`(cd '\$(top_srcdir)'; pwd)\`/*" \\ +- --output-file \$(COVERAGE_INFO_FILE) +- \$(GENHTML) --highlight --legend \\ +- --output-directory \$(COVERAGE_REPORT_DIR) \\ +- --prefix "\`(cd '\$(top_srcdir)'; pwd)\`" \\ +- \$(GENHTML_OPTIONS) \$(COVERAGE_INFO_FILE) +-EOS +- fi +- ]) +- fi +-]) ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> + +-AC_DEFUN([AC_CHECK_CUTTER], +-[ +- AC_ARG_WITH([cutter], +- AS_HELP_STRING([--with-cutter], +- [Use Cutter (default: auto)]), +- [ac_cv_use_cutter=$withval], +- [ac_cv_use_cutter=auto]) +- AC_CACHE_CHECK([whether to use Cutter], +- [ac_cv_use_cutter], [ac_cv_use_cutter=auto]) +- if test "$ac_cv_use_cutter" != "no"; then +- PKG_CHECK_MODULES(CUTTER, cutter $1, [], [ac_cv_use_cutter=no]) +- AC_SUBST([CUTTER_CFLAGS]) +- AC_SUBST([CUTTER_LIBS]) +- fi ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ int ignored; + +- if test "$ac_cv_use_cutter" != "no"; then +- _PKG_CONFIG(CUTTER, variable=cutter, cutter) +- CUTTER=$pkg_cv_CUTTER +- AC_SUBST([CUTTER]) +- fi +-]) ++ ignored = system ("touch conf.glibtest"); + +-AC_DEFUN([AC_CHECK_GCUTTER], +-[ +- AC_CHECK_CUTTER($1) +- ac_cv_use_gcutter=no +- if test "$ac_cv_use_cutter" != "no"; then +- PKG_CHECK_MODULES(GCUTTER, gcutter $1, [ac_cv_use_gcutter=yes], [:]) +- AC_SUBST([GCUTTER_CFLAGS]) +- AC_SUBST([GCUTTER_LIBS]) +- fi +-]) ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } + +-AC_DEFUN([AC_CHECK_GDKCUTTER_PIXBUF], +-[ +- AC_CHECK_GCUTTER($1) +- ac_cv_use_gdkcutter_pixbuf=no +- if test "$ac_cv_use_cutter" != "no"; then +- PKG_CHECK_MODULES(GDKCUTTER_PIXBUF, gdkcutter-pixbuf $1, +- [ac_cv_use_gdkcutter_pixbuf=yes], [:]) +- AC_SUBST([GDKCUTTER_PIXBUF_CFLAGS]) +- AC_SUBST([GDKCUTTER_PIXBUF_LIBS]) ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + fi +-]) +- +-AC_DEFUN([AC_CHECK_SOUPCUTTER], +-[ +- AC_CHECK_GCUTTER($1) +- ac_cv_use_soupcutter=no +- if test "$ac_cv_use_cutter" != "no"; then +- PKG_CHECK_MODULES(SOUPCUTTER, soupcutter $1, +- [ac_cv_use_soupcutter=yes], [:]) +- AC_SUBST([SOUPCUTTER_CFLAGS]) +- AC_SUBST([SOUPCUTTER_LIBS]) ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) + fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest + ]) + + # Copyright (C) 1995-2002 Free Software Foundation, Inc. +@@ -989,6 +1056,115 @@ + # AC_DEFUN([AC_PROG_INTLTOOL], ...) + + ++dnl Autoconf macros for libgcrypt ++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. ++dnl ++dnl This file is free software; as a special exception the author gives ++dnl unlimited permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++dnl This file is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. ++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed ++dnl with the API version to also check the API compatibility. Example: ++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed ++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using ++dnl this features allows to prevent build against newer versions of libgcrypt ++dnl with a changed API. ++dnl ++AC_DEFUN([AM_PATH_LIBGCRYPT], ++[ AC_ARG_WITH(libgcrypt-prefix, ++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], ++ [prefix where LIBGCRYPT is installed (optional)]), ++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") ++ if test x$libgcrypt_config_prefix != x ; then ++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ fi ++ fi ++ ++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ tmp=ifelse([$1], ,1:1.2.0,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_libgcrypt_api=0 ++ min_libgcrypt_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) ++ ok=no ++ if test "$LIBGCRYPT_CONFIG" != "no" ; then ++ req_major=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ major=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` ++ minor=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` ++ micro=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` ++ if test "$major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$major" -eq "$req_major"; then ++ if test "$minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$minor" -eq "$req_minor"; then ++ if test "$micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) ++ else ++ AC_MSG_RESULT(no) ++ fi ++ if test $ok = yes; then ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ AC_MSG_CHECKING([LIBGCRYPT API version]) ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ AC_MSG_RESULT([okay]) ++ else ++ ok=no ++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ ifelse([$2], , :, [$2]) ++ else ++ LIBGCRYPT_CFLAGS="" ++ LIBGCRYPT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(LIBGCRYPT_CFLAGS) ++ AC_SUBST(LIBGCRYPT_LIBS) ++]) ++ + # nls.m4 serial 3 (gettext-0.15) + dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +diff -urNad kazehakase-0.5.8~/config.h.in kazehakase-0.5.8/config.h.in +--- kazehakase-0.5.8~/config.h.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/config.h.in 2009-12-07 21:19:12.000000000 +0200 +@@ -24,9 +24,16 @@ + /* Define if we have gecko 1.9 */ + #undef HAVE_GECKO_1_9 + ++/* Define if we have gecko 1.9.1 */ ++#undef HAVE_GECKO_1_9_1 ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + ++/* Define to 1 if you have the `gtk_activatable_set_related_action' function. ++ */ ++#undef HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION ++ + /* Define to 1 if you have the <inttypes.h> header file. */ + #undef HAVE_INTTYPES_H + +@@ -166,6 +173,28 @@ + /* Define using GNU TLS */ + #undef USE_SSL + ++/* Enable extensions on AIX 3, Interix. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# undef _POSIX_PTHREAD_SEMANTICS ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# undef _TANDEM_SOURCE ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# undef __EXTENSIONS__ ++#endif ++ ++ + /* Version number of package */ + #undef VERSION + +@@ -187,5 +216,15 @@ + /* Define to 1 if the X Window System is missing or not being used. */ + #undef X_DISPLAY_MISSING + ++/* Define to 1 if on MINIX. */ ++#undef _MINIX ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE ++ + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const +diff -urNad kazehakase-0.5.8~/configure kazehakase-0.5.8/configure +--- kazehakase-0.5.8~/configure 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/configure 2009-12-07 21:20:01.000000000 +0200 +@@ -1,10 +1,12 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for kazehakase 0.5.8. ++# Generated by GNU Autoconf 2.65 for kazehakase 0.5.8. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +-# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +@@ -673,7 +675,8 @@ + + + +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -752,21 +755,8 @@ + AM_CFLAGS + AM_CPPFLAGS + KAZEHAKASE_CFLAGS +-GENHTML_OPTIONS +-COVERAGE_REPORT_DIR +-COVERAGE_INFO_FILE +-ENABLE_COVERAGE_FALSE +-ENABLE_COVERAGE_TRUE +-COVERAGE_CFLAGS +-GENHTML +-LCOV + WITH_CUTTER_FALSE + WITH_CUTTER_TRUE +-GCUTTER_LIBS +-GCUTTER_CFLAGS +-CUTTER +-CUTTER_LIBS +-CUTTER_CFLAGS + HAVE_WINDRES_FALSE + HAVE_WINDRES_TRUE + WINDRES +@@ -850,6 +840,9 @@ + EGG_CFLAGS + ENABLE_SSL_FALSE + ENABLE_SSL_TRUE ++LIBGCRYPT_LIBS ++LIBGCRYPT_CFLAGS ++LIBGCRYPT_CONFIG + LIBGNUTLS_LIBS + LIBGNUTLS_CFLAGS + WITH_WEBKIT_GTK_FALSE +@@ -868,10 +861,13 @@ + DBUS_GLIB_CFLAGS + GIO_LIBS + GIO_CFLAGS +-GLIB_MKENUMS +-GLIB_GENMARSHAL + GTK_LIBS + GTK_CFLAGS ++GLIB_MKENUMS ++GOBJECT_QUERY ++GLIB_GENMARSHAL ++GLIB_LIBS ++GLIB_CFLAGS + HAVE_NSIBADCERTLISTENER_H_FALSE + HAVE_NSIBADCERTLISTENER_H_TRUE + HAVE_GECKO_1_9_FALSE +@@ -908,7 +904,6 @@ + LTCXXCOMPILE + LTCOMPILE + DOLT_BASH +-CPP + OTOOL64 + OTOOL + LIPO +@@ -923,9 +918,14 @@ + DUMPBIN + LD + FGREP ++SED ++LIBTOOL ++OBJDUMP ++DLLTOOL ++AS + EGREP + GREP +-SED ++CPP + am__fastdepCC_FALSE + am__fastdepCC_TRUE + CCDEPMODE +@@ -942,10 +942,6 @@ + LDFLAGS + CFLAGS + CC +-LIBTOOL +-OBJDUMP +-DLLTOOL +-AS + PLATFORM_OSX_FALSE + PLATFORM_OSX_TRUE + PLATFORM_WIN32_FALSE +@@ -1024,18 +1020,20 @@ + ac_subst_files='' + ac_user_opts=' + enable_option_checking ++enable_dependency_tracking + enable_shared + enable_static + with_pic + enable_fast_install +-enable_dependency_tracking + with_gnu_ld + enable_libtool_lock + enable_cpp_rtti + with_gecko_engine + enable_gtkmozembed ++enable_glibtest + enable_gtktest + enable_ssl ++with_libgcrypt_prefix + with_x + enable_nls + enable_Werror +@@ -1044,8 +1042,6 @@ + with_rgettext + enable_heyper_estraier + enable_mingw_debug +-with_cutter +-enable_coverage + enable_shave + ' + ac_precious_vars='build_alias +@@ -1080,11 +1076,7 @@ + EST_CFLAGS + EST_LIBS + ANTHY_CFLAGS +-ANTHY_LIBS +-CUTTER_CFLAGS +-CUTTER_LIBS +-GCUTTER_CFLAGS +-GCUTTER_LIBS' ++ANTHY_LIBS' + + + # Initialize some variables set by options. +@@ -1708,16 +1700,17 @@ + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=no] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] +- --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-cpp-rtti Enable C++ RTTI (for cvs gcc) + --enable-gtkmozembed + Enable including GtkMozEmbed module ++ --disable-glibtest do not try to compile and run a test GLIB program + --disable-gtktest do not try to compile and run a test GTK+ program + --disable-ssl + Disable GNU TLS suport +@@ -1729,8 +1722,7 @@ + --disable-hyper-estraier + Disable Hyper Estraier support + --enable-mingw-debug Enable MinGW debug +- --enable-coverage Enable coverage +- --enable-shave use shave to make the build pretty [default=yes] ++ --enable-shave use shave to make the build pretty [[default=yes]] + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -1741,10 +1733,11 @@ + --with-gecko-engine[=mozilla|seamonkey|firefox|xulrunner] + Whether to use mozilla, firefox seamonkey xpcom + (default: mozilla) ++ --with-libgcrypt-prefix=PFX ++ prefix where LIBGCRYPT is installed (optional) + --with-x use the X Window System + --with-ruby=PATH Ruby interpreter path (default: auto-detect) + --with-rgettext=PATH rgettext path (default: auto-detect) +- --with-cutter Use Cutter (default: auto) + + Some influential environment variables: + CC C compiler command +@@ -1752,7 +1745,7 @@ + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + CXX C++ compiler command +@@ -1791,13 +1784,6 @@ + ANTHY_CFLAGS + C compiler flags for ANTHY, overriding pkg-config + ANTHY_LIBS linker flags for ANTHY, overriding pkg-config +- CUTTER_CFLAGS +- C compiler flags for CUTTER, overriding pkg-config +- CUTTER_LIBS linker flags for CUTTER, overriding pkg-config +- GCUTTER_CFLAGS +- C compiler flags for GCUTTER, overriding pkg-config +- GCUTTER_LIBS +- linker flags for GCUTTER, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -1866,7 +1852,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + kazehakase configure 0.5.8 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -1913,25 +1899,24 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +-# ac_fn_c_try_link LINENO +-# ----------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_link () ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" ++ if { { ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" + $as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 +@@ -1939,97 +1924,108 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$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_retval=0 + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ ac_retval=1 + fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + +-} # ac_fn_c_try_link ++} # ac_fn_c_try_cpp + +-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- +-# Tests whether HEADER exists and can be compiled using the include files in +-# INCLUDES, setting the cache variable VAR accordingly. +-ac_fn_c_check_header_compile () ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $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 : + $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } + else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" ++ ac_header_compiler=yes + else +- eval "$3=no" ++ ac_header_compiler=no + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + +-} # ac_fn_c_check_header_compile ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++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; } + +-# ac_fn_c_try_cpp LINENO +-# ---------------------- +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_cpp () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $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;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $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 +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then : +- ac_retval=0 ++ { $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 : ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval + +-} # ac_fn_c_try_cpp ++} # ac_fn_c_check_header_mongrel + + # ac_fn_c_try_run LINENO + # ---------------------- +@@ -2069,10 +2065,87 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $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 : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ 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_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link ++ + # ac_fn_c_check_func LINENO FUNC VAR + # ---------------------------------- + # Tests whether FUNC exists, setting the cache variable VAR accordingly +@@ -2174,7 +2247,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile + +@@ -2211,7 +2284,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_cpp + +@@ -2257,7 +2330,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_link + +@@ -2299,102 +2372,15 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_run +- +-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists, giving a warning if it cannot be compiled using +-# the include files in INCLUDES and setting the cache variable VAR +-# accordingly. +-ac_fn_c_check_header_mongrel () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +- { $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 : +- $as_echo_n "(cached) " >&6 +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +-$as_echo_n "checking $2 usability... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_header_compiler=yes +-else +- ac_header_compiler=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +-$as_echo_n "checking $2 presence... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <$2> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- ac_header_preproc=yes +-else +- ac_header_preproc=no +-fi +-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; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( +- yes:no: ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $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;} +- ;; +- no:yes:* ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} +- { $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 +- { $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 : +- $as_echo_n "(cached) " >&6 +-else +- eval "$3=\$ac_header_compiler" +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- +-} # ac_fn_c_check_header_mongrel + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by kazehakase $as_me 0.5.8, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + +@@ -2647,7 +2633,7 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +@@ -2656,9 +2642,9 @@ + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -2740,6 +2726,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ++## The variable pkglibexecdir was introduced in Automake 1.11. + am__api_version='1.11' + + ac_aux_dir= +@@ -3077,6 +3064,7 @@ + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -3084,7 +3072,6 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -3370,397 +3357,6 @@ + fi + + +-# Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then : +- enableval=$enable_shared; p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac +-else +- enable_shared=yes +-fi +- +- +- +- +- +- +- +- +- +-# Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then : +- enableval=$enable_static; p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac +-else +- enable_static=no +-fi +- +- +- +- +- +- +- +- +- +- +-enable_win32_dll=yes +- +-case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +-set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AS"; then +- ac_cv_prog_AS="$AS" # Let the user override the test. +-else +-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_prog_AS="${ac_tool_prefix}as" +- $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 +- +-fi +-fi +-AS=$ac_cv_prog_AS +-if test -n "$AS"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +-$as_echo "$AS" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_AS"; then +- ac_ct_AS=$AS +- # Extract the first word of "as", so it can be a program name with args. +-set dummy as; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_AS"; then +- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +-else +-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_prog_ac_ct_AS="as" +- $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 +- +-fi +-fi +-ac_ct_AS=$ac_cv_prog_ac_ct_AS +-if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +-$as_echo "$ac_ct_AS" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_AS" = x; then +- AS="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- AS=$ac_ct_AS +- fi +-else +- AS="$ac_cv_prog_AS" +-fi +- +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$DLLTOOL"; then +- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +-else +-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_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- $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 +- +-fi +-fi +-DLLTOOL=$ac_cv_prog_DLLTOOL +-if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +-$as_echo "$DLLTOOL" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_DLLTOOL"; then +- ac_ct_DLLTOOL=$DLLTOOL +- # Extract the first word of "dlltool", so it can be a program name with args. +-set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_DLLTOOL"; then +- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +-else +-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_prog_ac_ct_DLLTOOL="dlltool" +- $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 +- +-fi +-fi +-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +-if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +-$as_echo "$ac_ct_DLLTOOL" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_DLLTOOL" = x; then +- DLLTOOL="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- DLLTOOL=$ac_ct_DLLTOOL +- fi +-else +- DLLTOOL="$ac_cv_prog_DLLTOOL" +-fi +- +- 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 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$OBJDUMP"; then +- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +-else +-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_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $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 +- +-fi +-fi +-OBJDUMP=$ac_cv_prog_OBJDUMP +-if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +-$as_echo "$OBJDUMP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-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 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_OBJDUMP"; then +- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +-else +-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_prog_ac_ct_OBJDUMP="objdump" +- $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 +- +-fi +-fi +-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +-if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +-$as_echo "$ac_ct_OBJDUMP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_OBJDUMP" = x; then +- OBJDUMP="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- OBJDUMP=$ac_ct_OBJDUMP +- fi +-else +- OBJDUMP="$ac_cv_prog_OBJDUMP" +-fi +- +- ;; +-esac +- +-test -z "$AS" && AS=as +- +- +- +- +- +-test -z "$DLLTOOL" && DLLTOOL=dlltool +- +- +- +- +- +-test -z "$OBJDUMP" && OBJDUMP=objdump +- +- +- +- +- +- +- +-case `pwd` in +- *\ * | *\ *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +-esac +- +- +- +-macro_version='2.2.6' +-macro_revision='1.3012' +- +- +- +- +- +- +- +- +- +- +- +- +- +-ltmain="$ac_aux_dir/ltmain.sh" +- + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" +@@ -4145,32 +3741,30 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <stdio.h> ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -4232,10 +3826,10 @@ + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -4243,51 +3837,18 @@ + { as_fn_set_status 77 + as_fn_error "C compiler cannot create executables + See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -4320,13 +3881,72 @@ + as_fn_error "cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++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 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -4717,86 +4337,143 @@ + fi + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +-$as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then : ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +- for ac_i in 1 2 3 4 5 6 7; do +- ac_script="$ac_script$as_nl$ac_script" +- done +- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- { ac_script=; unset ac_script;} +- if test -z "$SED"; then +- ac_path_SED_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes + do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do +- 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 +-# Check for GNU ac_path_SED and select it if it is found. +- # Check for GNU $ac_path_SED +-case `"$ac_path_SED" --version 2>&1` in +-*GNU*) +- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $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 +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- 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" +- ac_path_SED_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <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. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + +- $ac_path_SED_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_SED"; then +- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 +- fi + else +- ac_cv_path_SED=$SED ++ # Broken: fails on valid input. ++continue + fi ++rm -f conftest.err conftest.$ac_ext + ++ # 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 ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +-$as_echo "$ac_cv_path_SED" >&6; } +- SED="$ac_cv_path_SED" +- rm -f conftest.sed +- +-test -z "$SED" && SED=sed +-Xsed="$SED -e 1s/^X//" +- ++rm -f conftest.err conftest.$ac_ext + ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi + ++ done ++ ac_cv_prog_CPP=$CPP + ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <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. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.$ac_ext + ++ # 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 ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.$ac_ext + ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : + ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } ++fi + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +@@ -4929,6 +4606,671 @@ + EGREP="$ac_cv_path_EGREP" + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : ++ MINIX=yes ++else ++ MINIX= ++fi ++ ++ ++ if test "$MINIX" = yes; then ++ ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h ++ ++ ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h ++ ++ ++$as_echo "#define _MINIX 1" >>confdefs.h ++ ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 ++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++# define __EXTENSIONS__ 1 ++ $ac_includes_default ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_safe_to_define___extensions__=yes ++else ++ ac_cv_safe_to_define___extensions__=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 ++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } ++ test $ac_cv_safe_to_define___extensions__ = yes && ++ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h ++ ++ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h ++ ++ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ++ ++ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h ++ ++ ++ ++# Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then : ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --enable-static was given. ++if test "${enable_static+set}" = set; then : ++ enableval=$enable_static; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_static=no ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++enable_win32_dll=yes ++ ++case $host in ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. ++set dummy ${ac_tool_prefix}as; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AS"; then ++ ac_cv_prog_AS="$AS" # Let the user override the test. ++else ++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_prog_AS="${ac_tool_prefix}as" ++ $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 ++ ++fi ++fi ++AS=$ac_cv_prog_AS ++if test -n "$AS"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 ++$as_echo "$AS" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AS"; then ++ ac_ct_AS=$AS ++ # Extract the first word of "as", so it can be a program name with args. ++set dummy as; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AS"; then ++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. ++else ++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_prog_ac_ct_AS="as" ++ $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 ++ ++fi ++fi ++ac_ct_AS=$ac_cv_prog_ac_ct_AS ++if test -n "$ac_ct_AS"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 ++$as_echo "$ac_ct_AS" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_AS" = x; then ++ AS="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AS=$ac_ct_AS ++ fi ++else ++ AS="$ac_cv_prog_AS" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++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_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $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 ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++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_prog_ac_ct_DLLTOOL="dlltool" ++ $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 ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++ 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++else ++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_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ $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 ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++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_prog_ac_ct_OBJDUMP="objdump" ++ $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 ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++ ;; ++esac ++ ++test -z "$AS" && AS=as ++ ++ ++ ++ ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ ++ ++case `pwd` in ++ *\ * | *\ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++esac ++ ++ ++ ++macro_version='2.2.6' ++macro_revision='1.3012' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 ++$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++if test "${ac_cv_path_SED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ { ac_script=; unset ac_script;} ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in sed gsed; do ++ 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 ++# Check for GNU ac_path_SED and select it if it is found. ++ # Check for GNU $ac_path_SED ++case `"$ac_path_SED" --version 2>&1` in ++*GNU*) ++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $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 ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ 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" ++ ac_path_SED_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_SED_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_SED"; then ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_SED=$SED ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed ++ ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } + if test "${ac_cv_path_FGREP+set}" = set; then : +@@ -5301,13 +5643,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:5304: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5646: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5307: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5649: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5310: output\"" >&5) ++ (eval echo "\"\$as_me:5652: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6478,7 +6820,6 @@ + + + +- + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -6510,7 +6851,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6513 "configure"' > conftest.$ac_ext ++ echo '#line 6854 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7257,274 +7598,6 @@ + ;; + esac + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +-$as_echo_n "checking how to run the C preprocessor... " >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= +-fi +-if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CPP needs to be expanded +- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <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. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.$ac_ext +- +- # 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 +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CPP=$CPP +- +-fi +- CPP=$ac_cv_prog_CPP +-else +- ac_cv_prog_CPP=$CPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } +-ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <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. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.$ac_ext +- +- # 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 +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdc=yes +-else +- ac_cv_header_stdc=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <string.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <stdlib.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif +- +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-$as_echo "#define STDC_HEADERS 1" >>confdefs.h +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +-" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- + for ac_header in dlfcn.h + do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +@@ -7978,11 +8051,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7981: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8054: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7985: \$? = $ac_status" >&5 ++ echo "$as_me:8058: \$? = $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. +@@ -8317,11 +8390,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8320: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8393: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8324: \$? = $ac_status" >&5 ++ echo "$as_me:8397: \$? = $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. +@@ -8422,11 +8495,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8425: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8498: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8429: \$? = $ac_status" >&5 ++ echo "$as_me:8502: \$? = $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 +@@ -8477,11 +8550,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8480: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8553: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8484: \$? = $ac_status" >&5 ++ echo "$as_me:8557: \$? = $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 +@@ -10860,7 +10933,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10863 "configure" ++#line 10936 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10956,7 +11029,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10959 "configure" ++#line 11032 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11569,8 +11642,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -11954,8 +12027,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -14098,11 +14171,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14101: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14174: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14105: \$? = $ac_status" >&5 ++ echo "$as_me:14178: \$? = $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. +@@ -14197,11 +14270,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14200: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14273: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14204: \$? = $ac_status" >&5 ++ echo "$as_me:14277: \$? = $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 +@@ -14249,11 +14322,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14252: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14325: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14256: \$? = $ac_status" >&5 ++ echo "$as_me:14329: \$? = $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 +@@ -15519,8 +15592,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -16484,32 +16557,39 @@ + + gecko_version_major=`echo $gecko_version | awk '{ print $1; }'` + gecko_version_minor=`echo $gecko_version | awk '{ print $2; }'` ++gecko_version_micro=`echo $gecko_version | awk '{ print $3; }'` + +-if test -n "$gecko_version_major" -a -n "$gecko_version_minor"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gecko_version_major.$gecko_version_minor" >&5 +-$as_echo "$gecko_version_major.$gecko_version_minor" >&6; } ++## The test options -a and -o are not portable. ++if test -n "$gecko_version_major" && test -n "$gecko_version_minor"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gecko_version_major.$gecko_version_minor.$gecko_version_micro" >&5 ++$as_echo "$gecko_version_major.$gecko_version_minor.$gecko_version_micro" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + as_fn_error "Can't detect Gecko version" "$LINENO" 5 + fi + +-if test $gecko_version_major -ne 1 -o \ +- $gecko_version_minor -lt 7 -o \ +- $gecko_version_minor -gt 9; then ++if test $gecko_version_major -ne 1 || \ ++ test $gecko_version_minor -lt 7 || \ ++ test $gecko_version_minor -gt 9; then + as_fn_error "Unsupported Gecko version $gecko_version_major.$gecko_version_minor" "$LINENO" 5 + fi + +-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 8; then ++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 8; then + + $as_echo "#define HAVE_GECKO_1_8 1" >>confdefs.h + + fi +-if test $gecko_version_major -eq 1 -a $gecko_version_minor -ge 9; then ++if test $gecko_version_major -eq 1 && test $gecko_version_minor -ge 9; then + + $as_echo "#define HAVE_GECKO_1_9 1" >>confdefs.h + + fi ++if test $gecko_version_minor -eq 9 && test $gecko_version_micro -eq 1; then ++ ++$as_echo "#define HAVE_GECKO_1_9_1 1" >>confdefs.h ++ ++fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether nsPIDOMWindow methods return nsPIDOMWindow*" >&5 + $as_echo_n "checking whether nsPIDOMWindow methods return nsPIDOMWindow*... " >&6; } +@@ -16946,6 +17026,357 @@ + + + ++# Check whether --enable-glibtest was given. ++if test "${enable_glibtest+set}" = set; then : ++ enableval=$enable_glibtest; ++else ++ enable_glibtest=yes ++fi ++ ++ ++ pkg_config_args=glib-2.0 ++ for module in . gmodule gobject gthread ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; ++ esac ++ done ++ ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.16 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++ no_glib="" ++ ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ ++ min_glib_version=2.13.5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 ++$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } ++ ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi ++ ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi ++ ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++ rm -f conf.glibtest ++ if test "$cross_compiling" = yes; then : ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ int ignored; ++ ++ ignored = system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++ ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ no_glib=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ : ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <glib.h> ++#include <stdio.h> ++ ++int ++main () ++{ ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++else ++ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed." ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ as_fn_error "GLib is required." "$LINENO" 5 ++ fi ++ ++ ++ ++ ++ ++ rm -f conf.glibtest ++ ++ + # Check whether --enable-gtktest was given. + if test "${enable_gtktest+set}" = set; then : + enableval=$enable_gtktest; +@@ -17828,6 +18259,143 @@ + $as_echo "#define USE_SSL 1" >>confdefs.h + + fi ++ ++ ++# Check whether --with-libgcrypt-prefix was given. ++if test "${with_libgcrypt_prefix+set}" = set; then : ++ withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval" ++else ++ libgcrypt_config_prefix="" ++fi ++ ++ if test x$libgcrypt_config_prefix != x ; then ++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ fi ++ fi ++ ++ # Extract the first word of "libgcrypt-config", so it can be a program name with args. ++set dummy libgcrypt-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $LIBGCRYPT_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_LIBGCRYPT_CONFIG="$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 ++ ++ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no" ++ ;; ++esac ++fi ++LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG ++if test -n "$LIBGCRYPT_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5 ++$as_echo "$LIBGCRYPT_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ tmp=1.2.0 ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_libgcrypt_api=0 ++ min_libgcrypt_version="$tmp" ++ fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5 ++$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; } ++ ok=no ++ if test "$LIBGCRYPT_CONFIG" != "no" ; then ++ req_major=`echo $min_libgcrypt_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` ++ req_minor=`echo $min_libgcrypt_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` ++ req_micro=`echo $min_libgcrypt_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` ++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ major=`echo $libgcrypt_config_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` ++ minor=`echo $libgcrypt_config_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` ++ micro=`echo $libgcrypt_config_version | \ ++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` ++ if test "$major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$major" -eq "$req_major"; then ++ if test "$minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$minor" -eq "$req_minor"; then ++ if test "$micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5 ++$as_echo "yes ($libgcrypt_config_version)" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ if test $ok = yes; then ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5 ++$as_echo_n "checking LIBGCRYPT API version... " >&6; } ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5 ++$as_echo "okay" >&6; } ++ else ++ ok=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5 ++$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; } ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ : ++ else ++ LIBGCRYPT_CFLAGS="" ++ LIBGCRYPT_LIBS="" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgcrypt was not found." >&5 ++$as_echo "$as_me: WARNING: libgcrypt was not found." >&2;} ++ fi ++ ++ ++ + fi + + +@@ -20409,6 +20977,25 @@ + + fi + ++## This function is available only in GTK+ >= 2.15.x. ++TEMP_CFLAGS="$CFLAGS" ++TEMP_LIBS="$LIBS" ++CFLAGS="$CFLAGS $GTK_CFLAGS" ++LIBS="$LIBS $GTK_LIBS" ++for ac_func in gtk_activatable_set_related_action ++do : ++ ac_fn_c_check_func "$LINENO" "gtk_activatable_set_related_action" "ac_cv_func_gtk_activatable_set_related_action" ++if test "x$ac_cv_func_gtk_activatable_set_related_action" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GTK_ACTIVATABLE_SET_RELATED_ACTION 1 ++_ACEOF ++ ++fi ++done ++ ++CFLAGS="$TEMP_CFLAGS" ++LIBS="$TEMP_LIBS" ++ + + # Check whether --enable-migemo was given. + if test "${enable_migemo+set}" = set; then : +@@ -21055,203 +21642,7 @@ + fi + + +- +- +- +- +-# Check whether --with-cutter was given. +-if test "${with_cutter+set}" = set; then : +- withval=$with_cutter; ac_cv_use_cutter=$withval +-else +- ac_cv_use_cutter=auto +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Cutter" >&5 +-$as_echo_n "checking whether to use Cutter... " >&6; } +-if test "${ac_cv_use_cutter+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_use_cutter=auto +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_use_cutter" >&5 +-$as_echo "$ac_cv_use_cutter" >&6; } +- if test "$ac_cv_use_cutter" != "no"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUTTER" >&5 +-$as_echo_n "checking for CUTTER... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$CUTTER_CFLAGS"; then +- pkg_cv_CUTTER_CFLAGS="$CUTTER_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter >= 1.0.6\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "cutter >= 1.0.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_CUTTER_CFLAGS=`$PKG_CONFIG --cflags "cutter >= 1.0.6" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$CUTTER_LIBS"; then +- pkg_cv_CUTTER_LIBS="$CUTTER_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter >= 1.0.6\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "cutter >= 1.0.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_CUTTER_LIBS=`$PKG_CONFIG --libs "cutter >= 1.0.6" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- CUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cutter >= 1.0.6"` +- else +- CUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cutter >= 1.0.6"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$CUTTER_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- ac_cv_use_cutter=no +-elif test $pkg_failed = untried; then +- ac_cv_use_cutter=no +-else +- CUTTER_CFLAGS=$pkg_cv_CUTTER_CFLAGS +- CUTTER_LIBS=$pkg_cv_CUTTER_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- : +-fi +- +- +- fi +- +- if test "$ac_cv_use_cutter" != "no"; then +- if test -n "$PKG_CONFIG"; then +- if test -n "$CUTTER"; then +- pkg_cv_CUTTER="$CUTTER" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cutter\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "cutter") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_CUTTER=`$PKG_CONFIG --variable=cutter "cutter" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- CUTTER=$pkg_cv_CUTTER +- +- fi +- +- ac_cv_use_gcutter=no +- if test "$ac_cv_use_cutter" != "no"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCUTTER" >&5 +-$as_echo_n "checking for GCUTTER... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$GCUTTER_CFLAGS"; then +- pkg_cv_GCUTTER_CFLAGS="$GCUTTER_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcutter >= 1.0.6\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gcutter >= 1.0.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GCUTTER_CFLAGS=`$PKG_CONFIG --cflags "gcutter >= 1.0.6" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GCUTTER_LIBS"; then +- pkg_cv_GCUTTER_LIBS="$GCUTTER_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcutter >= 1.0.6\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gcutter >= 1.0.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GCUTTER_LIBS=`$PKG_CONFIG --libs "gcutter >= 1.0.6" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GCUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gcutter >= 1.0.6"` +- else +- GCUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gcutter >= 1.0.6"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GCUTTER_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- : +-elif test $pkg_failed = untried; then +- : +-else +- GCUTTER_CFLAGS=$pkg_cv_GCUTTER_CFLAGS +- GCUTTER_LIBS=$pkg_cv_GCUTTER_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- ac_cv_use_gcutter=yes +-fi +- +- +- fi +- +- ++ac_cv_use_cutter="no" + + if test "$ac_cv_use_cutter" != "no"; then + WITH_CUTTER_TRUE= +@@ -21268,157 +21659,6 @@ + fi + + +- +- # Check whether --enable-coverage was given. +-if test "${enable_coverage+set}" = set; then : +- enableval=$enable_coverage; ac_cv_enable_coverage=$enableval +-else +- ac_cv_enable_coverage=no +-fi +- +- if test "x$GCC" != "xyes"; then +- ac_cv_enable_coverage=no +- fi +- +- cutter_has_lcov=no +- ltp_version_list="1.6 1.7" +- # Extract the first word of "lcov", so it can be a program name with args. +-set dummy lcov; 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_prog_LCOV+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$LCOV"; then +- ac_cv_prog_LCOV="$LCOV" # Let the user override the test. +-else +-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_prog_LCOV="lcov" +- $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 +- +-fi +-fi +-LCOV=$ac_cv_prog_LCOV +-if test -n "$LCOV"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 +-$as_echo "$LCOV" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- # Extract the first word of "genhtml", so it can be a program name with args. +-set dummy genhtml; 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_prog_GENHTML+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$GENHTML"; then +- ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. +-else +-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_prog_GENHTML="genhtml" +- $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 +- +-fi +-fi +-GENHTML=$ac_cv_prog_GENHTML +-if test -n "$GENHTML"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 +-$as_echo "$GENHTML" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- +- if test "$LCOV"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltp version" >&5 +-$as_echo_n "checking for ltp version... " >&6; } +-if test "${cutter_cv_ltp_version+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- +- cutter_cv_ltp_version=invalid +- ltp_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` +- for ltp_check_version in $ltp_version_list; do +- if test "$ltp_version" = "$ltp_check_version"; then +- cutter_cv_ltp_version="$ltp_check_version (ok)" +- fi +- done +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cutter_cv_ltp_version" >&5 +-$as_echo "$cutter_cv_ltp_version" >&6; } +- fi +- +- case $cutter_cv_ltp_version in +- ""|invalid) +- ;; +- *) +- cutter_has_lcov=yes +- ;; +- esac +- +- if test "x$cutter_has_lcov" != "xyes"; then +- ac_cv_enable_coverage=no +- fi +- +- COVERAGE_CFLAGS= +- if test "x$ac_cv_enable_coverage" = "xyes"; then +- COVERAGE_CFLAGS="--coverage" +- fi +- +- if test "x$ac_cv_enable_coverage" = "xyes"; then +- ENABLE_COVERAGE_TRUE= +- ENABLE_COVERAGE_FALSE='#' +-else +- ENABLE_COVERAGE_TRUE='#' +- ENABLE_COVERAGE_FALSE= +-fi +- +- +- COVERAGE_INFO_FILE="coverage.info" +- +- +- COVERAGE_REPORT_DIR="coverage" +- +- +- if test "$GENHTML_OPTIONS" = ""; then +- GENHTML_OPTIONS="" +- fi +- +- +- if test "x$ac_cv_enable_coverage" = "xyes"; then +- ac_config_commands="$ac_config_commands coverage" +- +- fi +- + GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'" + + KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS" +@@ -21730,10 +21970,6 @@ + as_fn_error "conditional \"WITH_CUTTER\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then +- as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + + : ${CONFIG_STATUS=./config.status} + ac_write_fail=0 +@@ -22143,7 +22379,7 @@ + # values after options handling. + ac_log=" + This file was extended by kazehakase $as_me 0.5.8, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -22183,6 +22419,7 @@ + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -22205,10 +22442,11 @@ + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + kazehakase config.status 0.5.8 +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + + Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation +@@ -22246,6 +22484,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -22685,7 +22925,6 @@ + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "rgettext") CONFIG_COMMANDS="$CONFIG_COMMANDS rgettext" ;; +- "coverage") CONFIG_COMMANDS="$CONFIG_COMMANDS coverage" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "rgettext.mk") CONFIG_FILES="$CONFIG_FILES rgettext.mk" ;; +@@ -22834,7 +23073,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -22848,7 +23087,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -24230,29 +24469,6 @@ + " \ + po/Makefile + ;; +- "coverage":C) +- if grep '^coverage:' Makefile > /dev/null; then +- : # do nothing +- else +- cat >>Makefile <<EOS +- +-coverage-clean: +- \$(LCOV) --compat-libtool --zerocounters --directory . \\ +- --output-file \$(COVERAGE_INFO_FILE) +- +-coverage: coverage-clean check +- \$(LCOV) --compat-libtool --directory . \\ +- --capture --output-file \$(COVERAGE_INFO_FILE) +- \$(LCOV) --compat-libtool --directory . \\ +- --extract \$(COVERAGE_INFO_FILE) "\`(cd '\$(top_srcdir)'; pwd)\`/*" \\ +- --output-file \$(COVERAGE_INFO_FILE) +- \$(GENHTML) --highlight --legend \\ +- --output-directory \$(COVERAGE_REPORT_DIR) \\ +- --prefix "\`(cd '\$(top_srcdir)'; pwd)\`" \\ +- \$(GENHTML_OPTIONS) \$(COVERAGE_INFO_FILE) +-EOS +- fi +- ;; + "po/stamp-it":C) + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 +diff -urNad kazehakase-0.5.8~/data/Makefile.in kazehakase-0.5.8/data/Makefile.in +--- kazehakase-0.5.8~/data/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/Makefile.in 2009-12-07 21:19:47.000000000 +0200 +@@ -140,14 +140,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -174,19 +168,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -204,9 +197,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/data/ext/Makefile.in kazehakase-0.5.8/data/ext/Makefile.in +--- kazehakase-0.5.8~/data/ext/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/ext/Makefile.in 2009-12-07 21:19:47.000000000 +0200 +@@ -116,14 +116,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -150,19 +144,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -180,9 +173,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/data/ext/ruby/Makefile.in kazehakase-0.5.8/data/ext/ruby/Makefile.in +--- kazehakase-0.5.8~/data/ext/ruby/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/ext/ruby/Makefile.in 2009-12-07 21:19:47.000000000 +0200 +@@ -139,14 +139,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -173,19 +167,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -203,9 +196,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/data/ext/ruby/kz/Makefile.in kazehakase-0.5.8/data/ext/ruby/kz/Makefile.in +--- kazehakase-0.5.8~/data/ext/ruby/kz/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/ext/ruby/kz/Makefile.in 2009-12-07 21:19:47.000000000 +0200 +@@ -139,14 +139,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -173,19 +167,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -203,9 +196,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/data/ext/ruby/kz/actions/Makefile.in kazehakase-0.5.8/data/ext/ruby/kz/actions/Makefile.in +--- kazehakase-0.5.8~/data/ext/ruby/kz/actions/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/ext/ruby/kz/actions/Makefile.in 2009-12-07 21:19:48.000000000 +0200 +@@ -99,14 +99,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -133,19 +127,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -163,9 +156,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/data/icons/Makefile.in kazehakase-0.5.8/data/icons/Makefile.in +--- kazehakase-0.5.8~/data/icons/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/data/icons/Makefile.in 2009-12-07 21:19:48.000000000 +0200 +@@ -99,14 +99,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -133,19 +127,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -163,9 +156,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/dbus/Makefile.in kazehakase-0.5.8/dbus/Makefile.in +--- kazehakase-0.5.8~/dbus/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/dbus/Makefile.in 2009-12-07 21:19:48.000000000 +0200 +@@ -35,8 +35,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = kz-embed-process$(EXEEXT) +-noinst_PROGRAMS = sample-browser$(EXEEXT) ++noinst_PROGRAMS = kz-embed-process$(EXEEXT) sample-browser$(EXEEXT) + subdir = dbus + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -57,12 +56,12 @@ + libkzdbus_la_LIBADD = + am_libkzdbus_la_OBJECTS = kz-dbus-embed-agent.lo + libkzdbus_la_OBJECTS = $(am_libkzdbus_la_OBJECTS) +-am__installdirs = "$(DESTDIR)$(bindir)" +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++PROGRAMS = $(noinst_PROGRAMS) + am_kz_embed_process_OBJECTS = kz-embed-process.$(OBJEXT) + kz_embed_process_OBJECTS = $(am_kz_embed_process_OBJECTS) + am__DEPENDENCIES_1 = + kz_embed_process_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libkazehakase.la + am_sample_browser_OBJECTS = sample-browser.$(OBJEXT) + sample_browser_OBJECTS = $(am_sample_browser_OBJECTS) +@@ -111,14 +110,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -145,19 +138,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -175,9 +167,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -342,6 +336,8 @@ + + kz_embed_process_LDADD = \ + $(DBUS_GLIB_LIBS) \ ++ $(GLIB_LIBS) \ ++ $(GTK_LIBS) \ + $(top_builddir)/src/libkazehakase.la + + sample_browser_LDADD = \ +@@ -396,49 +392,6 @@ + done + libkzdbus.la: $(libkzdbus_la_OBJECTS) $(libkzdbus_la_DEPENDENCIES) + $(LINK) $(libkzdbus_la_OBJECTS) $(libkzdbus_la_LIBADD) $(LIBS) +-install-binPROGRAMS: $(bin_PROGRAMS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ +- done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ +- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ +- sed 'N;N;N;s,\n, ,g' | \ +- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ +- if ($$2 == $$4) files[d] = files[d] " " $$1; \ +- else { print "f", $$3 "/" $$4, $$1; } } \ +- END { for (d in files) print "f", d, files[d] }' | \ +- while read type dir files; do \ +- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ +- test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ +- } \ +- ; done +- +-uninstall-binPROGRAMS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ +- files=`for p in $$list; do echo "$$p"; done | \ +- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ +- test -n "$$list" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(bindir)" && rm -f $$files +- +-clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ +@@ -579,9 +532,6 @@ + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) + installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -612,8 +562,8 @@ + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + +-clean-am: clean-binPROGRAMS clean-generic clean-libtool \ +- clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ ++ clean-noinstPROGRAMS mostlyclean-am + + distclean: distclean-am + -rm -rf ./$(DEPDIR) +@@ -639,7 +589,7 @@ + + install-dvi-am: + +-install-exec-am: install-binPROGRAMS ++install-exec-am: + + install-html: install-html-am + +@@ -679,24 +629,23 @@ + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS ++uninstall-am: + + .MAKE: all check install install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-generic clean-libtool clean-noinstLTLIBRARIES \ +- clean-noinstPROGRAMS ctags distclean distclean-compile \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-binPROGRAMS ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + + kz-dbus-embed-agent-server-bindings.h: kazehakase-embed.xml +diff -urNad kazehakase-0.5.8~/doc/Makefile.in kazehakase-0.5.8/doc/Makefile.in +--- kazehakase-0.5.8~/doc/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/doc/Makefile.in 2009-12-07 21:19:49.000000000 +0200 +@@ -100,14 +100,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -134,19 +128,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -164,9 +157,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/etc/Makefile.in kazehakase-0.5.8/etc/Makefile.in +--- kazehakase-0.5.8~/etc/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/etc/Makefile.in 2009-12-07 21:19:49.000000000 +0200 +@@ -142,14 +142,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -176,19 +170,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -206,9 +199,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/etc/mozilla/Makefile.in kazehakase-0.5.8/etc/mozilla/Makefile.in +--- kazehakase-0.5.8~/etc/mozilla/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/etc/mozilla/Makefile.in 2009-12-07 21:19:49.000000000 +0200 +@@ -99,14 +99,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -133,19 +127,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -163,9 +156,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/ext/Makefile.in kazehakase-0.5.8/ext/Makefile.in +--- kazehakase-0.5.8~/ext/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/ext/Makefile.in 2009-12-07 21:19:49.000000000 +0200 +@@ -116,14 +116,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -150,19 +144,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -180,9 +173,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/ext/ruby/Makefile.in kazehakase-0.5.8/ext/ruby/Makefile.in +--- kazehakase-0.5.8~/ext/ruby/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/ext/ruby/Makefile.in 2009-12-07 21:19:50.000000000 +0200 +@@ -78,16 +78,13 @@ + am__DEPENDENCIES_1 = + ruby_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(top_builddir)/src/libkazehakase.la ++ $(top_builddir)/src/libkazehakase.la + am_ruby_la_OBJECTS = kz-ruby-ext.lo kz-rb-ext.lo kz-rb-app.lo \ + kz-rb-window.lo kz-rb-notebook.lo kz-rb-statusbar.lo \ + kz-rb-embed.lo kz-rb-embed-event.lo kz-rb-conf.lo \ + kz-rb-downloader.lo kz-rb-downloader-group.lo \ + kz-rb-bookmark.lo kz-rb-sidebar.lo kz-rb-web.lo + ruby_la_OBJECTS = $(am_ruby_la_OBJECTS) +-ruby_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ruby_la_LDFLAGS) \ +- $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -113,7 +110,15 @@ + -DG_DISABLE_DEPRECATED=1 + + AM_CXXFLAGS = @AM_CXXFLAGS@ +-AM_LDFLAGS = @AM_LDFLAGS@ ++AM_LDFLAGS = \ ++ -rpath $(extdir) \ ++ -avoid-version \ ++ -module \ ++ -export-dynamic $(no_undefined) \ ++ $(LIBTOOL_EXPORT_OPTIONS) \ ++ $(RUBY_LDFLAGS) \ ++ $(RUBY_EXT_LDFLAGS) ++ + AM_MAKEFLAGS = @AM_MAKEFLAGS@ + ANTHY_CFLAGS = @ANTHY_CFLAGS@ + ANTHY_LIBS = @ANTHY_LIBS@ +@@ -128,14 +133,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -162,19 +161,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -192,15 +190,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ +-LDFLAGS = \ +- -rpath $(extdir) \ +- -avoid-version \ +- -module \ +- -export-dynamic $(no_undefined) \ +- $(LIBTOOL_EXPORT_OPTIONS) +- ++LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -343,7 +337,6 @@ + top_srcdir = @top_srcdir@ + ext_LTLIBRARIES = ruby.la + INCLUDES = \ +- $(MOZILLA_COMPONENT_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBGNUTLS_CFLAGS) \ + $(RUBY_CFLAGS) \ +@@ -382,16 +375,11 @@ + kz-rb-sidebar.c \ + kz-rb-web.c + +-ruby_la_LDFLAGS = \ +- $(RUBY_LDFLAGS) \ +- $(RUBY_EXT_LDFLAGS) +- + ruby_la_LIBADD = \ + $(INTLLIBS) \ + $(GTK_LIBS) \ + $(LIBGNUTLS_LIBS) \ + $(RUBY_LIBS) \ +- $(MOZILLA_COMPONENT_LIBS) \ + $(top_builddir)/src/libkazehakase.la + + all: all-am +@@ -460,7 +448,7 @@ + rm -f "$${dir}/so_locations"; \ + done + ruby.la: $(ruby_la_OBJECTS) $(ruby_la_DEPENDENCIES) +- $(ruby_la_LINK) -rpath $(extdir) $(ruby_la_OBJECTS) $(ruby_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(extdir) $(ruby_la_OBJECTS) $(ruby_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urNad kazehakase-0.5.8~/libegg/Makefile.in kazehakase-0.5.8/libegg/Makefile.in +--- kazehakase-0.5.8~/libegg/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/libegg/Makefile.in 2009-12-07 21:19:50.000000000 +0200 +@@ -113,14 +113,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -147,19 +141,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -177,9 +170,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/libegg/pixbufthumbnail/Makefile.in kazehakase-0.5.8/libegg/pixbufthumbnail/Makefile.in +--- kazehakase-0.5.8~/libegg/pixbufthumbnail/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/libegg/pixbufthumbnail/Makefile.in 2009-12-07 21:19:50.000000000 +0200 +@@ -114,14 +114,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -148,19 +142,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -178,9 +171,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/Makefile.in kazehakase-0.5.8/module/Makefile.in +--- kazehakase-0.5.8~/module/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/Makefile.in 2009-12-07 21:19:51.000000000 +0200 +@@ -113,14 +113,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -147,19 +141,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -177,9 +170,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/Makefile.in kazehakase-0.5.8/module/embed/Makefile.in +--- kazehakase-0.5.8~/module/embed/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/Makefile.in 2009-12-07 21:19:51.000000000 +0200 +@@ -117,14 +117,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -151,19 +145,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -181,9 +174,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/gecko/Makefile.in kazehakase-0.5.8/module/embed/gecko/Makefile.in +--- kazehakase-0.5.8~/module/embed/gecko/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/gecko/Makefile.in 2009-12-07 21:19:51.000000000 +0200 +@@ -188,7 +188,13 @@ + $(GTK_CFLAGS) \ + $(COVERAGE_CFLAGS) + +-AM_LDFLAGS = @AM_LDFLAGS@ ++AM_LDFLAGS = \ ++ -rpath $(embeddir) \ ++ -avoid-version \ ++ -module \ ++ -export-dynamic $(no_undefined) \ ++ $(LIBTOOL_EXPORT_OPTIONS) ++ + AM_MAKEFLAGS = @AM_MAKEFLAGS@ + ANTHY_CFLAGS = @ANTHY_CFLAGS@ + ANTHY_LIBS = @ANTHY_LIBS@ +@@ -203,14 +209,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -237,19 +237,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -267,16 +266,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ +-LDFLAGS = \ +- -rpath $(embeddir) \ +- -avoid-version \ +- -module \ +- -export-dynamic $(no_undefined) \ +- -R$(MOZILLA_HOME) \ +- $(LIBTOOL_EXPORT_OPTIONS) +- ++LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/gecko/gtkmozembed/Makefile.in kazehakase-0.5.8/module/embed/gecko/gtkmozembed/Makefile.in +--- kazehakase-0.5.8~/module/embed/gecko/gtkmozembed/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/gecko/gtkmozembed/Makefile.in 2009-12-07 21:19:52.000000000 +0200 +@@ -123,14 +123,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -157,19 +151,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -187,9 +180,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ +-LDFLAGS = -R$(MOZILLA_HOME) ++LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/ie/Makefile.in kazehakase-0.5.8/module/embed/ie/Makefile.in +--- kazehakase-0.5.8~/module/embed/ie/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/ie/Makefile.in 2009-12-07 21:19:52.000000000 +0200 +@@ -117,14 +117,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -151,19 +145,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -181,9 +174,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/moz-web-view/Makefile.in kazehakase-0.5.8/module/embed/moz-web-view/Makefile.in +--- kazehakase-0.5.8~/module/embed/moz-web-view/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/moz-web-view/Makefile.in 2009-12-07 21:19:52.000000000 +0200 +@@ -118,14 +118,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -152,19 +146,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -182,9 +175,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/module/embed/per-process/Makefile.in kazehakase-0.5.8/module/embed/per-process/Makefile.in +--- kazehakase-0.5.8~/module/embed/per-process/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/per-process/Makefile.in 2009-12-07 21:19:53.000000000 +0200 +@@ -35,7 +35,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = kz-embed-process$(EXEEXT) ++pkglibexec_PROGRAMS = kz-embed-process$(EXEEXT) + subdir = module/embed/per-process + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -73,20 +73,22 @@ + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +-am__installdirs = "$(DESTDIR)$(embeddir)" "$(DESTDIR)$(bindir)" ++am__installdirs = "$(DESTDIR)$(embeddir)" "$(DESTDIR)$(pkglibexecdir)" + LTLIBRARIES = $(embed_LTLIBRARIES) + am__DEPENDENCIES_1 = +-per_process_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++per_process_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) $(top_builddir)/src/libkazehakase.la + am_per_process_la_OBJECTS = per_process_la-kz-dbus-module.lo \ + per_process_la-kz-dbus-embed-delegate.lo + per_process_la_OBJECTS = $(am_per_process_la_OBJECTS) + per_process_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(per_process_la_LDFLAGS) $(LDFLAGS) -o $@ +-PROGRAMS = $(bin_PROGRAMS) ++PROGRAMS = $(pkglibexec_PROGRAMS) + am_kz_embed_process_OBJECTS = kz-embed-process.$(OBJEXT) + kz_embed_process_OBJECTS = $(am_kz_embed_process_OBJECTS) + kz_embed_process_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libkazehakase.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -124,14 +126,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -158,19 +154,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -188,9 +183,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -333,7 +330,7 @@ + top_srcdir = @top_srcdir@ + + # -*- Mode: Makefile; tab-width: 8; indent-tabs-mode: t; -*- +-CLEANFILES = *~ *.bak $(BUILD_SOURCES) ++CLEANFILES = *~ *.bak $(BUILT_SOURCES) + EXTRA_DIST = \ + kazehakase-embed.xml \ + kazehakase-embed-server.xml +@@ -358,6 +355,7 @@ + -I$(top_srcdir)/src/utils + + per_process_la_CPPFLAGS = \ ++ -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ + -DGTK_DISABLE_DEPRECATED=1 \ + -DGDK_DISABLE_DEPRECATED=1 \ + -DG_DISABLE_DEPRECATED=1 \ +@@ -375,10 +373,14 @@ + kz-dbus-embed-delegate.h + + per_process_la_LIBADD = \ +- $(DBUS_GLIB_LIBS) ++ $(DBUS_GLIB_LIBS) \ ++ $(GTK_LIBS) \ ++ $(top_builddir)/src/libkazehakase.la + + kz_embed_process_LDADD = \ + $(DBUS_GLIB_LIBS) \ ++ $(GLIB_LIBS) \ ++ $(GTK_LIBS) \ + $(top_builddir)/src/libkazehakase.la + + kz_embed_process_SOURCES = kz-embed-process.c +@@ -450,10 +452,10 @@ + done + per_process.la: $(per_process_la_OBJECTS) $(per_process_la_DEPENDENCIES) + $(per_process_la_LINK) -rpath $(embeddir) $(per_process_la_OBJECTS) $(per_process_la_LIBADD) $(LIBS) +-install-binPROGRAMS: $(bin_PROGRAMS) ++install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" ++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ +@@ -470,23 +472,23 @@ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ + } \ + ; done + +-uninstall-binPROGRAMS: ++uninstall-pkglibexecPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(bindir)" && rm -f $$files ++ echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files + +-clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++clean-pkglibexecPROGRAMS: ++ @list='$(pkglibexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ +@@ -635,7 +637,7 @@ + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) + installdirs: +- for dir in "$(DESTDIR)$(embeddir)" "$(DESTDIR)$(bindir)"; do \ ++ for dir in "$(DESTDIR)$(embeddir)" "$(DESTDIR)$(pkglibexecdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -668,8 +670,8 @@ + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + +-clean-am: clean-binPROGRAMS clean-embedLTLIBRARIES clean-generic \ +- clean-libtool mostlyclean-am ++clean-am: clean-embedLTLIBRARIES clean-generic clean-libtool \ ++ clean-pkglibexecPROGRAMS mostlyclean-am + + distclean: distclean-am + -rm -rf ./$(DEPDIR) +@@ -695,7 +697,7 @@ + + install-dvi-am: + +-install-exec-am: install-binPROGRAMS ++install-exec-am: install-pkglibexecPROGRAMS + + install-html: install-html-am + +@@ -735,24 +737,25 @@ + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-embedLTLIBRARIES ++uninstall-am: uninstall-embedLTLIBRARIES uninstall-pkglibexecPROGRAMS + + .MAKE: all check install install-am install-strip + +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-embedLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-binPROGRAMS \ ++.PHONY: CTAGS GTAGS all all-am check check-am clean \ ++ clean-embedLTLIBRARIES clean-generic clean-libtool \ ++ clean-pkglibexecPROGRAMS ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-embedLTLIBRARIES install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-binPROGRAMS uninstall-embedLTLIBRARIES ++ install-man install-pdf install-pdf-am \ ++ install-pkglibexecPROGRAMS install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-embedLTLIBRARIES uninstall-pkglibexecPROGRAMS + + + kz-embed-process-server-bindings.h: kazehakase-embed.xml +diff -urNad kazehakase-0.5.8~/module/embed/webkit-gtk/Makefile.in kazehakase-0.5.8/module/embed/webkit-gtk/Makefile.in +--- kazehakase-0.5.8~/module/embed/webkit-gtk/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/embed/webkit-gtk/Makefile.in 2009-12-07 21:19:54.000000000 +0200 +@@ -74,7 +74,8 @@ + am__installdirs = "$(DESTDIR)$(embeddir)" + LTLIBRARIES = $(embed_LTLIBRARIES) + am__DEPENDENCIES_1 = +-webkit_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++webkit_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/src/libkazehakase.la + am_webkit_gtk_la_OBJECTS = webkit_gtk_la-kz-webkit-gtk-module.lo \ + webkit_gtk_la-kz-webkit-gtk.lo + webkit_gtk_la_OBJECTS = $(am_webkit_gtk_la_OBJECTS) +@@ -117,14 +118,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -151,19 +146,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -181,9 +175,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -356,7 +352,8 @@ + kz-webkit-gtk.h + + webkit_gtk_la_LIBADD = \ +- $(WEBKITGTK_LIBS) ++ $(WEBKITGTK_LIBS) \ ++ $(top_builddir)/src/libkazehakase.la + + all: all-am + +diff -urNad kazehakase-0.5.8~/module/search/Makefile.in kazehakase-0.5.8/module/search/Makefile.in +--- kazehakase-0.5.8~/module/search/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/module/search/Makefile.in 2009-12-07 21:19:54.000000000 +0200 +@@ -86,7 +86,9 @@ + anthy_trainer_la_OBJECTS = $(am_anthy_trainer_la_OBJECTS) + @WITH_ANTHY_TRAINER_TRUE@am_anthy_trainer_la_rpath = -rpath \ + @WITH_ANTHY_TRAINER_TRUE@ $(searchdir) +-@WITH_EST_TRUE@hyper_estraier_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@WITH_EST_TRUE@hyper_estraier_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@WITH_EST_TRUE@ $(am__DEPENDENCIES_1) \ ++@WITH_EST_TRUE@ $(top_builddir)/src/libkazehakase.la + am__hyper_estraier_la_SOURCES_DIST = kz-search-common.h \ + kz-hyper-estraier-search.c + am__objects_1 = +@@ -120,7 +122,13 @@ + -DG_DISABLE_DEPRECATED=1 + + AM_CXXFLAGS = @AM_CXXFLAGS@ +-AM_LDFLAGS = @AM_LDFLAGS@ ++AM_LDFLAGS = \ ++ -rpath $(searchdir) \ ++ -avoid-version \ ++ -module \ ++ -export-dynamic $(no_undefined) \ ++ $(LIBTOOL_EXPORT_OPTIONS) ++ + AM_MAKEFLAGS = @AM_MAKEFLAGS@ + ANTHY_CFLAGS = @ANTHY_CFLAGS@ + ANTHY_LIBS = @ANTHY_LIBS@ +@@ -135,14 +143,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -169,19 +171,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -199,15 +200,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ +-LDFLAGS = \ +- -rpath $(searchdir) \ +- -avoid-version \ +- -module \ +- -export-dynamic $(no_undefined) \ +- $(LIBTOOL_EXPORT_OPTIONS) +- ++LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -371,7 +368,9 @@ + @WITH_EST_TRUE@ $(search_common_sources) \ + @WITH_EST_TRUE@ kz-hyper-estraier-search.c + +-@WITH_EST_TRUE@hyper_estraier_la_LIBADD = $(EST_LIBS) ++@WITH_EST_TRUE@hyper_estraier_la_LIBADD = $(EST_LIBS) $(GLIB_LIBS) \ ++@WITH_EST_TRUE@ $(top_builddir)/src/libkazehakase.la ++ + @WITH_EST_TRUE@hyper_estraier_la_CPPFLAGS = \ + @WITH_EST_TRUE@ $(EST_CFLAGS) \ + @WITH_EST_TRUE@ $(AM_CPPFLAGS) \ +diff -urNad kazehakase-0.5.8~/po/Makefile.in.in kazehakase-0.5.8/po/Makefile.in.in +--- kazehakase-0.5.8~/po/Makefile.in.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/po/Makefile.in.in 2009-12-07 21:19:23.000000000 +0200 +@@ -129,7 +129,7 @@ + done + + # Empty stubs to satisfy archaic automake needs +-dvi info ctags tags CTAGS TAGS ID: ++dvi info tags TAGS ID: + + # Define this as empty until I found a useful application. + install-exec installcheck: +diff -urNad kazehakase-0.5.8~/src/Makefile.in kazehakase-0.5.8/src/Makefile.in +--- kazehakase-0.5.8~/src/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/Makefile.in 2009-12-07 21:19:55.000000000 +0200 +@@ -123,10 +123,7 @@ + dist_kazehakase_OBJECTS = main.$(OBJEXT) + kazehakase_OBJECTS = $(dist_kazehakase_OBJECTS) + kazehakase_DEPENDENCIES = $(am__DEPENDENCIES_1) libkazehakase.la \ +- $(KAZEHAKASE_RES) +-kazehakase_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(kazehakase_LDFLAGS) $(LDFLAGS) -o $@ ++ $(KAZEHAKASE_RES) $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -206,14 +203,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -240,19 +231,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -270,9 +260,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +@@ -470,9 +462,9 @@ + kazehakase_LDADD = \ + $(DBUS_GLIB_LIBS) \ + libkazehakase.la \ +- $(KAZEHAKASE_RES) ++ $(KAZEHAKASE_RES) \ ++ $(GTK_LIBS) + +-@WITH_GECKO_TRUE@kazehakase_LDFLAGS = -R$(MOZILLA_HOME) + libkazehakase_public_h_sources = \ + kazehakase.h \ + kz-objects.h \ +@@ -568,6 +560,7 @@ + $(GTK_LIBS) \ + $(SM_LIBS) \ + $(LIBGNUTLS_LIBS) \ ++ $(LIBGCRYPT_LIBS) \ + -lz \ + $(libraries) + +@@ -690,7 +683,7 @@ + rm -f $$list + kazehakase$(EXEEXT): $(kazehakase_OBJECTS) $(kazehakase_DEPENDENCIES) + @rm -f kazehakase$(EXEEXT) +- $(kazehakase_LINK) $(kazehakase_OBJECTS) $(kazehakase_LDADD) $(LIBS) ++ $(LINK) $(kazehakase_OBJECTS) $(kazehakase_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urNad kazehakase-0.5.8~/src/actions/Makefile.in kazehakase-0.5.8/src/actions/Makefile.in +--- kazehakase-0.5.8~/src/actions/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/actions/Makefile.in 2009-12-07 21:19:55.000000000 +0200 +@@ -115,14 +115,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -149,19 +143,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -179,9 +172,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/bookmarks/Makefile.in kazehakase-0.5.8/src/bookmarks/Makefile.in +--- kazehakase-0.5.8~/src/bookmarks/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/bookmarks/Makefile.in 2009-12-07 21:19:56.000000000 +0200 +@@ -125,14 +125,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -159,19 +153,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -189,9 +182,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/dialogs/Makefile.in kazehakase-0.5.8/src/dialogs/Makefile.in +--- kazehakase-0.5.8~/src/dialogs/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/dialogs/Makefile.in 2009-12-07 21:19:56.000000000 +0200 +@@ -104,14 +104,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -138,19 +132,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -168,9 +161,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/missing/Makefile.in kazehakase-0.5.8/src/missing/Makefile.in +--- kazehakase-0.5.8~/src/missing/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/missing/Makefile.in 2009-12-07 21:19:56.000000000 +0200 +@@ -107,14 +107,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -141,19 +135,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -171,9 +164,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/net/Makefile.in kazehakase-0.5.8/src/net/Makefile.in +--- kazehakase-0.5.8~/src/net/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/net/Makefile.in 2009-12-07 21:19:57.000000000 +0200 +@@ -102,14 +102,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -136,19 +130,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -166,9 +159,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/prefs_ui/Makefile.in kazehakase-0.5.8/src/prefs_ui/Makefile.in +--- kazehakase-0.5.8~/src/prefs_ui/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/prefs_ui/Makefile.in 2009-12-07 21:19:57.000000000 +0200 +@@ -104,14 +104,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -138,19 +132,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -168,9 +161,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/sidebar/Makefile.in kazehakase-0.5.8/src/sidebar/Makefile.in +--- kazehakase-0.5.8~/src/sidebar/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/sidebar/Makefile.in 2009-12-07 21:19:57.000000000 +0200 +@@ -102,14 +102,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -136,19 +130,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -166,9 +159,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/utils/Makefile.in kazehakase-0.5.8/src/utils/Makefile.in +--- kazehakase-0.5.8~/src/utils/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/utils/Makefile.in 2009-12-07 21:19:58.000000000 +0200 +@@ -107,14 +107,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -141,19 +135,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -171,9 +164,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/src/widget/Makefile.in kazehakase-0.5.8/src/widget/Makefile.in +--- kazehakase-0.5.8~/src/widget/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/src/widget/Makefile.in 2009-12-07 21:19:58.000000000 +0200 +@@ -102,14 +102,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -136,19 +130,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -166,9 +159,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/test/Makefile.in kazehakase-0.5.8/test/Makefile.in +--- kazehakase-0.5.8~/test/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/test/Makefile.in 2009-12-07 21:19:58.000000000 +0200 +@@ -202,14 +202,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -236,19 +230,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -266,9 +259,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ +diff -urNad kazehakase-0.5.8~/test/fixtures/Makefile.in kazehakase-0.5.8/test/fixtures/Makefile.in +--- kazehakase-0.5.8~/test/fixtures/Makefile.in 2009-12-07 21:17:42.000000000 +0200 ++++ kazehakase-0.5.8/test/fixtures/Makefile.in 2009-12-07 21:19:59.000000000 +0200 +@@ -73,14 +73,8 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ +-COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ +-COVERAGE_INFO_FILE = @COVERAGE_INFO_FILE@ +-COVERAGE_REPORT_DIR = @COVERAGE_REPORT_DIR@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CUTTER = @CUTTER@ +-CUTTER_CFLAGS = @CUTTER_CFLAGS@ +-CUTTER_LIBS = @CUTTER_LIBS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -107,19 +101,18 @@ + F77 = @F77@ + FC = @FC@ + FGREP = @FGREP@ +-GCUTTER_CFLAGS = @GCUTTER_CFLAGS@ +-GCUTTER_LIBS = @GCUTTER_LIBS@ + GECKO = @GECKO@ + GECKO_VERSION = @GECKO_VERSION@ +-GENHTML = @GENHTML@ +-GENHTML_OPTIONS = @GENHTML_OPTIONS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GIO_CFLAGS = @GIO_CFLAGS@ + GIO_LIBS = @GIO_LIBS@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + GTKIEEMBED_CFLAGS = @GTKIEEMBED_CFLAGS@ + GTKIEEMBED_LIBS = @GTKIEEMBED_LIBS@ +@@ -137,9 +130,11 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + KAZEHAKASE_CFLAGS = @KAZEHAKASE_CFLAGS@ +-LCOV = @LCOV@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ ++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ ++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ ++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ + LIBOBJS = @LIBOBJS@ |